rpms/colord
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Move ldconfig %post* scriptlets to -libs.

Browse Source 
- Run test suite during build.
- Fix bogus date in %changelog.
This commit is contained in:
Ville Skyttä 2013-12-21 20:48:44 +02:00
parent 9cc7e8fccd
commit 063f076fa7
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
colord.spec
View File

@ -19,7 +19,7 @@
Summary: Color daemon Summary: Color daemon
Name: colord Name: colord
Version: 1.1.5 Version: 1.1.5
Release: 2%{?dist} Release: 3%{?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
@ -39,6 +39,7 @@ BuildRequires: vala-tools
BuildRequires: libgusb-devel BuildRequires: libgusb-devel
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: color-filesystem BuildRequires: color-filesystem
BuildRequires: valgrind
%if !0%{?rhel} %if !0%{?rhel}
BuildRequires: bash-completion BuildRequires: bash-completion
%endif %endif
@ -153,6 +154,11 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
%find_lang %{name} %find_lang %{name}
%check
# known failure as of 1.1.5: colorhug/device-queue
make check || \
{ rc=$?; find . -name test-suite.log | xargs cat; } # exit $rc; }
%pre %pre
getent group colord >/dev/null || groupadd -r colord getent group colord >/dev/null || groupadd -r colord
getent passwd colord >/dev/null || \ getent passwd colord >/dev/null || \
@ -161,7 +167,6 @@ getent passwd colord >/dev/null || \
exit 0 exit 0
%post %post
/sbin/ldconfig
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%systemd_post colord.service %systemd_post colord.service
@ -169,10 +174,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%systemd_preun colord.service %systemd_preun colord.service
%postun %postun
/sbin/ldconfig
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%systemd_postun colord.service %systemd_postun colord.service
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files -f %{name}.lang %files -f %{name}.lang
%doc README.md AUTHORS NEWS COPYING %doc README.md AUTHORS NEWS COPYING
%{_libexecdir}/colord %{_libexecdir}/colord
@ -275,6 +282,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/gtk-doc/html/colord/* %{_datadir}/gtk-doc/html/colord/*
%changelog %changelog
* Sat Dec 21 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.1.5-3
- Move ldconfig %%post* scriptlets to -libs.
- Run test suite during build.
- Fix bogus date in %%changelog.
* Wed Dec 11 2013 Richard Hughes <richard@hughsie.com> 1.1.5-2 * Wed Dec 11 2013 Richard Hughes <richard@hughsie.com> 1.1.5-2
- Add conflict on icc-profiles-openicc - Add conflict on icc-profiles-openicc
- The OpenICC profiles are not really compatible for a few reasons: - The OpenICC profiles are not really compatible for a few reasons:
@ -323,7 +335,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
- Use %ghost to avoid removing databases on upgrades - Use %ghost to avoid removing databases on upgrades
- Use the exact D50 whitepoint values - Use the exact D50 whitepoint values
* Sun Jul 30 2013 Richard Hughes <richard@hughsie.com> 1.1.1-1 * Tue Jul 30 2013 Richard Hughes <richard@hughsie.com> 1.1.1-1
- New upstream version - New upstream version
- This release bumps the soname of libcolord as long deprecated methods have - This release bumps the soname of libcolord as long deprecated methods have
finally been removed. Any programs that link against libcolord will have to finally been removed. Any programs that link against libcolord will have to