From 22233cf0831b6e19319ad918ba1aa197fbc4c16d Mon Sep 17 00:00:00 2001
From: Alec Thomas Habig <habig@fedoraproject.org>
Date: Tue, 21 Aug 2007 18:53:53 +0000
Subject: [PATCH 01/11] initial import to FC-6

---
 .cvsignore    |   1 +
 sources       |   1 +
 yum-cron.spec | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 yum-cron.spec

diff --git a/.cvsignore b/.cvsignore
index e69de29..159e183 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+yum-cron-0.3.tar.gz
diff --git a/sources b/sources
index e69de29..b559aa8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
diff --git a/yum-cron.spec b/yum-cron.spec
new file mode 100644
index 0000000..ccc8992
--- /dev/null
+++ b/yum-cron.spec
@@ -0,0 +1,116 @@
+Summary: Files needed to run yum updates as a cron job
+Name: yum-cron
+Version: 0.3
+Release: 1
+URL: http://linux.duke.edu/yum/
+# This is a Red Hat maintained package which is specific to
+# our distribution.  Thus the source is only available from
+# within this srpm.
+Source0: %{name}-%{version}.tar.gz
+License: GPL
+Group: System Environment/Base
+BuildArch: noarch
+Requires: yum >= 3.0 vixie-cron crontabs
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+%description
+These are the files needed to run yum updates as a cron job.  They are
+lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+Install this package if you want auto yum updates nightly via cron
+rather than the newer yum-updatesd daemon.
+
+%prep
+%setup -q
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.cron
+install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.cron
+install -D -m 755 yum-cron $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-cron
+install -D -m 644 yum-daily.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-daily.yum
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+# Make sure chkconfig knows about the service
+/sbin/chkconfig --add yum-cron
+# if an upgrade:
+if [ "$1" -ge "1" ]; then
+# if there's a /etc/rc.d/init.d/yum file left, assume that there was an
+# older instance of yum-cron which used this naming convention.  Clean
+# it up, do a conditional restart
+ if [ -f /etc/init.d/yum ]; then
+# was it on?
+  /sbin/chkconfig yum
+  RETVAL=$?
+  if [ $RETVAL = 0 ]; then
+# if it was, stop it, then turn on new yum-cron
+   /sbin/service yum stop 1> /dev/null 2>&1
+   /sbin/service yum-cron start 1> /dev/null 2>&1
+   /sbin/chkconfig yum-cron on
+  fi
+# remove it from the service list
+  /sbin/chkconfig --del yum
+ fi
+fi
+exit 0
+
+%preun
+# if this will be a complete removeal of yum-cron rather than an upgrade,
+# remove the service from chkconfig control
+if [ $1 = 0 ]; then
+ /sbin/chkconfig --del yum-cron
+ /sbin/service yum-cron stop 1> /dev/null 2>&1
+fi
+exit 0
+
+%postun
+# If there's a yum-cron package left after uninstalling one, do a 
+# conditional restart of the service
+if [ "$1" -ge "1" ]; then
+ /sbin/service yum-cron condrestart 1> /dev/null 2>&1
+fi
+exit 0
+
+%files
+%defattr(-,root,root)
+%doc COPYING README
+%{_sysconfdir}/cron.daily/yum.cron
+%{_sysconfdir}/cron.weekly/yum.cron
+%config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
+%{_sysconfdir}/rc.d/init.d/yum-cron
+
+%changelog
+* Mon Aug 20 2007 Alec Habig <ahabig@umn.edu> - 0.3-1
+- Bumped version for release to fedora-extras
+
+* Mon Jul 30 2007 Alec Habig <ahabig@umn.edu> - 0.2-5
+- spec file updates in response to review.
+
+* Thu Jun 28 2007 Alec Habig <ahabig@umn.edu> - 0.2-4
+- Check for existence of old "yum"-named init script.  If so, assume
+  it's an upgrade, remove them, and do a condrestart.
+
+* Tue Jun 19 2007 Alec Habig <ahabig@umn.edu> - 0.2-3
+- the yum-daily.yum script marked noreplace since it's a config-y file.  
+  Not so sure we want to do this, but it keeps rpmlint happy.
+- service starting/stopping changed to conform to standards.
+
+* Tue Jun 19 2007 Alec Habig <ahabig@umn.edu> - 0.2-2
+- More specfile work, functionality and installed files not changed
+
+* Tue Jun 19 2007 Alec Habig <ahabig@umn.edu> - 0.2-1
+- Upgrade spec file to meet fedora-extras requirements
+- rename init script yum-cron to meet rpmlint guidelines
+- See bugzilla #212507 for the history of this package
+
+* Tue Oct 31 2006 Alec Habig <ahabig@umn.edu> - 0.1-1
+- Initial packaging of old scripts as a standalone rpm for use in FC6

From 296fada70c209efb7258ad54942337c73ac846f3 Mon Sep 17 00:00:00 2001
From: Alec Thomas Habig <habig@fedoraproject.org>
Date: Tue, 21 Aug 2007 19:14:04 +0000
Subject: [PATCH 02/11] Added dist tag - far easier to invoke dist tages than
 learn how to work     around the build system :)

---
 yum-cron.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yum-cron.spec b/yum-cron.spec
index ccc8992..47c90d9 100644
--- a/yum-cron.spec
+++ b/yum-cron.spec
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
 Version: 0.3
-Release: 1
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from

From 1957e6e4f9f1d0aef8bee1c229e7f4ead35926cf Mon Sep 17 00:00:00 2001
From: Alec Thomas Habig <habig@fedoraproject.org>
Date: Tue, 21 Aug 2007 19:52:48 +0000
Subject: [PATCH 03/11] Fixed GPL -> GPLv2

---
 yum-cron.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/yum-cron.spec b/yum-cron.spec
index 47c90d9..e444973 100644
--- a/yum-cron.spec
+++ b/yum-cron.spec
@@ -1,13 +1,13 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
 Version: 0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
 Requires: yum >= 3.0 vixie-cron crontabs
@@ -89,6 +89,10 @@ exit 0
 %{_sysconfdir}/rc.d/init.d/yum-cron
 
 %changelog
+* Tue Aug 21 2007 Alec Habig <ahabig@umn.edu> - 0.3-2
+- Changed over to dist tags, to play more nciely with the Fedora build system
+- License changed "GPL" to "GPLv2" since rpmlint now cares
+
 * Mon Aug 20 2007 Alec Habig <ahabig@umn.edu> - 0.3-1
 - Bumped version for release to fedora-extras
 

From ed2e9dd066b819a972ed323e81317325f9764c0b Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Tue, 21 Aug 2007 23:20:54 +0000
Subject: [PATCH 04/11] Initialize branch EL-5 for yum-cron

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..42f697a
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+EL-5

From 415dfd283aa4d23329c2630f540116b0f253684b Mon Sep 17 00:00:00 2001
From: Alec Thomas Habig <habig@fedoraproject.org>
Date: Tue, 28 Aug 2007 16:49:15 +0000
Subject: [PATCH 05/11] Added Frank Wittig's patch to set check-only via an
 entry in the new file     /etc/sysconfig/yum-cron

---
 yum-cron-0.3.checkonly.patch | 32 ++++++++++++++++++++++++++++++++
 yum-cron.spec                | 10 +++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 yum-cron-0.3.checkonly.patch

diff --git a/yum-cron-0.3.checkonly.patch b/yum-cron-0.3.checkonly.patch
new file mode 100644
index 0000000..434d4ef
--- /dev/null
+++ b/yum-cron-0.3.checkonly.patch
@@ -0,0 +1,32 @@
+diff -Naur yum-cron-0.3/yum.cron.daily yum-cron-0.3_wwk/yum.cron.daily
+--- yum-cron-0.3/yum.cron.daily	2007-06-19 17:34:58.000000000 +0200
++++ yum-cron-0.3_wwk/yum.cron.daily	2007-08-27 10:59:34.000000000 +0200
+@@ -1,6 +1,20 @@
+ #!/bin/sh
+ 
+-if [ -f /var/lock/subsys/yum-cron ]; then
++if [ -f /var/lock/subsys/yum ]; then
++
++  if [ -f /etc/sysconfig/yum-cron ]; then
++    source /etc/sysconfig/yum-cron
++  fi
++
+ 	/usr/bin/yum -R 120 -e 0 -d 0 -y update yum
+-	/usr/bin/yum -R 10 -e 0 -d 0 -y shell /etc/yum/yum-daily.yum
++
++  if [[ "x$CHECK_ONLY" == "xyes" ]]; then
++    if (! /usr/bin/yum -R 10 -e 0 -d 0 -y check-update >/dev/null); then
++      echo "New updates available for host `/bin/hostname`";
++      echo "`/usr/bin/yum -e 0 -d 0 -y -C check-update`^M"
++    fi
++  else
++    /usr/bin/yum -R 10 -e 0 -d 0 -y shell /etc/yum/yum-daily.yum
++  fi
++
+ fi
+diff -Naur yum-cron-0.3/yum-cron.sysconf yum-cron-0.3_wwk/yum-cron.sysconf
+--- yum-cron-0.3/yum-cron.sysconf	1970-01-01 01:00:00.000000000 +0100
++++ yum-cron-0.3_wwk/yum-cron.sysconf	2007-08-27 11:46:51.000000000 +0200
+@@ -0,0 +1,2 @@
++# Don't install, just check (valid: yes|no)
++CHECK_ONLY=no
diff --git a/yum-cron.spec b/yum-cron.spec
index e444973..b983666 100644
--- a/yum-cron.spec
+++ b/yum-cron.spec
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
 Version: 0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,6 +17,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Patch0: yum-cron-0.3.checkonly.patch
 
 %description
 These are the files needed to run yum updates as a cron job.  They are
@@ -26,6 +27,7 @@ rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -35,6 +37,7 @@ install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.c
 install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.cron
 install -D -m 755 yum-cron $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-cron
 install -D -m 644 yum-daily.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-daily.yum
+install -D -m 644 yum-cron.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yum-cron
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,8 +90,13 @@ exit 0
 %{_sysconfdir}/cron.weekly/yum.cron
 %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
+%config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Aug 27 2007 Frank Wittig <fw@weisshuhn.de> - 0.3-3
+- Actual update action is now configurable. It does check-only now if
+  configured. Default behaviour is to do updates.
+
 * Tue Aug 21 2007 Alec Habig <ahabig@umn.edu> - 0.3-2
 - Changed over to dist tags, to play more nciely with the Fedora build system
 - License changed "GPL" to "GPLv2" since rpmlint now cares

From a4217568469b27c7f04a2e8033560ad93eaf603c Mon Sep 17 00:00:00 2001
From: Alec Thomas Habig <habig@fedoraproject.org>
Date: Mon, 3 Sep 2007 15:04:18 +0000
Subject: [PATCH 06/11] Fixed bug in cron.daily script which was preventing
 updates from running.     Integrated checkonly patch into source tarball.

---
 .cvsignore                   |  2 +-
 sources                      |  2 +-
 yum-cron-0.3.checkonly.patch | 32 --------------------------------
 yum-cron.spec                | 14 ++++++++------
 4 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100644 yum-cron-0.3.checkonly.patch

diff --git a/.cvsignore b/.cvsignore
index 159e183..291660a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-yum-cron-0.3.tar.gz
+yum-cron-0.4.tar.gz
diff --git a/sources b/sources
index b559aa8..a8bf46c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b232b7066f6bf846c20597bdba076346  yum-cron-0.3.tar.gz
+113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
diff --git a/yum-cron-0.3.checkonly.patch b/yum-cron-0.3.checkonly.patch
deleted file mode 100644
index 434d4ef..0000000
--- a/yum-cron-0.3.checkonly.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur yum-cron-0.3/yum.cron.daily yum-cron-0.3_wwk/yum.cron.daily
---- yum-cron-0.3/yum.cron.daily	2007-06-19 17:34:58.000000000 +0200
-+++ yum-cron-0.3_wwk/yum.cron.daily	2007-08-27 10:59:34.000000000 +0200
-@@ -1,6 +1,20 @@
- #!/bin/sh
- 
--if [ -f /var/lock/subsys/yum-cron ]; then
-+if [ -f /var/lock/subsys/yum ]; then
-+
-+  if [ -f /etc/sysconfig/yum-cron ]; then
-+    source /etc/sysconfig/yum-cron
-+  fi
-+
- 	/usr/bin/yum -R 120 -e 0 -d 0 -y update yum
--	/usr/bin/yum -R 10 -e 0 -d 0 -y shell /etc/yum/yum-daily.yum
-+
-+  if [[ "x$CHECK_ONLY" == "xyes" ]]; then
-+    if (! /usr/bin/yum -R 10 -e 0 -d 0 -y check-update >/dev/null); then
-+      echo "New updates available for host `/bin/hostname`";
-+      echo "`/usr/bin/yum -e 0 -d 0 -y -C check-update`^M"
-+    fi
-+  else
-+    /usr/bin/yum -R 10 -e 0 -d 0 -y shell /etc/yum/yum-daily.yum
-+  fi
-+
- fi
-diff -Naur yum-cron-0.3/yum-cron.sysconf yum-cron-0.3_wwk/yum-cron.sysconf
---- yum-cron-0.3/yum-cron.sysconf	1970-01-01 01:00:00.000000000 +0100
-+++ yum-cron-0.3_wwk/yum-cron.sysconf	2007-08-27 11:46:51.000000000 +0200
-@@ -0,0 +1,2 @@
-+# Don't install, just check (valid: yes|no)
-+CHECK_ONLY=no
diff --git a/yum-cron.spec b/yum-cron.spec
index b983666..019d37d 100644
--- a/yum-cron.spec
+++ b/yum-cron.spec
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.3
-Release: 3%{?dist}
+Version: 0.4
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -17,17 +17,15 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch0: yum-cron-0.3.checkonly.patch
 
 %description
-These are the files needed to run yum updates as a cron job.  They are
-lifted straight from yum-2.6.1-0.fc5, but were left out of FC6's yum.
+These are the files needed to run yum updates as a cron job.  They
+originated in yum-2.6.1-0.fc5, but were left out of FC6's yum.
 Install this package if you want auto yum updates nightly via cron
 rather than the newer yum-updatesd daemon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -93,6 +91,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Sep 3 2007 Alec Habig <ahabig@umn.edu> - 0.4-1
+- Fix bug in cron.daily which was preventing updates from running
+- Integrate Frank's checkonly patches into the source
+
 * Mon Aug 27 2007 Frank Wittig <fw@weisshuhn.de> - 0.3-3
 - Actual update action is now configurable. It does check-only now if
   configured. Default behaviour is to do updates.

From 5addfdd56d373566d918281c447cb53ef921a9db Mon Sep 17 00:00:00 2001
From: Alec Thomas Habig <habig@fedoraproject.org>
Date: Sun, 30 Sep 2007 17:04:48 +0000
Subject: [PATCH 07/11] Added a lockfile to prevent multiple instances of the
 cron scripts from     running and hanging, see bug 311661

---
 .cvsignore    | 2 +-
 sources       | 2 +-
 yum-cron.spec | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 291660a..c3e34d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-yum-cron-0.4.tar.gz
+yum-cron-0.5.tar.gz
diff --git a/sources b/sources
index a8bf46c..929e2dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-113c9dda502f7526479d2c416f3f9085  yum-cron-0.4.tar.gz
+b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz
diff --git a/yum-cron.spec b/yum-cron.spec
index 019d37d..45d029b 100644
--- a/yum-cron.spec
+++ b/yum-cron.spec
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.4
+Version: 0.5
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -91,6 +91,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Sat Sep 29 2007 Alec Habig <ahabig@umn.edu> - 0.5-1
+- Added a lockfile to prevent multiple instances of the cron scripts
+  from running and hanging, see bug 311661
+
 * Mon Sep 3 2007 Alec Habig <ahabig@umn.edu> - 0.4-1
 - Fix bug in cron.daily which was preventing updates from running
 - Integrate Frank's checkonly patches into the source

From 40b65c399d7fcfd5964b9cda5a7a350b1a40c571 Mon Sep 17 00:00:00 2001
From: Alec Thomas Habig <habig@fedoraproject.org>
Date: Tue, 16 Oct 2007 15:10:05 +0000
Subject: [PATCH 08/11] Bugfixes.

---
 .cvsignore    |  2 +-
 sources       |  2 +-
 yum-cron.spec | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c3e34d8..5675372 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-yum-cron-0.5.tar.gz
+yum-cron-0.6.tar.gz
diff --git a/sources b/sources
index 929e2dc..3b328c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0b615a66f69c770ae2cfb78700b14e6  yum-cron-0.5.tar.gz
+72a8259220d8e584a5b8c0473b63ff71  yum-cron-0.6.tar.gz
diff --git a/yum-cron.spec b/yum-cron.spec
index 45d029b..b63a627 100644
--- a/yum-cron.spec
+++ b/yum-cron.spec
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.5
+Version: 0.6
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
-Requires: yum >= 3.0 vixie-cron crontabs
+Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -91,6 +91,12 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Mon Oct 15 2007 Alec Habig <ahabig@umn.edu> - 0.6-1
+- Fixes for bug 327401: checkonly formatting fix and make lockfile
+  grabbing an atomic action using mkdir instead of touch
+- Added downloadonly option (bug 333131)
+- Don't update yum if set to checkonly (bug 333111)
+
 * Sat Sep 29 2007 Alec Habig <ahabig@umn.edu> - 0.5-1
 - Added a lockfile to prevent multiple instances of the cron scripts
   from running and hanging, see bug 311661

From 8bbb8a599ffd77af80ce8b3d7ba4ac56efbe3cb5 Mon Sep 17 00:00:00 2001
From: Alec Thomas Habig <habig@fedoraproject.org>
Date: Wed, 5 Dec 2007 14:30:18 +0000
Subject: [PATCH 09/11] Added a warning file to remind ourselves that
 coordination with CentOS is     an issue in this branch.

---
 UPDATE-CAREFULLY | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 UPDATE-CAREFULLY

diff --git a/UPDATE-CAREFULLY b/UPDATE-CAREFULLY
new file mode 100644
index 0000000..88fcfa9
--- /dev/null
+++ b/UPDATE-CAREFULLY
@@ -0,0 +1,3 @@
+This package exists in CentOS-5 base.
+Please be careful when updating that the EVR here remains lower than in 
+CentOS-5.

From 8bb4ed7c95f715afb3bc01aec5b99fec2703e00f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:12:38 +0000
Subject: [PATCH 10/11] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index cb083e1..9627157 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: yum-cron
-# $Id$
+# $Id: Makefile,v 1.1 2007/08/20 23:00:43 kevin Exp $
 NAME := yum-cron
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 4abc283bd819860c7793e1dc0e7da284e210b99b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 16:25:59 +0000
Subject: [PATCH 11/11] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9627157..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: yum-cron
-# $Id: Makefile,v 1.1 2007/08/20 23:00:43 kevin Exp $
-NAME := yum-cron
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 42f697a..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-5