[cronie] Update to 1.4.7

[Marcela Mašláňová]

commit 13f005c3f86b8d11e2363fb8dff5564762e6a3b1
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Tue Mar 15 15:34:50 2011 +0100

    Update to 1.4.7
    
    - remove merged patches
    - clean specfile (whitespaces, remove BR automake)

 .gitignore                       |    6 +-
 cronie-1.4.6-anacron-locks.patch |  134 ------------------------
 cronie-1.4.6-manpages.patch      |   34 ------
 cronie-1.4.6-selinux.patch       |  210 --------------------------------------
 cronie.spec                      |   80 +++++++--------
 sources                          |    2 +-
 6 files changed, 40 insertions(+), 426 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 22bf3f8..291b177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-cronie-1.4.4.tar.gz
-cronie-1.4.5.tar.gz
-/cronie-1.4.6.tar.gz
-/cronie.systemd
+cronie.systemd
+cronie-1.4.7.tar.gz
diff --git a/cronie.spec b/cronie.spec
index 80afcc9..b1e4d6d 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -3,46 +3,42 @@
 %bcond_without audit
 %bcond_without inotify
 
-Summary: Cron daemon for executing programs at set times
-Name: cronie
-Version: 1.4.6
-Release: 9%{?dist}
-License: MIT and BSD and ISC and GPLv2
-Group: System Environment/Base
-URL: https://fedorahosted.org/cronie
-Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
-Source1: cronie.systemd
-Patch0: cronie-1.4.6-manpages.patch
-Patch1: cronie-1.4.6-anacron-locks.patch
-Patch2: cronie-1.4.6-selinux.patch
-
-Requires: syslog, bash >= 2.0
+Summary:   Cron daemon for executing programs at set times
+Name:      cronie
+Version:   1.4.7
+Release:   1%{?dist}
+License:   MIT and BSD and ISC and GPLv2
+Group:     System Environment/Base
+URL:       https://fedorahosted.org/cronie
+Source0:   https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
+Source1:   cronie.systemd
+
+Requires:  syslog, bash >= 2.0
 Conflicts: sysklogd < 1.4.1
-Provides: vixie-cron = 4:4.4
+Provides:  vixie-cron = 4:4.4
 Obsoletes: vixie-cron <= 4:4.3
-Requires: dailyjobs
+Requires:  dailyjobs
 
 %if %{with selinux}
-Requires: libselinux >= 2.0.64
+Requires:      libselinux >= 2.0.64
 Buildrequires: libselinux-devel >= 2.0.64
 %endif
 %if %{with pam}
-Requires: pam >= 1.0.1
+Requires:      pam >= 1.0.1
 Buildrequires: pam-devel >= 1.0.1
 %endif
 %if %{with audit}
 Buildrequires: audit-libs-devel >= 1.4.1
 %endif
-BuildRequires: automake
 
-Requires(post): /sbin/chkconfig coreutils sed
+Requires(post):   /sbin/chkconfig coreutils sed
 Requires(postun): /sbin/chkconfig
 Requires(postun): /sbin/service 
-Requires(preun): /sbin/chkconfig 
-Requires(preun): /sbin/service
+Requires(preun):  /sbin/chkconfig 
+Requires(preun):  /sbin/service
 # systemd compatibility
-Requires(post): systemd-units
-Requires(preun): systemd-units
+Requires(post):   systemd-units
+Requires(preun):  systemd-units
 Requires(postun): systemd-units
 
 %description
@@ -52,14 +48,14 @@ has security and configuration enhancements like the ability to use pam and
 SELinux.
 
 %package anacron
-Summary: Utility for running regular jobs
-Requires: crontabs
-Group: System Environment/Base
-Provides: dailyjobs
-Provides: anacron = 2.4
+Summary:   Utility for running regular jobs
+Requires:  crontabs
+Group:     System Environment/Base
+Provides:  dailyjobs
+Provides:  anacron = 2.4
 Obsoletes: anacron <= 2.3
 Requires(post): coreutils
-Requires: %{name} = %{version}-%{release}
+Requires:  %{name} = %{version}-%{release}
 
 %description anacron
 Anacron becames part of cronie. Anacron is used only for running regular jobs.
@@ -67,23 +63,19 @@ The default settings execute regular jobs by anacron, however this could be
 overloaded in settings.
 
 %package noanacron
-Summary: Utility for running simple regular jobs in old cron style
-Group: System Environment/Base
-Provides: dailyjobs
-Requires: crontabs
-Requires: %{name} = %{version}-%{release}
+Summary:   Utility for running simple regular jobs in old cron style
+Group:     System Environment/Base
+Provides:  dailyjobs
+Requires:  crontabs
+Requires:  %{name} = %{version}-%{release}
 
 %description noanacron
 Old style of {hourly,daily,weekly,monthly}.jobs without anacron. No features.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-
 %configure \
 %if %{with pam}
 --with-pam \
@@ -97,7 +89,9 @@ Old style of {hourly,daily,weekly,monthly}.jobs without anacron. No features.
 %if %{with inotify}
 --with-inotify \
 %endif
---enable-anacron --enable-pie
+--enable-anacron \
+--enable-pie \
+--enable-relro
 
 make %{?_smp_mflags}
 
@@ -129,9 +123,6 @@ install -m 644 contrib/dailyjobs $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/dailyjobs
 mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/lib/systemd/system/crond.service
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/chkconfig --add crond >/dev/null 2>&1 || :
 /bin/systemctl enable crond.service >/dev/null 2>&1 || :
@@ -213,6 +204,9 @@ cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||:
 %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
 
 %changelog
+* Tue Mar 15 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.7-1
+- new release 1.4.7
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 10cf035..b849879 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-968e3d3e7c8e1d0588d533883482d3fa  cronie-1.4.6.tar.gz
 01014d53a9ede7c45f2419dc023cc372  cronie.systemd
+dfc26c47756d0c40ee27ae3c7ee98e0d  cronie-1.4.7.tar.gz