From a94e0036a455f1619bee54b45b75ed0f60d63790 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 16 Jan 2013 23:41:07 +0000 Subject: [PATCH] New upstream version - Add some default GSetting schema values for the calibration helper - Add the sensor images as metadata on the D-Bus interface - Quit the session helper if the device or sensor was not found --- .gitignore | 1 + colord.spec | 24 +++++++++++++----------- notparallel.patch | 10 ---------- sources | 2 +- 4 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 notparallel.patch diff --git a/.gitignore b/.gitignore index 957c2df..8f48e18 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /colord-0.1.25.tar.xz /colord-0.1.26.tar.xz /colord-0.1.27.tar.xz +/colord-0.1.28.tar.xz diff --git a/colord.spec b/colord.spec index 10aa4a1..c017e38 100644 --- a/colord.spec +++ b/colord.spec @@ -1,7 +1,7 @@ # Building the extra print profiles requires colprof, +4Gb of RAM and # quite a lot of time. Don't enable this for test builds. -%define enable_print_profiles 1 +%define enable_print_profiles 0 # Don't build the print profiles for secondary architectures on the # logic that these are probably not doing press proofing or editing @@ -14,16 +14,12 @@ Summary: Color daemon Name: colord -Version: 0.1.27 -Release: 4%{?dist} +Version: 0.1.28 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/colord/ Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz -# backport from upstream -- only build one profile at a time -Patch0: notparallel.patch - -BuildRequires: automake BuildRequires: dbus-devel BuildRequires: docbook-utils BuildRequires: gettext @@ -96,9 +92,6 @@ This may be useful for CMYK soft-proofing or for extra device support. %prep %setup -q -%patch0 -p1 -b .notparallel -aclocal -automake --add-missing %build # we can't use _hardened_build here, see @@ -147,7 +140,9 @@ getent passwd colord >/dev/null || \ -c "User for colord" colord exit 0 -%post libs -p /sbin/ldconfig +%post +/sbin/ldconfig +glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %postun libs -p /sbin/ldconfig @@ -157,6 +152,7 @@ exit 0 %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord/icc %{_bindir}/* +%{_datadir}/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager*.xml %{_datadir}/polkit-1/actions/org.freedesktop.color.policy @@ -243,6 +239,12 @@ exit 0 %{_datadir}/gtk-doc/html/colord/* %changelog +* Wed Jan 16 2013 Richard Hughes 0.1.28-1 +- New upstream version +- Add some default GSetting schema values for the calibration helper +- Add the sensor images as metadata on the D-Bus interface +- Quit the session helper if the device or sensor was not found + * Mon Jan 14 2013 Richard Hughes 0.1.27-4 - Add BR systemd-devel so the seat tracking stuff works - Build with full compiler output diff --git a/notparallel.patch b/notparallel.patch deleted file mode 100644 index 9780a1b..0000000 --- a/notparallel.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/data/profiles/Makefile.am b/data/profiles/Makefile.am -index fd442fe..d82bd93 100644 ---- a/data/profiles/Makefile.am -+++ b/data/profiles/Makefile.am -@@ -1,3 +1,5 @@ -+.NOTPARALLEL: -+ - profilesdir = $(datadir)/color/icc/colord - generatedprofiles = \ - AdobeRGB1998.icc \ diff --git a/sources b/sources index 6a4c6ca..7dbeba1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -832bc43d8e832cad860f2eb69fc1978a colord-0.1.27.tar.xz +14a37f7aae8b47d247adea77686d6bd1 colord-0.1.28.tar.xz