- added sh patch (fix wrt. POSIX sh)

- more locale dir fixes

diff --git a/colord-sh.patch b/colord-sh.patch
new file mode 100644 (file)
index 0000000..dc8f42c
--- /dev/null
+++ b/colord-sh.patch
@@ -0,0 +1,11 @@
+--- colord-1.2.0/configure.ac.orig     2014-04-13 08:14:11.677141206 +0200
++++ colord-1.2.0/configure.ac  2014-04-13 08:15:38.100472738 +0200
+@@ -171,7 +171,7 @@
+ if test x$enable_udev != xno; then
+       PKG_CHECK_MODULES(UDEV, libudev)
+       PKG_CHECK_MODULES(GUDEV, gudev-1.0)
+-      COLORD_REQUIRES_PRIVATE+=", libudev"
++      COLORD_REQUIRES_PRIVATE="${COLORD_REQUIRES_PRIVATE}, libudev"
+       AC_DEFINE(HAVE_UDEV,1,[Use UDEV support])
+ fi
+ AM_CONDITIONAL(HAVE_UDEV, test x$enable_udev = xyes)

diff --git a/colord.spec b/colord.spec
index fcf16fe1f923dc69f0ce117027074d8c5c8b5571..653dfdc55ca24ed50bbf2a3f88e0e6abf2e2bc32 100644 (file)
--- a/colord.spec
+++ b/colord.spec
@@ -15,6 +15,7 @@ Group:                Daemons
 Source0:       http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
 # Source0-md5: 740b321a32c6e54d28e6d043007947ea
 Patch0:                %{name}-completions.patch
+Patch1:                %{name}-sh.patch
 URL:           http://www.freedesktop.org/software/colord/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.9
@@ -143,6 +144,7 @@ Bashowe uzupełnianie poleceń terminalowych colormgr.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -174,14 +176,21 @@ rm -rf $RPM_BUILD_ROOT
 # loadable modules
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/colord-{plugins,sensors}/*.{la,a}
 
-# the same as it locale
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/it_IT
 # empty version of bg locale
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/bg_BG
+# less incomplete version of da locale
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/da
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{da_DK,da}
+# the same as it locale
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/it_IT
 # empty version of nb locale
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/nb_NO
+# simplify dir name
 test ! -d $RPM_BUILD_ROOT%{_localedir}/nn || exit 1
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{nn_NO,nn}
+# less incomplete version of pt locale
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pt
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
 
 %find_lang %{name}