--- baselibs.conf.orig +++ baselibs.conf @@ -1,2 +1 @@ -libcolord1 libcolord-gtk1 --- colord-gtk.changes.orig +++ colord-gtk.changes @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Tue Sep 18 18:56:46 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.1.23: + + Bugfixes: + - Do not reuse __COLORD_H_INSIDE__ as this causes #include + insanity + - Add include guards to cd-sample-window.h +- Changes from version 0.1.23: + + New Features: + - Import GTK-specific code from colord into a new project + + Bugfixes: + - Assorted colord-gtk introspection fixes + - Clarify that CdSampleWindow is LGPLv2+, not GPLv2+ + - Fix release instructions and version number + - Fix Vala binding generation for colord-gtk +- NEW Package: colord-gtk used to be an integrated part of colord, + which we split in an own spec file due to build loops. Upstream + now followed this split. As a result, the .spec file has been + entirely remastered and stripped. + +------------------------------------------------------------------- Thu Jul 5 14:47:17 UTC 2012 - meissner@suse.com - Add a apparmor profile for usr.lib.colord --- colord-gtk.spec.orig +++ colord-gtk.spec @@ -16,91 +16,42 @@ # -%define build_gtk 1 - # Do not edit this auto generated file! Edit colord.spec. Name: colord-gtk -%define _name colord -Version: 0.1.21 +Version: 0.1.23 Release: 0 -Summary: System Daemon for Managing Color Devices -License: GPL-2.0+ -Group: System/Daemons +License: LGPL-2.1+ +Summary: System Daemon for Managing Color Devices -- GTK Integration Url: http://colord.hughsie.com/ -Source0: http://www.freedesktop.org/software/colord/releases/%{_name}-%{version}.tar.xz -# Apparmor profile -Source1: usr.lib.colord +Group: System/Daemons +Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz Source99: baselibs.conf -BuildRequires: gobject-introspection-devel -BuildRequires: intltool -BuildRequires: sane-backends-devel +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: intltool >= 0.35.0 BuildRequires: vala -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(gio-2.0) +BuildRequires: xsltproc +BuildRequires: pkgconfig(colord) +BuildRequires: pkgconfig(gio-2.0) >= 2.25.9 BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(gusb) >= 0.1.1 -BuildRequires: pkgconfig(lcms2) >= 2.2 -BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 -BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(systemd) -%if %{build_gtk} -# For directory ownership and removing files in %%install -BuildRequires: colord -BuildRequires: libcolord-devel +BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-3.0) -%endif -Requires(pre): pwdutils -Requires: shared-color-profiles -Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{?systemd_requires} +BuildRequires: pkgconfig(lcms2) >= 2.2 %description colord is a system activated daemon that maps devices to color profiles. It is used by gnome-color-manager for system integration and use when there are no users logged in. -%package -n libcolord1 -Summary: System Daemon for Managing Color Devices -- Library -Group: System/Libraries -Suggests: %{name} - -%description -n libcolord1 -colord is a system activated daemon that maps devices to color profiles. -It is used by gnome-color-manager for system integration and use when -there are no users logged in. - -%package -n typelib-1_0-Colord-1_0 -Summary: System Daemon for Managing Color Devices -- Introspection bindings -Group: System/Libraries - -%description -n typelib-1_0-Colord-1_0 -colord is a system activated daemon that maps devices to color profiles. -It is used by gnome-color-manager for system integration and use when -there are no users logged in. - -This package provides the GObject Introspection bindings for the -libcolord library. - -%package -n libcolord-devel -Summary: System Daemon for Managing Color Devices -- Development Files -Group: Development/Languages/C and C++ -Requires: libcolord1 = %{version} -Requires: typelib-1_0-Colord-1_0 = %{version} - -%description -n libcolord-devel -colord is a system activated daemon that maps devices to color profiles. -It is used by gnome-color-manager for system integration and use when -there are no users logged in. - %package -n libcolord-gtk1 Summary: System Daemon for Managing Color Devices -- GTK Integration Library Group: System/Libraries -Suggests: %{name} +Recommends: %{name}-lang +# for the -lang package to be installable +Provides: %{name} = %{version} +Suggests: colord %description -n libcolord-gtk1 colord is a system activated daemon that maps devices to color profiles. @@ -132,131 +83,27 @@ there are no users logged in. %lang_package %prep -%setup -q -n %{_name}-%{version} +%setup -q %build -%configure \ - --disable-static \ - --enable-polkit \ - --with-daemon-user=colord +%configure --disable-static make %{?_smp_mflags} %install %make_install find %{buildroot} -type f -name '*.la' -delete -print - -%if !%{build_gtk} - -mkdir %{buildroot}/etc/apparmor.d -install -c -m 644 %{SOURCE1} %{buildroot}/etc/apparmor.d/ -# Manually install prebuilt man pages, since we don't have docbook2man -pushd man -test ! -f %{buildroot}%{_mandir}/man1/* -mkdir -p %{buildroot}%{_mandir}/man1/ -for man in *.1; do - install -m 644 ${man} %{buildroot}%{_mandir}/man1/ -done -# Check we only have man1 pages to install -test ! -f *.[2-9] -popd -%find_lang %{_name} - -%else - -for file in `rpm -ql colord libcolord1 typelib-1_0-Colord-1_0 libcolord-devel`; do - # do not remove directories (might contain files we want); -f to not fail if - # file doesn't exist - test ! -d %{buildroot}${file} && rm -f %{buildroot}${file} - test ${file#%{_mandir}} != ${file} && rm -f %{buildroot}${file%%%{?ext_man}} -done -rm %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/%{_name}.mo - -%endif - -%pre -%service_add_pre colord.service colord-sane.service -# Create colord user -getent group colord >/dev/null || groupadd -r colord -getent passwd colord >/dev/null || useradd -r -g colord -d %{_localstatedir}/lib/colord -s /sbin/nologin -c "user for colord" colord -# Fix ownership of /var/lib/colord from first packages (in 12.1) -test ! -d %{_localstatedir}/lib/colord || chown -R colord:colord %{_localstatedir}/lib/colord -exit 0 - -%post -%service_add_post colord.service colord-sane.service - -%preun -%service_del_preun colord.service colord-sane.service - -%postun -%service_del_postun colord.service colord-sane.service - -%post -n libcolord1 -p /sbin/ldconfig - -%postun -n libcolord1 -p /sbin/ldconfig +%find_lang %{name} %{?no_lang_C} %post -n libcolord-gtk1 -p /sbin/ldconfig %postun -n libcolord-gtk1 -p /sbin/ldconfig -%if !%{build_gtk} - -%files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README -%{_unitdir}/colord.service -%{_unitdir}/colord-sane.service -/lib/udev/rules.d/*.rules -%attr(755,colord,colord) %dir %{_localstatedir}/lib/colord -%config(noreplace) %{_sysconfdir}/%{name}.conf -%{_sysconfdir}/bash_completion.d/colormgr-completion.bash -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.colord-sane.conf -%{_bindir}/cd-create-profile -%{_bindir}/cd-fix-profile -%{_bindir}/colormgr -%{_libdir}/colord-sensors/ -%{_libexecdir}/%{name} -%{_libexecdir}/colord-sane -%{_datadir}/color/ -%{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.* -%{_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%{?ext_man} -%{_mandir}/man1/cd-fix-profile.1%{?ext_man} -%{_mandir}/man1/colormgr.1%{?ext_man} -%dir /etc/apparmor.d/ -%config /etc/apparmor.d/usr.lib.colord - -%files -n libcolord1 -%defattr(-, root, root) -%{_libdir}/libcolord.so.* - -%files -n typelib-1_0-Colord-1_0 -%defattr(-,root,root) -%{_libdir}/girepository-1.0/Colord-1.0.typelib - -%files -n libcolord-devel -%defattr(-, root, root) -%{_includedir}/colord-1/ -%{_libdir}/libcolord.so -%{_libdir}/pkgconfig/colord.pc -%{_datadir}/gir-1.0/Colord-1.0.gir -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/colord.vapi - -%files lang -f %{_name}.lang -%defattr(-, root, root) - -%else - %files -n libcolord-gtk1 %defattr(-, root, root) %{_libdir}/libcolord-gtk.so.* +%files lang -f %{name}.lang + %files -n typelib-1_0-ColordGtk-1_0 %defattr(-,root,root) %{_libdir}/girepository-1.0/ColordGtk-1.0.typelib @@ -268,7 +115,6 @@ exit 0 %{_libdir}/libcolord-gtk.so %{_libdir}/pkgconfig/colord-gtk.pc %{_datadir}/gir-1.0/ColordGtk-1.0.gir - -%endif +%{_datadir}/vala/vapi/colord-gtk.vapi %changelog