SPECS: yum.spec - AC-branch merge: - more deps for yum-updatesd, ...

[glen]

Author: glen                         Date: Mon Dec 17 08:42:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge:
  - more deps for yum-updatesd, separate package for yum-updatesd
  - yum-metadata-parser dep on base pkg
  - python-sqlite1 is yum-metadata-parser dep

---- Files affected:
SPECS:
   yum.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/yum.spec
diff -u SPECS/yum.spec:1.46 SPECS/yum.spec:1.47
--- SPECS/yum.spec:1.46	Mon Dec 17 09:19:20 2007
+++ SPECS/yum.spec	Mon Dec 17 09:42:53 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Narzędzie do instalowania/uaktualniania pakietów RPM
 Name:		yum
 Version:	3.2.8
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -17,15 +17,13 @@
 BuildRequires:	gettext-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.228
-Requires(post,preun):	/sbin/chkconfig
 Requires:	python >= 1:2.5
 Requires:	python-libxml2
 Requires:	python-rpm
 Requires:	python-sqlite
-Requires:	python-sqlite1
 Requires:	python-urlgrabber
-Requires:	rc-scripts
 Requires:	rpm
+Requires:	yum-metadata-parser
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,10 +36,24 @@
 uaktualnione pakiety RPM. Zależności są ściągane automatycznie po
 zapytaniu użytkownika w razie potrzeby.
 
+%package updatesd
+Summary:	RPM update notifier daemon
+Group:		Networking/Daemons
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
+Requires:	dbus
+Requires:	python-dbus
+Requires:	rc-scripts
+
+%description updatesd
+This is a daemon which periodically checks for updates and can send
+notifications via mail, dbus or syslog.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make}
@@ -61,11 +73,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post updatesd
 /sbin/chkconfig --add yum-updatesd
 %service yum-updatesd restart
 
-%preun
+%preun updatesd
 if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del yum-updatesd
 	%service -q yum-updatesd stop
@@ -79,12 +91,9 @@
 %dir %{_sysconfdir}/yum/repos.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/repos.d/*.repo
 %dir %{_sysconfdir}/yum/pluginconf.d
-%dir /etc/dbus-1/system.d/yum-updatesd.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/yum-updatesd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
+
 %attr(755,root,root) %{_bindir}/yum
-%attr(755,root,root) %{_sbindir}/yum-updatesd
-%attr(754,root,root) /etc/rc.d/init.d/yum-updatesd
 %dir %{py_sitescriptdir}/yum
 %dir %{py_sitescriptdir}/rpmUtils
 %{_libdir}/yum-plugins
@@ -94,12 +103,25 @@
 /var/cache/yum
 %{_mandir}/man*/*
 
+%files updatesd
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/yum-updatesd.conf
+/etc/dbus-1/system.d/yum-updatesd.conf
+%attr(755,root,root) %{_sbindir}/yum-updatesd
+%attr(754,root,root) /etc/rc.d/init.d/yum-updatesd
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2007-12-17 08:42:53  glen
+- AC-branch merge:
+  - more deps for yum-updatesd, separate package for yum-updatesd
+  - yum-metadata-parser dep on base pkg
+  - python-sqlite1 is yum-metadata-parser dep
+
 Revision 1.46  2007-12-17 08:19:20  glen
 - install pldized initscript
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/yum.spec?r1=1.46&r2=1.47&f=u