diff --git a/.gitignore b/.gitignore index f8f32b3..00072fb 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /colord-1.3.3.tar.xz /colord-1.3.4.tar.xz /colord-1.3.5.tar.xz +/colord-1.4.0.tar.xz diff --git a/colord.spec b/colord.spec index d4634c1..5e24a97 100644 --- a/colord.spec +++ b/colord.spec @@ -18,8 +18,8 @@ Summary: Color daemon Name: colord -Version: 1.3.5 -Release: 3%{?dist} +Version: 1.4.0 +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 @@ -28,7 +28,6 @@ BuildRequires: dbus-devel BuildRequires: docbook-utils BuildRequires: gettext BuildRequires: glib2-devel -BuildRequires: intltool BuildRequires: systemd-devel BuildRequires: lcms2-devel >= 2.6 BuildRequires: libgudev1-devel @@ -39,6 +38,7 @@ BuildRequires: vala-tools BuildRequires: libgusb-devel >= 0.2.2 BuildRequires: gtk-doc BuildRequires: color-filesystem +BuildRequires: meson %if !0%{?rhel} BuildRequires: bash-completion %endif @@ -109,44 +109,34 @@ This may be useful for CMYK soft-proofing or for extra device support. %setup -q %build -export CFLAGS='-fno-strict-aliasing %optflags' # 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 -%configure \ - --with-daemon-user=colord \ - --enable-gtk-doc \ - --enable-vala \ + +%meson \ + -Denable-vala=false \ %if 0%{?build_print_profiles} - --enable-print-profiles \ + -Denable-print-profiles=true \ %else - --disable-print-profiles \ + -Denable-print-profiles=false \ %endif %if 0%{?enable_sane} - --enable-sane \ + -Denable-sane=true \ %endif %if 0%{?rhel} - --disable-bash-completion \ - --disable-argyllcms-sensor \ + -Denable-bash-completion=false \ + -Denable-argyllcms-sensor=false \ %endif %if !0%{?rhel} - --enable-libcolordcompat \ + -Denable-libcolordcompat=true \ %endif - --disable-static \ - --disable-rpath \ - --disable-examples \ - --disable-silent-rules \ - --disable-dependency-tracking + -Dwith-daemon-user=colord -make %{?_smp_mflags} +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT - -# Remove static libs and libtool archives. -find %{buildroot} -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' +%meson_install # databases 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 %{_bindir}/* %{_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}/polkit-1/actions/org.freedesktop.color.policy %{_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 %{_icccolordir}/colord/AdobeRGB1998.icc %{_icccolordir}/colord/ProPhotoRGB.icc +%{_icccolordir}/colord/Rec709.icc %{_icccolordir}/colord/SMPTE-C-RGB.icc %{_icccolordir}/colord/sRGB.icc @@ -285,13 +276,21 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/libcolorhug.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gir-1.0/*.gir -%{_datadir}/vala/vapi/colord.vapi +#%{_datadir}/vala/vapi/colord.vapi %files devel-docs %dir %{_datadir}/gtk-doc/html/colord %{_datadir}/gtk-doc/html/colord/* %changelog +* Wed Aug 09 2017 Richard Hughes 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 - 1.3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 4da9484..cc4fc44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (colord-1.3.5.tar.xz) = a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f +SHA512 (colord-1.4.0.tar.xz) = 4733d30bc5277b60c96b035c0aaf7a16243fabfd8769ff743f0ac10279da423f5d00223270e5e5281cced7a2b39a9c477c2da5e3b0db18c642f6710641402849