From ea4e4becb03f06e67c8fc4bdb7554cd4166ab0ad Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Wed, 14 Jun 2006 03:51:16 +0000
Subject: [PATCH] - install yum-updatesd bits

---
 yum-updatesd.conf.fedora | 15 +++++++++++++++
 yum.spec                 | 39 +++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 yum-updatesd.conf.fedora

diff --git a/yum-updatesd.conf.fedora b/yum-updatesd.conf.fedora
new file mode 100644
index 0000000..2088753
--- /dev/null
+++ b/yum-updatesd.conf.fedora
@@ -0,0 +1,15 @@
+[main]
+# how often to check for new updates (in seconds)
+run_interval = 3600
+# how often to allow checking on request (in seconds)
+updaterefresh = 600
+
+# how to send notifications (valid: dbus, email, syslog)
+emit_via = dbus
+
+# automatically install updates
+do_update = no
+# automatically download updates
+do_download = no
+# automatically download deps of updates
+do_download_deps = no
diff --git a/yum.spec b/yum.spec
index 4acbcf2..15a413a 100644
--- a/yum.spec
+++ b/yum.spec
@@ -3,11 +3,13 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.9.0
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
-Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz
+Source0: http://linux.duke.edu/projects/yum/download/2.9/yum-%{version}.tar.gz
 Source1: yum.conf.fedora
+Source2: yum-updatesd.conf.fedora
+Source10: yum-updatesd.init
 
 Source99: plugin.conf
 # default plugins here
@@ -16,6 +18,7 @@ Source100: installonlyn.py
 Patch0: yum-2.9.0-mirror-error.patch
 Patch1: yum-2.9.0-filelist.patch
 Patch2: yum-2.9.0-exclude.patch
+Patch3: yum-updatesd-path.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
@@ -27,6 +30,7 @@ Requires: python-sqlite
 Requires: urlgrabber
 Requires: python-elementtree
 Requires: yum-metadata-parser
+Requires: dbus-python
 Prereq: /sbin/chkconfig, /sbin/service, coreutils
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -40,6 +44,7 @@ automatically prompting the user as necessary.
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 %build
 make
@@ -59,18 +64,33 @@ cat >> $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/installonlyn.conf << EOF
 tokeep=2
 EOF
 
+# install the dbus service
+mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d
+install -m 0755 yum-updatesd.py $RPM_BUILD_ROOT/%{_sbindir}/yum-updatesd
+install -m 0644 etc/yum-updatesd.conf $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/yum/yum-updatesd.conf
+install -m 0755 %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/yum-updatesd
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add yum
-/sbin/service yum condrestart >> /dev/null
+/sbin/service yum condrestart 2> /dev/null
+/sbin/chkconfig --add yum-updatesd
+/sbin/service yum-updatesd condrestart 2>/dev/null
 exit 0
 
 %preun
 if [ $1 = 0 ]; then
  /sbin/chkconfig --del yum
- /sbin/service yum stop >> /dev/null
+ /sbin/service yum stop 2> /dev/null
+
+ /sbin/chkconfig --del yum-updatesd
+ /sbin/service yum-updatesd stop 2>/dev/null
 fi
 exit 0
 
@@ -81,13 +101,17 @@ exit 0
 %dir %{_sysconfdir}/yum.repos.d
 %dir %{_sysconfdir}/yum
 %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
+%config(noreplace) %{_sysconfdir}/yum/yum-updatesd.conf
 %config(noreplace) %{_sysconfdir}/cron.daily/yum.cron
 %config(noreplace) %{_sysconfdir}/cron.weekly/yum.cron
-%config %{_sysconfdir}/rc.d/init.d/%{name}
-%config %{_sysconfdir}/logrotate.d/%{name}
+%config %{_sysconfdir}/rc.d/init.d/yum
+%config %{_sysconfdir}/rc.d/init.d/yum-updatesd
+%config %{_sysconfdir}/logrotate.d/yum
+%config %{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf
 %dir %{_datadir}/yum-cli
 %{_datadir}/yum-cli/*
 %{_bindir}/yum
+%{_sbindir}/yum-updatesd
 %{python_sitelib}/yum
 %{python_sitelib}/rpmUtils
 %dir /var/cache/yum
@@ -99,6 +123,9 @@ exit 0
 /usr/lib/yum-plugins/*
 
 %changelog
+* Tue Jun 13 2006 Jeremy Katz <katzj@redhat.com> - 2.9.0-4
+- install yum-updatesd bits
+
 * Tue Jun 13 2006 Jeremy Katz <katzj@redhat.com> - 2.9.0-3
 - add patch to fix filelist crash installing/querying the filesystem package
 - add patch to fix excludes