merge to cooker

This commit is contained in:
Sergey A. Sokolov 2012-08-30 17:03:42 +04:00
commit b98244d65a
2 changed files with 53 additions and 13 deletions

View file

@ -1,2 +1,2 @@
sources: sources:
"colord-0.1.15.tar.xz": e83a68add3fac9c677829925794ee353743dc9c8 "colord-0.1.21.tar.xz": dbf981beec70e81c45cf46b150f426fc1eb56c24

View file

@ -6,7 +6,7 @@
Summary: Color daemon Summary: Color daemon
Name: colord Name: colord
Version: 0.1.15 Version: 0.1.21
Release: 1 Release: 1
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: System/X11 Group: System/X11
@ -42,7 +42,6 @@ Main library for %{name}.
%package -n %{girname} %package -n %{girname}
Summary: GObject Introspection interface description for %{name} Summary: GObject Introspection interface description for %{name}
Group: System/Libraries Group: System/Libraries
Requires: %{libname} = %{version}-%{release}
%description -n %{girname} %description -n %{girname}
GObject Introspection interface description for %{name}. GObject Introspection interface description for %{name}.
@ -51,6 +50,7 @@ GObject Introspection interface description for %{name}.
Summary: Development package for %{name} Summary: Development package for %{name}
Group: Development/C Group: Development/C
Requires: %{libname} = %{version}-%{release} Requires: %{libname} = %{version}-%{release}
Requires: %{girname} = %{version}-%{release}
Provides: %{name}-devel = %{version}-%{release} Provides: %{name}-devel = %{version}-%{release}
%description -n %{develname} %description -n %{develname}
@ -61,6 +61,8 @@ Files for development with %{name}.
%build %build
%configure \ %configure \
--with-daemon-user=colord \
--with-systemdsystemunitdir=%{_systemunitdir} \
--disable-static \ --disable-static \
--disable-rpath \ --disable-rpath \
--disable-examples \ --disable-examples \
@ -80,22 +82,35 @@ touch %{buildroot}%{_localstatedir}/lib/colord/storage.db
%find_lang %{name} %find_lang %{name}
%pre
getent group colord >/dev/null || groupadd -r colord
getent passwd colord >/dev/null || \
useradd -r -g colord -d /var/lib/colord -s /sbin/nologin \
-c "User for colord" colord
exit 0
%files -f %{name}.lang %files -f %{name}.lang
%doc README AUTHORS NEWS %doc README AUTHORS NEWS
%config %{_sysconfdir}/colord.conf %config %{_sysconfdir}/colord.conf
%dir %{_localstatedir}/lib/colord %{_sysconfdir}/dbus-1/system.d/org.freedesktop.colord-sane.conf
%dir %{_datadir}/color/icc/colord %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf
/lib/udev/rules.d/*.rules /lib/udev/rules.d/*.rules
%{_bindir}/* %{_bindir}/*
%{_libdir}/colord %{_libdir}/colord
%{_libdir}/colord-sane
%{_libdir}/colord-sensors %{_libdir}/colord-sensors
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ColorManager.conf %dir %{_datadir}/color/icc/colord
%{_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
%{_datadir}/man/man1/*.1.*
%{_datadir}/color/icc/colord/*.ic? %{_datadir}/color/icc/colord/*.ic?
%{_datadir}/dbus-1/interfaces/org.freedesktop.colord.sane.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager*.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.colord-sane.service
%{_datadir}/dbus-1/system-services/org.freedesktop.ColorManager.service
%{_datadir}/polkit-1/actions/org.freedesktop.color.policy
%{_datadir}/man/man1/*.1.*
%dir %{_localstatedir}/lib/colord
%ghost %{_localstatedir}/lib/colord/*.db %ghost %{_localstatedir}/lib/colord/*.db
%{_sysconfdir}/bash_completion.d/*-completion.bash
%{_systemunitdir}/*.service
%files -n %{libname} %files -n %{libname}
%{_libdir}/libcolord.so.%{major}* %{_libdir}/libcolord.so.%{major}*
@ -113,6 +128,31 @@ touch %{buildroot}%{_localstatedir}/lib/colord/storage.db
%changelog %changelog
* Thu May 24 2012 Guilherme Moro <guilherme@mandriva.com> 0.1.21-1
+ Revision: 800475
- updated to version 0.1.21
changed daemon user
added service file for systemd
* Thu Apr 26 2012 Matthew Dawkins <mattydaw@mandriva.org> 0.1.19-1
+ Revision: 793660
- new version 0.1.19
+ Tomasz Pawel Gajc <tpg@mandriva.org>
- update to new version 0.1.18
* Sun Feb 26 2012 Andrey Bondrov <abondrov@mandriva.org> 0.1.17-1
+ Revision: 780851
- New version 0.1.17
* Sat Feb 11 2012 Oden Eriksson <oeriksson@mandriva.com> 0.1.15-2
+ Revision: 772945
- relink against libpcre.so.1
+ Dmitry Mikhirev <dmikhirev@mandriva.org>
- fixed BR sqlite3
* Mon Dec 26 2011 Dmitry Mikhirev <dmikhirev@mandriva.org> 0.1.15-1 * Mon Dec 26 2011 Dmitry Mikhirev <dmikhirev@mandriva.org> 0.1.15-1
+ Revision: 745440 + Revision: 745440
- fixed BR sqlite3 - fixed BR sqlite3