devel/yum yum.spec,1.163,1.164

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073

Modified Files:
	yum.spec 
Log Message:
* Tue Jul 24 2007 Jeremy Katz <katzj at redhat.com> - 3.2.2-2
- remove yum-updatesd subpackage; moving to the separate version



Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- yum.spec	20 Jul 2007 19:44:25 -0000	1.163
+++ yum.spec	24 Jul 2007 15:32:50 -0000	1.164
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -54,32 +54,22 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/yum.conf
-
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d $RPM_BUILD_ROOT/usr/lib/yum-plugins
 
-
-# install yum-updatesd
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-updatesd.conf
-
 # for now, move repodir/yum.conf back
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/yum/repos.d $RPM_BUILD_ROOT/%{_sysconfdir}/yum.repos.d
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum.conf
 
+# yum-updatesd has moved to the separate source version
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-updatesd.conf 
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-updatesd
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf
+rm -f $RPM_BUILD_ROOT/%{_sbindir}/yum-updatesd
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/yum-updatesd*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post updatesd
-/sbin/chkconfig --add yum-updatesd
-/sbin/service yum-updatesd condrestart >/dev/null 2>&1
-exit 0
-
-%preun updatesd
-if [ $1 = 0 ]; then
- /sbin/chkconfig --del yum-updatesd
- /sbin/service yum-updatesd stop >/dev/null 2>&1
-fi
-exit 0
-
 %files
 %defattr(-, root, root, -)
 %doc README AUTHORS COPYING TODO INSTALL ChangeLog
@@ -99,17 +89,11 @@
 %dir %{_sysconfdir}/yum/pluginconf.d 
 %dir /usr/lib/yum-plugins
 
-%files updatesd
-%defattr(-, root, root, -)
-%config(noreplace) %{_sysconfdir}/yum/yum-updatesd.conf
-%config %{_sysconfdir}/rc.d/init.d/yum-updatesd
-%config %{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf
-%{_sbindir}/yum-updatesd
-%{_mandir}/man*/yum-updatesd*
-
-
 %changelog
-* Fri Jul 20 2007 Seth Vidal <skvidal at fedoraproject.org>
+* Tue Jul 24 2007 Jeremy Katz <katzj at redhat.com> - 3.2.2-2
+- remove yum-updatesd subpackage; moving to the separate version
+
+* Fri Jul 20 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.2-1
 - 3.2.2
 - disable unused installonlyn plugin
 - set installonly_limit to '2'