Accepting request 528878 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/528878
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/colord?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger 2017-09-29 09:50:45 +00:00 committed by Git OBS Bridge
commit 029446526f
6 changed files with 122 additions and 56 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2daa8ffd2a532d7094927cd1a4af595b8310cea66f7707edcf6ab743460feed2
size 1263488

View File

@ -1,10 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJYtD6JAAoJEBesuo36lw4XOssH/RTNddueV0d6Uc5fj61QW8IJ
s/em8lDzUMbVVr96TgtPuF6a6nRMoDaZh+lVZTSxK2ujA4zRaiLED/cXs1ghngsS
Hm9+wk1Aci/zy/idW9mlkdfbCaxQ+oKeBSOA+ZFSmjT6c7YH+PPiBENU5paqNbZZ
mrAGZlpXoCmeuiwr0A7FJWd1FBIaqZn3ilE9B0fD9HqlE05UXnL/XF0a3x+ApLi1
dc5teS1eBb7Ur8dSn4BKtEGTwM+fwzMjw0rYOg+Y4dpywdXr80qQ/2dMPC7yGG1K
+QOyNZ5H+uEjd+uLxucGWWEA5lm9gnw9Fp4NdEtwKumAQhuK+SzPYCvvM3pp0HM=
=jYV/
-----END PGP SIGNATURE-----

3
colord-1.4.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b068fc8298265a7a3b68e7516c7a263394cff57579af0d1c0fb6b7429230555
size 1867920

10
colord-1.4.1.tar.xz.asc Normal file
View File

@ -0,0 +1,10 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJZmqP6AAoJEBesuo36lw4XrF4H/iTGIEl4+aUYu/3plWkW/QmI
MfH+56SKmsSkX4LbPlkWP+W3z3bS7uvAEpNb6JRXhIw7y3/6JxOkAw3R7Brd+2XN
zdnryIY1dJ7PY2Vw1xMpERVtOqx1O79RTdiW4Ch181qr6UwE/nO/Q+yx1Wi5I8w1
2gPZrIgYBxH+fZwXXTjH37lte1oyozQYfp0Il/OvOCbt1TGCnvyUxxDnd0mgQr08
cF6dmfeEiPGmCkw/XgMavYaaSAGFzPaE0eSjDDC94Vn+jI/Y3ycpyTZVq98CJK+G
08SwddYT360xF6I0K/6bA/jd9CKKAlmiHMroGKRBG8AKMfqb1DpXNDjbN4PBRHg=
=8/r2
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,62 @@
-------------------------------------------------------------------
Tue Sep 26 18:42:03 UTC 2017 - zaitor@opensuse.org
- Add ulimit -Sv 2000000 entry before build, set ~2 GiB limit so
that colprof is forced to work in chunks when generating the
print profile rather than trying to allocate a 3.1 GiB chunk of
RAM to put the entire B-to-A tables in.
-------------------------------------------------------------------
Mon Sep 11 14:05:14 UTC 2017 - zaitor@opensuse.org
- Add pkgconfig(vapigen) BuildRequires and pass
enable-session-example=false, enable-bash-completion=true,
enable-systemd=true, enable-libcolordcompat=true,
enable-argyllcms-sensor=true, enable-reverse=false,
enable-sane=false, enable-vala=true, enable-print-profiles=true,
enable-tests=false, enable-installed-tests=false,
with-daemon-user=colord, enable-man=true and enable-docs=true to
meson, ensure we build the feature we want.
-------------------------------------------------------------------
Thu Sep 7 19:56:12 UTC 2017 - luc14n0@linuxmail.org
- Update to version 1.4.1:
+ Bugfixes:
- Add back the meson -Denable-systemd=false configure argument.
- Add the fallback rules for older PolicyKit versions.
- Define PATH_MAX if not available.
- Enable C99 support in meson.build.
- Include all the files in the GIR target.
- Include the correct file when using Colord-1.0.gir.
- Use appropriate feature macro for realpath().
- Use gio-2.0 when generating the VAPI.
- Changes from version 1.4.0:
+ New Features:
- Port to the Meson build system.
- Enable Travis CI for Fedora 25 and Debian Stretch.
- Make PolicyKit, gusb and udev a hard requirement.
+ Bugfixes:
- Add some experimental tools for the HueyCOLOR sensor as found
in the P70.
- Conditionally build documentation and man pages.
- Correctly build the ICC transfer curve for Rec709.
- Do not build the examples as part of the regular build.
- Do not spin the Huey LEDs when the sensor is embedded.
- Do not use /tmp to create profiles.
- Fix the version numbers in cd-version.h to reflect reality.
- Get the Huey status before trying to unlock.
- Use a different Huey unlock code on the W700 laptop.
- Add meson BuildRequires, and switch autotools macros configure,
make and makeinstall to meson, meson_build and meson_install
following upstream switch to Meson Build System.
- Add gtk-doc and docbook-utils BuildRequires: new dependencies.
- Drop %glib2_gsettings_schema_* post/postun macros: the
functionality is now covered by file triggers.
- Drop intltool and vala BuildRequires: no longer needed.
- Upstream rename of ColorHug-1.0.typelib file to
Colorhug-1.0.typelib, thus its package has been renamed as well.
-------------------------------------------------------------------
Tue Mar 7 14:35:51 UTC 2017 - fezhang@suse.com

View File

@ -19,7 +19,7 @@
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
Name: colord
Version: 1.3.5
Version: 1.4.1
Release: 0
Summary: System Daemon for Managing Color Devices
License: GPL-2.0+
@ -32,9 +32,10 @@ Source2: %{name}.keyring
Source3: usr.lib.colord
Source99: baselibs.conf
BuildRequires: argyllcms
BuildRequires: docbook-utils
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
BuildRequires: vala
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: pkgconfig(bash-completion) >= 2.0
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gio-2.0) >= 2.25.9
@ -51,6 +52,7 @@ BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(vapigen)
Requires(pre): pwdutils
Requires: argyllcms
Requires: colord-color-profiles
@ -85,8 +87,8 @@ there are no users logged in.
%package color-profiles
Summary: System Daemon for Managing Color Devices -- Color profiles
Group: System/Libraries
# Last version of shared-color profiles packaged
Group: System/Libraries
Obsoletes: shared-color-profiles <= 0.1.6
Provides: shared-color-profiles
@ -109,11 +111,11 @@ 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
%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
%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.
@ -127,8 +129,8 @@ Group: Development/Languages/C and C++
Requires: %{name}-color-profiles = %{version}
Requires: libcolord2 = %{version}
Requires: libcolorhug2 = %{version}
Requires: typelib-1_0-ColorHug-1_0 = %{version}
Requires: typelib-1_0-Colord-1_0 = %{version}
Requires: typelib-1_0-Colorhug-1_0 = %{version}
%description -n libcolord-devel
colord is a system activated daemon that maps devices to color profiles.
@ -140,36 +142,40 @@ there are no users logged in.
%setup -q
%build
%configure \
--disable-static \
--disable-examples \
--enable-polkit \
--with-daemon-user=colord \
--enable-vala \
--enable-libcolordcompat \
--enable-print-profiles \
--with-tmpfilesdir=%{_tmpfilesdir} \
--enable-systemd-login
make %{?_smp_mflags}
# Set ~2 GiB limit so that colprof is forced to work in chunks when
# generating the print profile rather than trying to allocate a 3.1 GiB
# chunk of RAM to put the entire B-to-A tables in.
ulimit -Sv 2000000
%meson \
-Denable-session-example=false \
-Denable-bash-completion=true \
-Denable-systemd=true \
-Denable-libcolordcompat=true \
-Denable-argyllcms-sensor=true \
-Denable-reverse=false \
-Denable-sane=false \
-Denable-vala=true \
-Denable-print-profiles=true \
-Denable-tests=false \
-Denable-installed-tests=false \
-Dwith-daemon-user=colord \
-Denable-man=true \
-Denable-docs=true \
%{nil}
%meson_build
%install
%make_install
%meson_install
# Create colord rclink
mkdir $RPM_BUILD_ROOT%{_sbindir}
ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rc%{name}
find %{buildroot} -type f -name '*.la' -delete -print
mkdir %{buildroot}/etc/apparmor.d
# Install Apparmor profile
mkdir -p %{buildroot}/etc/apparmor.d/
install -c -m 644 %{SOURCE3} %{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}
%pre
@ -185,11 +191,9 @@ exit 0
%service_del_preun %{name}.service
%post
%glib2_gsettings_schema_post
%service_add_post %{name}.service
%postun
%glib2_gsettings_schema_postun
%service_del_postun %{name}.service
%post -n libcolord2 -p /sbin/ldconfig
@ -202,12 +206,11 @@ exit 0
%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING NEWS
%doc AUTHORS COPYING NEWS
%{_unitdir}/colord.service
%{_udevrulesdir}/*.rules
%attr(755,colord,colord) %dir %{_localstatedir}/lib/colord
%{_datadir}/bash-completion/completions/colormgr
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
%{_bindir}/cd-create-profile
%{_bindir}/cd-fix-profile
%{_bindir}/cd-iccdump
@ -221,6 +224,8 @@ exit 0
%{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.*
%{_datadir}/dbus-1/services/org.freedesktop.ColorHelper.service
%{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service
%dir %{_datadir}/dbus-1/system.d
%{_datadir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
%{_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}
@ -230,11 +235,9 @@ exit 0
%dir /etc/apparmor.d/
%config /etc/apparmor.d/usr.lib.colord
%dir %{_libdir}/colord-plugins
%{_libdir}/colord-plugins/libcd_plugin_camera.so
%{_libdir}/colord-plugins/libcd_plugin_scanner.so
%{_libdir}/libcolordcompat.so
# These should not be here.. this is ugly (fdo#60733)
#{_libdir}/lib*private.*
%{_libdir}/colord-plugins/libcolord_sensor_camera.so
%{_libdir}/colord-plugins/libcolord_sensor_scanner.so
%{_sbindir}/rc%{name}
%files color-profiles
@ -254,9 +257,9 @@ exit 0
%defattr(-,root,root)
%{_libdir}/girepository-1.0/Colord-1.0.typelib
%files -n typelib-1_0-ColorHug-1_0
%files -n typelib-1_0-Colorhug-1_0
%defattr(-,root,root)
%{_libdir}/girepository-1.0/ColorHug-1.0.typelib
%{_libdir}/girepository-1.0/Colorhug-1.0.typelib
%files -n libcolord-devel
%defattr(-, root, root)
@ -267,10 +270,14 @@ exit 0
%{_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}/gir-1.0/Colorhug-1.0.gir
%{_datadir}/vala/vapi/colord.deps
%{_datadir}/vala/vapi/colord.vapi
%dir %{_datadir}/gtk-doc/html/colord
%{_datadir}/gtk-doc/html/colord/colord.devhelp2
%{_datadir}/gtk-doc/html/colord/*.png
%{_datadir}/gtk-doc/html/colord/*.html
%{_datadir}/gtk-doc/html/colord/style.css
%{_userunitdir}/colord-session.service
%{_tmpfilesdir}/colord.conf