pool/colord-gtk
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 135327 from home:dimstar:branches:GNOME:Factory

Browse Source 
resubmit

OBS-URL: https://build.opensuse.org/request/show/135327
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord-gtk?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2012-09-21 21:20:58 +00:00 committed by Git OBS Bridge
parent 760ff31b4c
commit 56c1e2f6b4
4 changed files with 540 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselibs.conf Normal file
View File

@ -0,0 +1 @@
libcolord-gtk1

420
colord-gtk.changes Normal file
View File

@ -0,0 +1,420 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed May 23 19:18:54 UTC 2012 - zaitor@opensuse.org
- Update to version 0.1.21:
+ Do not add sensors that are ignored or have no caps.
+ Do not install any parts of colord-sane if --disable-sane is
specified.
+ Do not use 'WantedBy=graphical.target' in the shipped systemd
file.
+ Fix autotools when configuring without systemd.
+ Fix InstallSystemWide() by not writing a private file.
+ Fix srcdir != builddir with introspection enabled.
+ Fix the description in the systemd service file.
+ Isolate gtk dependency to cd-convert.
+ Save the CCMX and ITx files to be compatible with argyllcms
+ The ColorHug has a new VID and PID.
- Drop colord-build-no-gtk.patch, fixed upstream.
- Removed call to gnome-autogen.sh and drop gnome-common
buildrequires, only needed for above dropped patch.
-------------------------------------------------------------------
Mon May 14 09:53:20 UTC 2012 - vuntz@opensuse.org
- Update to version 0.1.20:
+ New Features:
- Add a bash completion file for colormgr
- Add a BUSY state value for sensor devices
- Add a GObject Introspection example
- Add a sensor-set-options command to the colormgr tool
- Add async and sync methods in libcolord to support sensor
options
- Add CdIt8 as a helper for reading and writing ti1, ti3 and
ccmx files
- Add cd_it8_utils_calculate_ccmx() to libcolorhug
- Add CdSampleWindow to libcolord-gtk
- Add CdWindow which allows us to get the color profile for a
GtkWidget
- Add functionality to colord-convert to sample ti1 -> ti3
files
- Add gio-2.0 to the requires line of colord.pc for GFile
- Add the concept of 'options' on each color sensor device
- colorhug: Allow saving the remote hash as a sensor option
- Print any sensor options when doing 'colormgr get-sensors'
+ Bugfixes:
- colorhug: Save the EEPROM after setting sensor options
- Enable gtk-doc in the default distro build
- Fix build failure when colord is not installed system-wide
- Add colord-build-no-gtk.patch: fix build without GTK+.
- Add gnome-common BuildRequires and call to gnome-autogen.sh,
needed for above patch.
- Enable the build of colord-gtk, by creating a colord-gtk.spec
based on colord.spec (with pre_checkin.sh). We do it this way to
avoid a build loop between colord and gtk3, since gtk3 depends on
colord. The differences are:
+ Add a pkgconfig(gtk+-3.0) BuildRequires.
+ Add colord and libcolord-devel BuildRequires, so we can use rpm
to remove the files from colord.spec subpackages in %install
(in order to only package colord-gtk files).
+ Create libcolord-gtk1, typelib-1_0-ColordGtk-1_0 and
libcolord-gtk-devel subpackages.
-------------------------------------------------------------------
Wed Apr 18 07:31:39 UTC 2012 - vuntz@opensuse.org
- Update to version 0.1.19:
+ New Features:
- Add a user suffix to the object path of user-created devices
and profiles
+ Bugfixes:
- Add User key to colord-sane's DBus service file
- Do not enable PrivateNetwork=yes as it breaks hotplugging
devices
- Ensure colord-sane can create devices and profiles
- Fix usage of CD_OBJECT_SCOPE_* enums
- Honor aclocal flags
- Remove the 'Default,' profile title prefix if legacy profiles
are installed
-------------------------------------------------------------------
Thu Mar 15 19:29:33 UTC 2012 - vuntz@opensuse.org
- Update to version 0.1.18:
+ New Features:
- Add a Manager.CreateProfileWithFd() method for QtDBus
- Add the GAMUT_coverage metadata key to the spec
- Add the GAMUT_volume metadata key to the spec
- Depend on lcms2 >= 2.2
- Make cd-fix-profile add the GAMUT keys to the ICC file
- Split out the SANE support into it's own process
+ Bugfixes:
- Do not delete 'disk' or 'normal' devices when the session
exits
- Ensure we return NULL for missing device properties
- Fix a small leak when creating devices and profiles in
clients
- Fix cd-fix-profile to add and remove metadata entries
- Install per-machine profiles in /var/lib/colord/icc
- Show what DBus names have inhibited each device
- When doing 'get-devices' show the profile ID and filename
- Add new colord-sane.service as argument to calls to
%service_{add,del}_* macros.
-------------------------------------------------------------------
Mon Feb 27 13:24:10 UTC 2012 - vuntz@opensuse.org
- Fix systemd-related packaging:
+ Use %{?systemd_requires}.
+ Call %service_{add,del}_* macros in scriptlets for
colord.service.
-------------------------------------------------------------------
Thu Feb 23 07:51:54 UTC 2012 - vuntz@opensuse.org
- Update to version 0.1.17:
+ New Features:
- Add an LED sample type
- Add a metadata key to store the calibration brightness
- Show the profile title when using colormgr get-profiles
+ Bugfixes:
- Add PrivateNetwork and PrivateTmp to the systemd service file
- Don't leak a GVariantIter when setting the device metadata
- Fix a critical warning if a client tries to get the profile
metadata
- Fix InstallSystemWide() when running as the colord user
- Increase the colorhug sample timeout to 5 seconds
- Make underscores into spaces for the profile title
- Return from cd_profile_has_access() with TRUE for virtual
profiles
- Remove xz BuildRequires now that it comes for free in the build
system.
-------------------------------------------------------------------
Wed Jan 18 10:47:23 UTC 2012 - vuntz@opensuse.org
- Add pkgconfig(gusb) BuildRequires to build with libgusb support,
which matters even more now than libusb support is gone.
-------------------------------------------------------------------
Tue Jan 17 18:02:05 UTC 2012 - vuntz@opensuse.org
- Update to version 0.1.16:
+ New Features:
- Add a device-inhibit command to the colormgr client
- Add org.freedesktop.policykit.owner annotations to .policy
file
- Add profile metadata MAPPING_device_id for automatic profile
mapping
- Add some profile metadata keys
- Install a systemd service file if systemd is used
- Support 2nd generation Huey hardware
- Use GUsb for the Huey sensor
+ Bugfixes:
- Fix a Wformat error when printing a gsize
- If /usr/share/color appears at runtime, don't rescan the
parent dir
- Set the colorimeter sensor group so the dameon can access the
sensor
- Split the spyder hardware into different types
- Add pkgconfig(systemd) BuildRequires, following upstream change,
to know where to install the .service file.
- Remove pkgconfig(libusb-1.0) BuildRequires: the dependency is
gone now.
- Drop colord-polkit-annotate-owner.patch: fixed upstream.
- Remove libtool BuildRequires and call to autoreconf and
intltoolize, that were only needed for above patch.
-------------------------------------------------------------------
Thu Dec 8 20:25:09 UTC 2011 - dimstar@opensuse.org
- Split typelib file into typelib-1_0-Colord-1_0 subpackage.
- Add typelib-1_0-Colord-1_0 Requires to libcolord-devel
subpackage.
-------------------------------------------------------------------
Tue Dec 6 16:06:22 UTC 2011 - vuntz@opensuse.org
- Run the colord daemon as user colord (bnc#698250):
+ Add colord-polkit-annotate-owner.patch: add
org.freedesktop.policykit.owner annotations to policy file so
that running as colord user works.
+ Add a %pre script to create the colord user and change
ownership of /var/lib/colord.
+ Add pwdutils Requires(pre), to make sure we can create the
user.
+ Pass --with-daemon-user=colord to configure.
+ Package /var/lib/colord with the right user.
+ Add libtool BuildRequires and calls to autoreconf and
intltoolize, as needed by above patch.
-------------------------------------------------------------------
Tue Nov 29 21:27:11 UTC 2011 - dimstar@opensuse.org
- Update to version 0.1.15:
+ This release fixes an important security bug: CVE-2011-4349.
+ New Features:
- Add a native driver for the Hughski ColorHug hardware
- Export cd-math as three projects are now using it
+ Bugfixes:
- Documentation fixes and improvements
- Do not crash the daemon if adding the device to the db failed
- Do not match any sensor device with a kernel driver
- Don't be obscure when the user passes a device-id to colormgr
- Fix a memory leak when getting properties from a device
- Fix colormgr device-get-default-profile
- Fix some conection bugs in colormgr
- Fix some potential SQL injections
- Make gusb optional
- Only use the udev USB helper if the PID and VID have matches
- Output the Huey calibration matrices when dumping the sensor
-------------------------------------------------------------------
Wed Nov 16 10:27:26 UTC 2011 - dimstar@opensuse.org
- Update to version 0.1.14:
+ New Features:
- Add defines for the i1 Display 3
- Add two more DATA_source values to the specification
- Align the output from colormgr get-devices and get-profiles
- Allow cd-fix-profile to append and edit new metadata
+ Bugfixes:
- Ensure non-native device are added with no driver module
- Split the sensor and device udev code
+ Updated translations.
-------------------------------------------------------------------
Fri Oct 28 14:31:58 UTC 2011 - lnussel@suse.de
- don't recommend colord from libcolord1 to prevent automatic
installation (bnc#698250)
-------------------------------------------------------------------
Mon Oct 3 20:50:40 CEST 2011 - dimstar@opensuse.org
- Update to version 0.1.13:
+ New Features:
- Add an 'Owner' property on device and profile objects
- Add cd_profile_has_access() to filter profiles from other
user accounts
- Add the crayon named color palette
- Add --xorg-gamma to cd-create-profile to create custom gamma
ramps
+ Bugfixes:
- Add a note in the naming specification about the username
suffix
- colormgr only needs one argument for find-device
- Ensure remote DBus errors are registered at startup
- Ensure uid 0 can always create devices and profiles
- Fix an error in configure if there is no sane .pc file
- Fix the --disable-polkit build
- Documentation: cd_device_get_modified() returns microseconds
- Reduce the CPU load of clients when assigning profiles from
the session
- Return an error if a client tries to create a duplicate
device
- Return an error when trying to register a duplicate profile
-------------------------------------------------------------------
Sat Sep 17 23:39:25 UTC 2011 - jengelh@medozas.de
- Remove redundant tags/sections from specfile
-------------------------------------------------------------------
Fri Sep 9 16:28:41 UTC 2011 - vuntz@opensuse.org
- Add baselibs.conf.
-------------------------------------------------------------------
Fri Sep 2 08:20:51 UTC 2011 - vuntz@opensuse.org
- Update to version 0.1.12:
+ New Features:
- Add a configure argument --enable-volume-search
- Add a configure argument of --enable-fd-fallback
- Add cd_client_import_profile() to be able to easily import a
GFile
- Allow the daemon to run with a different user
+ Bugfixes:
- Add daemon user to acl of sensor devices
- Add lcms2 to Requires.private
- Check if a file is really an ICC profile before importing it
- Detect libusb_strerror in configure rather than relying on
the version
- Do not fail make check if there is no available local colord
process to use
- Ensure the profiles are sorted by their timestamp during
login
- Ensure the volume-sourced profiles are not marked as
systemwide profiles
- Exit with an error when trying to connect to a device that
does not exist
- Remove duplicate call to complete in libcolord
- Try harder to use the ICC profile checksum
- Changes from version 0.1.11:
+ New Features:
- Enable GObject introspection generation on libcolord
- Generate a Vala API binding from the GObject Introspection
GIR
- Move the project home to freedesktop.org
- Ship generated man pages in tarballs
+ Bugfixes:
- Add all of the required GObject Introspection annotations
required
- Allow FindDeviceByProperty() to match on model, vendor and
serial number
- Don't crash the example program if there is no default
profile assigned
- Fix the bugzilla and mailing list links on the webpage
(fdo#39129).
- Fix the licence headers in colord.h and cd-color.h
- Fix up some translatable strings
- Honor ACLOCAL_FLAGS when running autoreconf
- Use the const formatter when unwrapping GVariants to reduce
memory allocation
+ Updated translations.
- Add gobject-introspection-devel and vala BuildRequires to build
introspection data and vala bindings.
- Manually install pre-built man pages, since the build system
cannot install them if docbook2man is not there (and we don't
want to add a BuildRequires on it since it's big).
-------------------------------------------------------------------
Mon Jul 11 12:43:32 CEST 2011 - vuntz@opensuse.org
- Remove docbook-utils BuildRequires as an attempt to remove a
build cycle in Factory.
- This means we lose man pages for now, but upstream will ship them
pre-generated in tarballs in the future.
-------------------------------------------------------------------
Wed Jul 6 18:21:17 CEST 2011 - vuntz@opensuse.org
- Update to version 0.1.10:
+ New Features:
- Add a find-profile-by-filename command to the colormgr client
tool
- Add the object scope to the DBus interface as a property
- Write a document detailing the colord security attack surface
+ Bugfixes:
- Actually store the device ID in the mapping database
- Fix include statements to search from current libcolord
folder
- Fix mbstowcs usage
- Fix the build for old versions of lcms2
- Fix up the location of the libcolord header files
- Remove the DBus annotations in the introspection
-------------------------------------------------------------------
Mon Jul 4 15:31:22 CEST 2011 - vuntz@opensuse.org
- Drop rpmlintrc as bnc#698250 got fixed and
suse-dbus-unauthorized-service/polkit-unauthorized-privilege
warnings are now gone.
-------------------------------------------------------------------
Fri Jun 17 00:33:14 CEST 2011 - vuntz@opensuse.org
- Update to version 0.1.9:
+ New Features:
- Add a 'Format' property to the device interface
- Add a new method Client:FindDeviceByProperty for when only a
property is known
- Add methods to get the connected state of each object
- Define the DATA_source profile metadata item
- Define three metadata keys for the framework creator to set
- Define two keys to allow the profile to contain the mapping
parameters
+ Bugfixes:
- Allow GUDEV to be disabled at compile time
- Autodetect SANE in configure
- Fix 3 small memory leaks
- Fix a bug that caused a critical warning in client code
- Only warn if we fail to get the PolicyKit authority
- Save any additional disk device metadata in the property
database
- Use upstream gettext instead the glib one
- Write the new metadata entries in the utility programs
- Add xz BuildRequires because we can't build a package for a
xz-compressed tarball without explicitly specifying that... See
bnc#697467 for more details.
-------------------------------------------------------------------
Thu Jun 16 16:51:34 CEST 2011 - vuntz@opensuse.org
- Add docbook-utils BuildRequires to build man pages.
- Add colord Recommends to libcolord1 as the library is not too
useful without the daemon.
- Add shared-color-profiles Requires to colord, as we want to have
profiles.
-------------------------------------------------------------------
Mon Jun 6 13:46:22 UTC 2011 - dimstar@opensuse.org
- Initial package, version 0.1.8.

119
colord-gtk.spec Normal file
View File

@ -0,0 +1,119 @@
#
# spec file for package colord-gtk
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: colord-gtk
Version: 0.1.23
Release: 0
License: LGPL-2.1+
Summary: System Daemon for Managing Color Devices -- GTK Integration
Url: http://colord.hughsie.com/
Group: System/Daemons
Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
Source99: baselibs.conf
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: intltool >= 0.35.0
BuildRequires: vala
BuildRequires: xsltproc
BuildRequires: pkgconfig(colord)
BuildRequires: pkgconfig(gio-2.0) >= 2.25.9
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.28.0
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
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 libcolord-gtk1
Summary: System Daemon for Managing Color Devices -- GTK Integration Library
Group: System/Libraries
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.
It is used by gnome-color-manager for system integration and use when
there are no users logged in.
%package -n typelib-1_0-ColordGtk-1_0
Summary: System Daemon for Managing Color Devices -- GTK Integration Introspection bindings
Group: System/Libraries
%description -n typelib-1_0-ColordGtk-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-gtk library.
%package -n libcolord-gtk-devel
Summary: System Daemon for Managing Color Devices -- GTK Integration Development Files
Group: Development/Languages/C and C++
Requires: libcolord-gtk1 = %{version}
Requires: typelib-1_0-ColordGtk-1_0 = %{version}
%description -n libcolord-gtk-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.
%lang_package
%prep
%setup -q
%build
%configure --disable-static
make %{?_smp_mflags}
%install
%make_install
find %{buildroot} -type f -name '*.la' -delete -print
%find_lang %{name} %{?no_lang_C}
%post -n libcolord-gtk1 -p /sbin/ldconfig
%postun -n libcolord-gtk1 -p /sbin/ldconfig
%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
%files -n libcolord-gtk-devel
%defattr(-, root, root)
%{_includedir}/colord-1/colord-gtk.h
%{_includedir}/colord-1/colord-gtk/
%{_libdir}/libcolord-gtk.so
%{_libdir}/pkgconfig/colord-gtk.pc
%{_datadir}/gir-1.0/ColordGtk-1.0.gir
%{_datadir}/vala/vapi/colord-gtk.vapi
%changelog

290
project.diff
View File

@ -1,290 +0,0 @@
--- 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