Accepting request 158299 from GNOME:Next

Push GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/158299
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=62

colord-0.1.26.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e581413813b96ab3efb4549f3a1260a1522f472aa0ee7f3dda9146bece2d7d3
-size 638008

colord-0.1.30.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71b4f056bfc80e999274d4cced0c9170f52795bba143fb437b2f4a8b2e621fa8
+size 927920

colord-privlib.patch

@@ -0,0 +1,63 @@
+diff -ur colord-0.1.30/lib/dtp94/Makefile.am colord-0.1.30.patched/lib/dtp94/Makefile.am
+--- colord-0.1.30/lib/dtp94/Makefile.am	2013-02-08 09:35:58.000000000 +0100
++++ colord-0.1.30.patched/lib/dtp94/Makefile.am	2013-02-27 18:09:58.017203171 +0100
+@@ -12,7 +12,8 @@
+ COLORD_LIBS =							\
+ 	$(top_builddir)/lib/colord/libcolordprivate.la
+ 
+-lib_LTLIBRARIES =						\
++privlibdir=$(libdir)/colord-sensors
++privlib_LTLIBRARIES =						\
+ 	libdtp94-private.la
+ 
+ libdtp94_private_la_SOURCES =					\
+@@ -30,6 +31,7 @@
+ libdtp94_private_la_LDFLAGS =					\
+ 	-export-dynamic						\
+ 	-no-undefined						\
++	-avoid-version                                          \
+ 	-export-symbols-regex '^dtp94_.*'
+ 
+ libdtp94_private_la_CFLAGS =					\
+diff -ur colord-0.1.30/lib/huey/Makefile.am colord-0.1.30.patched/lib/huey/Makefile.am
+--- colord-0.1.30/lib/huey/Makefile.am	2013-02-08 09:35:18.000000000 +0100
++++ colord-0.1.30.patched/lib/huey/Makefile.am	2013-02-27 18:10:05.574020191 +0100
+@@ -12,7 +12,8 @@
+ COLORD_LIBS =							\
+ 	$(top_builddir)/lib/colord/libcolordprivate.la
+ 
+-lib_LTLIBRARIES =						\
++privlibdir=$(libdir)/colord-sensors
++privlib_LTLIBRARIES =						\
+ 	libhuey-private.la
+ 
+ libhuey_private_la_SOURCES =					\
+@@ -32,6 +33,7 @@
+ libhuey_private_la_LDFLAGS =					\
+ 	-export-dynamic						\
+ 	-no-undefined						\
++	-avoid-version                                          \
+ 	-export-symbols-regex '^huey_.*'
+ 
+ libhuey_private_la_CFLAGS =					\
+diff -ur colord-0.1.30/lib/munki/Makefile.am colord-0.1.30.patched/lib/munki/Makefile.am
+--- colord-0.1.30/lib/munki/Makefile.am	2013-02-08 09:36:41.000000000 +0100
++++ colord-0.1.30.patched/lib/munki/Makefile.am	2013-02-27 18:10:12.008864309 +0100
+@@ -12,7 +12,8 @@
+ COLORD_LIBS =							\
+ 	$(top_builddir)/lib/colord/libcolordprivate.la
+ 
+-lib_LTLIBRARIES =						\
++privlibdir=$(libdir)/colord-sensors
++privlib_LTLIBRARIES =						\
+ 	libmunki-private.la
+ 
+ libmunki_private_la_SOURCES =					\
+@@ -28,6 +29,7 @@
+ libmunki_private_la_LDFLAGS =					\
+ 	-export-dynamic						\
+ 	-no-undefined						\
++	-avoid-version                                          \
+ 	-export-symbols-regex '^munki_.*'
+ 
+ libmunki_private_la_CFLAGS =					\

colord.changes

@@ -1,3 +1,111 @@
+-------------------------------------------------------------------
+Wed Feb 27 12:11:08 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 0.1.30:
+  + New features:
+    - Load the instrospection to the colord binary as a GResource
+    - Save the common ICC profiles as GResources in the colord
+      binary to reduce I/O
+    - Support setting the blue LED in the ColorHug Spectro
+  + Bugfixes:
+    - Append -private to the driver libraries as they have no
+      headers installed
+    - cd_sensor_get_caps() returns a bitfield, so make it
+      explicitly 64 bits wide
+    - Do not expect a system proxy when checking if the daemon
+      exists
+    - Do not remove the database files when upgrading the package
+    - Do not show duplicate profiles when icc-profiles-openicc is
+      installed
+    - Fix Colord-1.0.gir build with --no-add-needed
+    - Fix linking of ch-self-test
+    - Fix symbol-prefix passed to g-ir-scanner
+    - Fix up the model name for the ColorMunki
+    - Skip more self tests if the daemon could not be started
+- Changes from version 0.1.29:
+  + New Features:
+    - Add an interface for plugins to decline to load
+    - Add a --verbose and --version argument to colormgr
+    - Add DTP94 native sensor support
+    - Add the 'Plasma' sensor capability
+    - Allow profiles to have a 'score' which affects the standard
+      space
+    - Detect profiles from adobe.com and color.org and add metadata
+    - Install libdtp94 for access to the DTP94 colorimeter
+    - Install libhuey for access to the Huey colorimeter
+    - Install libmunki for access to the ColorMunki Photo hardware
+    - Move libcolorhug from colorhug-client for access to the
+      ColorHug colorimeter
+    - Reintroduce SANE support
+    - session-helper:
+      . Return extra data from the calibration in the Finished
+        signal
+      . Return the correct sensor images when calibrating
+  + Bugfixes:
+    - Allow the user to specify the device type when using
+      'colormgr create-device'
+    - Change the Adobe RGB description to be 'Compatible with Adobe
+      RGB (1998)'
+    - Do not auto-add profiles due to device-id metadata if they
+      have been manually removed
+    - Do not include the size of the NULL byte when writing data
+      from CCMX files
+    - Do not log a critical warning if the daemon is replaced at
+      runtime
+    - Do not make the libsystemd-login dep automatic
+    - Do not return an error if a user manually adds a profile that
+      has already been automatically added
+    - Don't emit a warning if the profile warnings or owner changes
+    - Ensure profiles with MAPPING_device_id get auto-added to
+      devices
+    - Fix timezone problem in colord_client_random_func test
+    - Include cd-buffer.c in libcolordprivate for future use
+    - Make libcolord/device_async test pass everywhere
+    - Return an error if a client tries to create a device of an
+      unknown type
+    - Set the additional 'OwnerCmdline' metadata on each device
+    - Show all the possible capabilities on one line when doing
+      'colormgr get-sensors'
+    - Specify the sensor caps in the code for native sensors
+    - Split the libcolord.so into libcolordprivate.so so it can be
+      used without a GObject dep
+    - Write the CdIt8 'CREATED' date string in all files
+- Changes from version 0.1.28:
+  + New Features:
+    - Add some default GSetting schema values for the calibration
+      helper
+    - Add a Sensor.Metadata property
+    - - Add the sensor images as metadata on the D-Bus interface
+  + Bugfixes:
+    - Quit the session helper if the device or sensor was not found
+    - Never build more than one print profile at a time
+    - Don't use the deprecated INCLUDES in Makefile.am
+- Changes from version 0.1.27:
+  + New Features:
+    - Add ColorMunki Smile defines and calibration attach image
+    - Add Spyder4 calibration attach image
+    - Add the ability to generate Rec. 709 gamma curves
+    - Export a Device.Embedded property that is set for fixed
+      hardware
+    - Import shared-color-profiles into colord
+    - Install a header with all the session helper defines
+    - Support L* gamma encoding in cd-create-profile
+    - Write the profile quality into to the .icc file as metadata
+  + Bugfixes:
+    - Allow passing no value as properties to CreateDevice
+    - Do not return zero profiles when the device is being
+      calibrated or disabled
+    - Ensure the color types are methods in GObject Introspection
+      rather than functions
+    - Fix build when srcdir != builddir
+    - Fix floating point number parsing in non C locale
+      environments
+    - Remove 'Monitor' suffix from display devices model string.
+- Add colord-privlib.patch: Move private libraries out of
+  %{_libdir}.
+- Add gnome-common BuildRequires and call to autogen.sh, as above
+  patch touches the build system.
+
 -------------------------------------------------------------------
 Mon Feb 18 15:10:01 UTC 2013 - abergmann@novell.com
 

colord.spec

@@ -19,7 +19,7 @@
 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
 
 Name:           colord
-Version:        0.1.26
+Version:        0.1.30
 Release:        0
 Summary:        System Daemon for Managing Color Devices
 License:        GPL-2.0+
@@ -29,6 +29,9 @@ Source0:        http://www.freedesktop.org/software/colord/releases/%{name}-%{ve
 # Apparmor profile
 Source1:        usr.lib.colord
 Source99:       baselibs.conf
+Patch0:         colord-privlib.patch
+# Required for patch0
+BuildRequires:  gnome-common
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
 BuildRequires:  vala
@@ -67,6 +70,16 @@ 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 libcolorhug1
+Summary:        System Daemon for Managing Color Devices -- Library
+Group:          System/Libraries
+Suggests:       %{name}
+
+%description -n libcolorhug1
+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
@@ -79,10 +92,24 @@ there are no users logged in.
 This package provides the GObject Introspection bindings for the
 libcolord library.
 
+%package -n typelib-1_0-ColorHug-1_0
+Summary:        System Daemon for Managing Color Devices -- Introspection bindings
+Group:          System/Libraries
+
+%description -n typelib-1_0-ColorHug-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
+libcolorhug library.
+
 %package -n libcolord-devel
 Summary:        System Daemon for Managing Color Devices -- Development Files
 Group:          Development/Languages/C and C++
 Requires:       libcolord1 = %{version}
+Requires:       libcolorhug1 = %{version}
+Requires:       typelib-1_0-ColorHug-1_0 = %{version}
 Requires:       typelib-1_0-Colord-1_0 = %{version}
 
 %description -n libcolord-devel
@@ -93,8 +120,10 @@ there are no users logged in.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+NOCONFIGURE=1 ./autogen.sh
 %configure \
     --disable-static \
     --enable-polkit \
@@ -125,8 +154,12 @@ 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
+%glib2_gsettings_schema_post
 exit 0
 
+%postun
+%glib2_gsettings_schema_postun
+
 %post -n libcolord1 -p /sbin/ldconfig
 
 %postun -n libcolord1 -p /sbin/ldconfig
@@ -147,10 +180,12 @@ exit 0
 %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}-session
 %{_datadir}/%{name}/
+%{_datadir}/color/
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.*
 %{_datadir}/dbus-1/services/org.freedesktop.ColorHelper.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service
+%{_datadir}/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
 %{_datadir}/polkit-1/actions/org.freedesktop.color.policy
 %{_mandir}/man1/cd-create-profile.1%{?ext_man}
 %{_mandir}/man1/cd-fix-profile.1%{?ext_man}
@@ -160,21 +195,36 @@ exit 0
 %dir %{_libdir}/colord-plugins
 %{_libdir}/colord-plugins/libcd_plugin_camera.so
 %{_libdir}/colord-plugins/libcd_plugin_scanner.so
+# These should not be here.. this is ugly (fdo#60733)
+#{_libdir}/lib*private.*
 
 %files -n libcolord1
 %defattr(-, root, root)
 %{_libdir}/libcolord.so.*
+%{_libdir}/libcolordprivate.so.*
+
+%files -n libcolorhug1
+%defattr(-,root,root)
+%{_libdir}/libcolorhug.so.*
 
 %files -n typelib-1_0-Colord-1_0
 %defattr(-,root,root)
 %{_libdir}/girepository-1.0/Colord-1.0.typelib
 
+%files -n typelib-1_0-ColorHug-1_0
+%defattr(-,root,root)
+%{_libdir}/girepository-1.0/ColorHug-1.0.typelib
+
 %files -n libcolord-devel
 %defattr(-, root, root)
 %{_includedir}/colord-1/
 %{_libdir}/libcolord.so
+%{_libdir}/libcolordprivate.so
+%{_libdir}/libcolorhug.so
 %{_libdir}/pkgconfig/colord.pc
+%{_libdir}/pkgconfig/colorhug.pc
 %{_datadir}/gir-1.0/Colord-1.0.gir
+%{_datadir}/gir-1.0/ColorHug-1.0.gir
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/colord.vapi