New upstream version

This commit is contained in:
Richard Hughes 2017-08-09 18:00:21 +01:00
parent 41e13d8da3
commit fceaaa3382
3 changed files with 28 additions and 28 deletions

1
.gitignore vendored
View File

@ -60,3 +60,4 @@
/colord-1.3.3.tar.xz /colord-1.3.3.tar.xz
/colord-1.3.4.tar.xz /colord-1.3.4.tar.xz
/colord-1.3.5.tar.xz /colord-1.3.5.tar.xz
/colord-1.4.0.tar.xz

View File

@ -18,8 +18,8 @@
Summary: Color daemon Summary: Color daemon
Name: colord Name: colord
Version: 1.3.5 Version: 1.4.0
Release: 3%{?dist} Release: 1%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: http://www.freedesktop.org/software/colord/ URL: http://www.freedesktop.org/software/colord/
Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
@ -28,7 +28,6 @@ BuildRequires: dbus-devel
BuildRequires: docbook-utils BuildRequires: docbook-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: intltool
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: lcms2-devel >= 2.6 BuildRequires: lcms2-devel >= 2.6
BuildRequires: libgudev1-devel BuildRequires: libgudev1-devel
@ -39,6 +38,7 @@ BuildRequires: vala-tools
BuildRequires: libgusb-devel >= 0.2.2 BuildRequires: libgusb-devel >= 0.2.2
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: color-filesystem BuildRequires: color-filesystem
BuildRequires: meson
%if !0%{?rhel} %if !0%{?rhel}
BuildRequires: bash-completion BuildRequires: bash-completion
%endif %endif
@ -109,44 +109,34 @@ This may be useful for CMYK soft-proofing or for extra device support.
%setup -q %setup -q
%build %build
export CFLAGS='-fno-strict-aliasing %optflags'
# Set ~2 GiB limit so that colprof is forced to work in chunks when # 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 # 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. # chunk of RAM to put the entire B-to-A tables in.
ulimit -Sv 2000000 ulimit -Sv 2000000
%configure \
--with-daemon-user=colord \ %meson \
--enable-gtk-doc \ -Denable-vala=false \
--enable-vala \
%if 0%{?build_print_profiles} %if 0%{?build_print_profiles}
--enable-print-profiles \ -Denable-print-profiles=true \
%else %else
--disable-print-profiles \ -Denable-print-profiles=false \
%endif %endif
%if 0%{?enable_sane} %if 0%{?enable_sane}
--enable-sane \ -Denable-sane=true \
%endif %endif
%if 0%{?rhel} %if 0%{?rhel}
--disable-bash-completion \ -Denable-bash-completion=false \
--disable-argyllcms-sensor \ -Denable-argyllcms-sensor=false \
%endif %endif
%if !0%{?rhel} %if !0%{?rhel}
--enable-libcolordcompat \ -Denable-libcolordcompat=true \
%endif %endif
--disable-static \ -Dwith-daemon-user=colord
--disable-rpath \
--disable-examples \
--disable-silent-rules \
--disable-dependency-tracking
make %{?_smp_mflags} %meson_build
%install %install
make install DESTDIR=$RPM_BUILD_ROOT %meson_install
# Remove static libs and libtool archives.
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'
# databases # databases
touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/mapping.db touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/mapping.db
@ -187,7 +177,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%attr(755,colord,colord) %dir %{_localstatedir}/lib/colord/icc %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord/icc
%{_bindir}/* %{_bindir}/*
%{_datadir}/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml %{_datadir}/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf %{_datadir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
%{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager*.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager*.xml
%{_datadir}/polkit-1/actions/org.freedesktop.color.policy %{_datadir}/polkit-1/actions/org.freedesktop.color.policy
%{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service %{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service
@ -218,6 +208,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%dir %{_icccolordir}/colord %dir %{_icccolordir}/colord
%{_icccolordir}/colord/AdobeRGB1998.icc %{_icccolordir}/colord/AdobeRGB1998.icc
%{_icccolordir}/colord/ProPhotoRGB.icc %{_icccolordir}/colord/ProPhotoRGB.icc
%{_icccolordir}/colord/Rec709.icc
%{_icccolordir}/colord/SMPTE-C-RGB.icc %{_icccolordir}/colord/SMPTE-C-RGB.icc
%{_icccolordir}/colord/sRGB.icc %{_icccolordir}/colord/sRGB.icc
@ -285,13 +276,21 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_libdir}/libcolorhug.so %{_libdir}/libcolorhug.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/gir-1.0/*.gir %{_datadir}/gir-1.0/*.gir
%{_datadir}/vala/vapi/colord.vapi #%{_datadir}/vala/vapi/colord.vapi
%files devel-docs %files devel-docs
%dir %{_datadir}/gtk-doc/html/colord %dir %{_datadir}/gtk-doc/html/colord
%{_datadir}/gtk-doc/html/colord/* %{_datadir}/gtk-doc/html/colord/*
%changelog %changelog
* Wed Aug 09 2017 Richard Hughes <richard@hughsie.com> 1.4.0-1
- New upstream version
- Port to the Meson build system
- Correctly build the ICC transfer curve for Rec709
- Do not spin the Huey LEDs when the sensor is embedded
- Do not use /tmp to create profiles
- Use a different Huey unlock code on the W700 laptop
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-3 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (colord-1.3.5.tar.xz) = a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f SHA512 (colord-1.4.0.tar.xz) = 4733d30bc5277b60c96b035c0aaf7a16243fabfd8769ff743f0ac10279da423f5d00223270e5e5281cced7a2b39a9c477c2da5e3b0db18c642f6710641402849