- updated to 1.4.1; switched to meson, -static is gone

- updated completions patch, removed obsolete sh patch

diff --git a/colord-completions.patch b/colord-completions.patch
index 2af4f5600118b26ebde021ed6551485d851d12d5..1a815356be9790040fe98591e3345528cb6b4e4c 100644 (file)
--- a/colord-completions.patch
+++ b/colord-completions.patch
@@ -1,16 +1,31 @@
---- colord-1.0.0/configure.ac.orig     2013-05-13 10:38:29.000000000 +0200
-+++ colord-1.0.0/configure.ac  2013-05-18 08:35:04.747928192 +0200
-@@ -177,8 +177,13 @@
- AC_ARG_ENABLE(bash_completion, AS_HELP_STRING([--enable-bash-completion],[Enable bash completion]),
-             enable_bash_completion=$enableval, enable_bash_completion=yes)
- if test x$enable_bash_completion != xno; then
-+      if test x$enable_bash_completion != xyes; then
-+              BASH_COMPLETIONS_DIR="$enable_bash_completion"
-+              enable_bash_completion=yes
-+      else
-       PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0])
-       BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`"
-+      fi
-       AC_SUBST([BASH_COMPLETIONS_DIR])
- fi
- AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$enable_bash_completion" = "xyes"])
+--- colord-1.4.1/data/meson.build.orig 2017-08-21 11:02:36.000000000 +0200
++++ colord-1.4.1/data/meson.build      2017-12-23 22:57:10.663716927 +0100
+@@ -14,7 +14,7 @@
+ 
+ if get_option('enable-bash-completion')
+   install_data('colormgr',
+-    install_dir: bash_completion.get_pkgconfig_variable('completionsdir')
++    install_dir: get_option('with-bash-completion-dir')
+   )
+ endif
+ 
+--- colord-1.4.1/meson.build.orig      2017-08-21 11:02:36.000000000 +0200
++++ colord-1.4.1/meson.build   2017-12-23 23:41:23.647019972 +0100
+@@ -146,9 +146,6 @@
+   gnome_desktop = dependency('gnome-desktop-3.0', version : '>= 0.2.7')
+   colord_gtk = dependency('colord-gtk', version : '>= 0.1.24')
+ endif
+-if get_option('enable-bash-completion')
+-  bash_completion = dependency('bash-completion', version : '>= 2.0')
+-endif
+ 
+ if get_option('enable-sane')
+   sane = dependency('sane-backends')
+--- colord-1.4.1/meson_options.txt.orig        2017-08-21 11:02:36.000000000 +0200
++++ colord-1.4.1/meson_options.txt     2017-12-23 23:42:47.510352342 +0100
+@@ -12,3 +12,5 @@
+ option('with-daemon-user', type : 'string', value : 'root', description : 'User for running the colord daemon')
+ option('enable-man', type : 'boolean', value : true, description : 'Generate man pages')
+ option('enable-docs', type : 'boolean', value : true, description : 'Generate documentation')
++option('with-bash-completion-dir', type : 'string', description : 'Bash
++completions dir')

diff --git a/colord-sh.patch b/colord-sh.patch
deleted file mode 100644 (file)
index dc8f42c..0000000
--- a/colord-sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 17a3d890419e9423124ba8d29c24dd404d838a4d..af6849fea1f7ea620a9198ed5d2b4e0823984bcb 100644 (file)
--- a/colord.spec
+++ b/colord.spec
@@ -2,21 +2,18 @@
 # Conditional build:
 %bcond_without apidocs         # do not build and package API docs
 %bcond_without sane            # SANE support
-%bcond_without static_libs     # don't build static libraries
 %bcond_without vala            # don't build Vala API
 
 Summary:       Color daemon - system daemon for managing color devices
 Summary(pl.UTF-8):     Demon colord - usługa systemowa do zarządzania urządzeniami obsługującymi kolory
 Name:          colord
-# note: 1.3.x is devel; stick to stable line when possible (some GNOME 3.20 components require colord >= 1.3.1)
-Version:       1.3.5
+Version:       1.4.1
 Release:       1
 License:       GPL v2+ and LGPL v2+
 Group:         Daemons
 Source0:       https://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
-# Source0-md5: a8e7fcf0a45383ca7a65cef91ca5e019
+# Source0-md5: f457be5b7c44827e6c747ec80a6dc69a
 Patch0:                %{name}-completions.patch
-Patch1:                %{name}-sh.patch
 URL:           https://www.freedesktop.org/software/colord/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.9
@@ -86,6 +83,8 @@ Requires:     glib2-devel >= 1:2.44.0
 Requires:      lcms2-devel >= 2.6
 Requires:      libgusb-devel >= 0.2.7
 Obsoletes:     colorhug-client-devel < 0.1.14
+Obsoletes:     colord-static < 1.4.0
+Obsoletes:     colorhug-client-static < 0.1.14
 
 %description devel
 Header files for colord library.
@@ -93,19 +92,6 @@ Header files for colord library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki colord.
 
-%package static
-Summary:       Static colord library
-Summary(pl.UTF-8):     Statyczna biblioteka colord
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-Obsoletes:     colorhug-client-static < 0.1.14
-
-%description static
-Static colord library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka colord.
-
 %package apidocs
 Summary:       colord API documentation
 Summary(pl.UTF-8):     Dokumentacja API colord
@@ -154,40 +140,22 @@ Bashowe uzupełnianie poleceń terminalowych colormgr.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       SPOTREAD=/usr/bin/spotread \
-       --disable-silent-rules \
-       --enable-bash-completion=%{bash_compdir} \
-       %{__enable_disable apidocs gtk-doc} \
-       --enable-libcolordcompat \
-       %{__enable sane} \
-       %{__enable_disable static_libs static} \
-       %{__enable_disable vala} \
-       --with-daemon-user=colord \
-       --with-html-dir=%{_gtkdocdir} \
-       --with-systemdsystemunitdir=%{systemdunitdir}
-# doc build is broken with -j
-%{__make} -j1
+%meson build \
+       %{!?with_apidocs:-Denable-docs=false} \
+       -Denable-libcolordcompat=true \
+       %{?with_sane:-Denable-sane=true} \
+       %{?with_vala:-Denable-vala=true} \
+       -Dwith-bash-completion-dir=%{bash_compdir} \
+       -Dwith-daemon-user=colord
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-# loadable modules
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/colord-{plugins,sensors}/*.{la,a}
+%meson_install -C build
 
 %find_lang %{name}
 
@@ -214,7 +182,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README.md TODO
+%doc AUTHORS NEWS README.md
 %attr(755,root,root) %{_bindir}/cd-create-profile
 %attr(755,root,root) %{_bindir}/cd-fix-profile
 %attr(755,root,root) %{_bindir}/cd-iccdump
@@ -224,9 +192,9 @@ fi
 %{?with_sane:%attr(755,root,root) %{_libexecdir}/colord-sane}
 %attr(755,root,root) %{_libexecdir}/colord-session
 %dir %{_libdir}/colord-plugins
-%attr(755,root,root) %{_libdir}/colord-plugins/libcd_plugin_camera.so
-%{?with_sane:%attr(755,root,root) %{_libdir}/colord-plugins/libcd_plugin_sane.so}
-%attr(755,root,root) %{_libdir}/colord-plugins/libcd_plugin_scanner.so
+%attr(755,root,root) %{_libdir}/colord-plugins/libcolord_sensor_camera.so
+%{?with_sane:%attr(755,root,root) %{_libdir}/colord-plugins/libcolord_sensor_sane.so}
+%attr(755,root,root) %{_libdir}/colord-plugins/libcolord_sensor_scanner.so
 %dir %{_libdir}/colord-sensors
 %attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_argyll.so
 %attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_colorhug.so
@@ -236,10 +204,6 @@ fi
 # disabled for now
 #%attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_munki.so
 %attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_spark.so
-%attr(755,root,root) %{_libdir}/colord-sensors/libdtp94-private.so
-%attr(755,root,root) %{_libdir}/colord-sensors/libhuey-private.so
-%attr(755,root,root) %{_libdir}/colord-sensors/libmunki-private.so
-%attr(755,root,root) %{_libdir}/colord-sensors/libospark-private.so
 %{_datadir}/colord
 %{_datadir}/color/icc/colord
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
@@ -249,6 +213,7 @@ fi
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.xml
 %{_datadir}/dbus-1/services/org.freedesktop.ColorHelper.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service
+%{_datadir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
 %{_datadir}/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
 %{_datadir}/polkit-1/actions/org.freedesktop.color.policy
 %{_mandir}/man1/cd-create-profile.1*
@@ -258,7 +223,6 @@ fi
 %{systemdunitdir}/colord.service
 %{systemduserunitdir}/colord-session.service
 %{systemdtmpfilesdir}/colord.conf
-/etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
 /lib/udev/rules.d/69-cd-sensors.rules
 /lib/udev/rules.d/95-cd-devices.rules
 %attr(755,colord,colord) %dir /var/lib/colord
@@ -274,7 +238,7 @@ fi
 %attr(755,root,root) %{_libdir}/libcolorhug.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcolorhug.so.2
 %{_libdir}/girepository-1.0/Colord-1.0.typelib
-%{_libdir}/girepository-1.0/ColorHug-1.0.typelib
+%{_libdir}/girepository-1.0/Colorhug-1.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
@@ -285,16 +249,7 @@ fi
 %{_pkgconfigdir}/colord.pc
 %{_pkgconfigdir}/colorhug.pc
 %{_datadir}/gir-1.0/Colord-1.0.gir
-%{_datadir}/gir-1.0/ColorHug-1.0.gir
-
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libcolord.a
-%{_libdir}/libcolordcompat.a
-%{_libdir}/libcolordprivate.a
-%{_libdir}/libcolorhug.a
-%endif
+%{_datadir}/gir-1.0/Colorhug-1.0.gir
 
 %if %{with apidocs}
 %files apidocs
@@ -305,6 +260,7 @@ fi
 %if %{with vala}
 %files -n vala-colord
 %defattr(644,root,root,755)
+%{_datadir}/vala/vapi/colord.deps
 %{_datadir}/vala/vapi/colord.vapi
 %endif