[colord] New upstream version

[Richard Hughes]

commit bcfba954788663f4a69b1e565bad977f347de785
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Feb 4 22:18:01 2013 +0000

    New upstream version
    
    - Add a --verbose and --version argument to colormgr
    - Add DTP94 native sensor support
    - Allow profiles to have a 'score' which affects the standard space
    - Change the Adobe RGB description to be 'Compatible with Adobe RGB (1998)'
    - Detect profiles from adobe.com and color.org and add metadata
    - Do not auto-add profiles due to device-id metadata if they have been removed
    - Ensure profiles with MAPPING_device_id get auto-added to devices
    - Install various helper libraries for access to hardware
    - Set the additional 'OwnerCmdline' metadata on each device

 .gitignore                  |    1 +
 colord-upstream-fixes.patch |  236 -------------------------------------------
 colord.spec                 |   51 +++++++--
 sources                     |    2 +-
 4 files changed, 42 insertions(+), 248 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f48e18..e8ed43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /colord-0.1.26.tar.xz
 /colord-0.1.27.tar.xz
 /colord-0.1.28.tar.xz
+/colord-0.1.29.tar.xz
diff --git a/colord.spec b/colord.spec
index 3b2159c..8ba0f54 100644
--- a/colord.spec
+++ b/colord.spec
@@ -3,6 +3,10 @@
 # quite a lot of time. Don't enable this for test builds.
 %define enable_print_profiles 0
 
+# SANE is pretty insane when it comes to handling devices, and we get AVCs
+# popping up all over the place.
+%define enable_sane 0
+
 # Don't build the print profiles for secondary architectures on the
 # logic that these are probably not doing press proofing or editing
 # in different CMYK spaces
@@ -14,15 +18,12 @@
 
 Summary:   Color daemon
 Name:      colord
-Version:   0.1.28
-Release:   2%{?dist}
+Version:   0.1.29
+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
 
-# Upstream fixes required for g-s-d
-Patch0:    colord-upstream-fixes.patch
-
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
@@ -42,6 +43,12 @@ BuildRequires: color-filesystem
 BuildRequires: argyllcms
 %endif
 
+# for SANE support
+%if 0%{?enable_sane}
+BuildRequires: sane-backends-devel
+BuildRequires: dbus-devel
+%endif
+
 Requires: color-filesystem
 Requires: systemd-units
 Requires(pre): shadow-utils
@@ -68,6 +75,7 @@ to color profiles in the system context.
 Summary: Development package for %{name}
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
+Obsoletes: colorhug-client-devel <= 0.1.13
 
 %description devel
 Files for development with %{name}.
@@ -95,7 +103,6 @@ This may be useful for CMYK soft-proofing or for extra device support.
 
 %prep
 %setup -q
-%patch0 -p1 -b .upstream-fixes
 
 %build
 # we can't use _hardened_build here, see
@@ -116,6 +123,9 @@ ulimit -Sv 2000000
 %else
         --disable-print-profiles \
 %endif
+%if 0%{?enable_sane}
+        --enable-sane \
+%endif
         --disable-static \
         --disable-rpath \
         --disable-examples \
@@ -148,7 +158,9 @@ exit 0
 /sbin/ldconfig
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-%postun libs -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %doc README AUTHORS NEWS COPYING
@@ -176,6 +188,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
 %{_datadir}/dbus-1/services/org.freedesktop.ColorHelper.service
 
+# sane helper
+%if 0%{?enable_sane}
+%{_libexecdir}/colord-sane
+%endif
+
 # common colorspaces
 %dir %{_icccolordir}/colord
 %{_icccolordir}/colord/AdobeRGB1998.icc
@@ -203,7 +220,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files libs
 %doc COPYING
-%{_libdir}/libcolord.so.*
+%{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0/*.typelib
 
 %files extra-profiles
@@ -233,9 +250,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files devel
 %{_includedir}/colord-1
-%{_libdir}/libcolord.so
-%{_libdir}/pkgconfig/colord.pc
-%{_datadir}/gir-1.0/Colord-1.0.gir
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
 %{_datadir}/vala/vapi/colord.vapi
 
 %files devel-docs
@@ -243,6 +260,18 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gtk-doc/html/colord/*
 
 %changelog
+* Mon Feb 04 2013 Richard Hughes <richard at hughsie.com> 0.1.29-1
+- New upstream version
+- Add a --verbose and --version argument to colormgr
+- Add DTP94 native sensor support
+- Allow profiles to have a 'score' which affects the standard space
+- Change the Adobe RGB description to be 'Compatible with Adobe RGB (1998)'
+- Detect profiles from adobe.com and color.org and add metadata
+- Do not auto-add profiles due to device-id metadata if they have been removed
+- Ensure profiles with MAPPING_device_id get auto-added to devices
+- Install various helper libraries for access to hardware
+- Set the additional 'OwnerCmdline' metadata on each device
+
 * Fri Jan 16 2013 Richard Hughes <richard at hughsie.com> 0.1.28-2
 - Backport some fixes from upstream for gnome-settings-daemon.
 
diff --git a/sources b/sources
index 7dbeba1..20056eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14a37f7aae8b47d247adea77686d6bd1  colord-0.1.28.tar.xz
+5cadede0c67946113b4d176d7661abc3  colord-0.1.29.tar.xz