X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=colord.spec;h=ba3049818b1a80a44300c19dbeb894e3fc009b9f;hb=c2e852d9c2f6b40dd1075b54378d665e1182ab25;hp=7ba686530ad735f7531da57b6633f9fac7e62e6b;hpb=5f1520bfd4fee2a003457674e24b8350fad2c2fd;p=packages%2Fcolord.git

diff --git a/colord.spec b/colord.spec
index 7ba6865..ba30498 100644
--- a/colord.spec
+++ b/colord.spec
@@ -7,12 +7,12 @@
 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
-Version:	0.1.13
+Version:	0.1.20
 Release:	1
 License:	GPL v2+ and LGPL v2+
 Group:		Daemons
 Source0:	http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	37437a2119d7c89fe3c991ee4c148f94
+# Source0-md5:	a42a36158b2b52748ac8ad913cdc4cb3
 URL:		http://www.freedesktop.org/software/colord/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.9
@@ -20,18 +20,24 @@ BuildRequires:	dbus-devel
 BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	glib2-devel >= 1:2.28.0
 BuildRequires:	gobject-introspection-devel >= 0.9.8
+BuildRequires:	gtk+3-devel
 BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	lcms2-devel >= 2.2
+BuildRequires:	libgusb-devel >= 0.1.1
 BuildRequires:	libtool
 BuildRequires:	libusb-devel >= 1.0.0
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-devel >= 0.97
-BuildRequires:	sane-backends-devel
+BuildRequires:	polkit-devel >= 0.103
+BuildRequires:	rpmbuild(macros) >= 1.644
+BuildRequires:	sane-backends-devel >= 1.0.20-3
 BuildRequires:	sqlite3-devel
 BuildRequires:	udev-glib-devel
 %{?with_vala:BuildRequires:	vala}
+Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	polkit-libs >= 0.103
+Requires:	systemd-units >= 38
 Suggests:	shared-color-profiles
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,6 +53,7 @@ obsługujące kolory na profile kolorów w kontekście systemu.
 Summary:	colord library
 Summary(pl.UTF-8):	Biblioteka colord
 Group:		Libraries
+Requires:	glib2 >= 1:2.28.0
 Suggests:	%{name} = %{version}-%{release}
 Conflicts:	colord < 0.1.12-4
 
@@ -106,13 +113,38 @@ colord API for Vala language.
 %description -n vala-colord -l pl.UTF-8
 API colord dla języka Vala.
 
+%package gtk
+Summary:	GTK helper library for colord
+Summary(pl.UTF-8):	Biblioteka pomocniczna GTK dla colord
+Group:		Libraries
+Suggests:	%{name} = %{version}-%{release}
+
+%description gtk
+GTK helper library for colord.
+
+%description gtk -l pl.UTF-8
+Biblioteka pomocnicza GTK dla colord.
+
+%package gtk-devel
+Summary:	Header files for colord-gtk library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki colord-gtk
+Group:		Development/Libraries
+Requires:	%{name}-gtk = %{version}-%{release}
+Requires:	gtk+3-devel
+
+%description gtk-devel
+Header files for colord-gtk library.
+
+%description gtk-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki colord-gtk.
+
 %prep
 %setup -q
 
 %build
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -120,7 +152,8 @@ API colord dla języka Vala.
 	--disable-silent-rules \
 	%{__enable_disable apidocs gtk-doc} \
 	%{__enable_disable static_libs static} \
-	--with-html-dir=%{_gtkdocdir}
+	--with-html-dir=%{_gtkdocdir} \
+	--with-systemdsystemunitdir=%{systemdunitdir}
 # doc build is broken with -j
 %{__make} -j1
 
@@ -135,13 +168,22 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/colord-sensors/*.la
 
 # the same as it locale
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/it_IT
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/it_IT
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%systemd_post colord.service
+
+%preun
+%systemd_preun colord.service
+
+%postun
+%systemd_reload
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
@@ -152,23 +194,31 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/cd-fix-profile
 %attr(755,root,root) %{_bindir}/colormgr
 %attr(755,root,root) %{_libexecdir}/colord
+%attr(755,root,root) %{_libexecdir}/colord-sane
 %dir %{_libdir}/colord-sensors
+%attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_colorhug.so
 %attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_dummy.so
 %attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_huey.so
-%attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_munki.so
+# disabled for now
+#%attr(755,root,root) %{_libdir}/colord-sensors/libcolord_sensor_munki.so
 %dir %{_datadir}/color/icc/colord
 %{_datadir}/color/icc/colord/*.icc
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.colord.sane.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.colord-sane.service
 %{_datadir}/polkit-1/actions/org.freedesktop.color.policy
 %{_mandir}/man1/cd-create-profile.1*
 %{_mandir}/man1/cd-fix-profile.1*
 %{_mandir}/man1/colormgr.1*
+%{systemdunitdir}/colord.service
+%{systemdunitdir}/colord-sane.service
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/colord.conf
 /etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
+/etc/dbus-1/system.d/org.freedesktop.colord-sane.conf
 /lib/udev/rules.d/69-cd-sensors.rules
 /lib/udev/rules.d/95-cd-devices.rules
 %dir /var/lib/colord
@@ -190,6 +240,7 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcolord.a
+%{_libdir}/libcolord-gtk.a
 %endif
 
 %if %{with apidocs}
@@ -203,3 +254,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_datadir}/vala/vapi/colord.vapi
 %endif
+
+%files gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcolord-gtk.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcolord-gtk.so.1
+%{_libdir}/girepository-1.0/ColordGtk-1.0.typelib
+
+%files gtk-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcolord-gtk.so
+%{_pkgconfigdir}/colord-gtk.pc
+%{_datadir}/gir-1.0/ColordGtk-1.0.gir