fixed BTS#2955

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9677 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cronie/cronie-vl.spec

@@ -3,8 +3,8 @@
 %bcond_without audit
 %bcond_without inotify
 
-%define ver 1.4.11
-%define rel 2
+%define ver 1.5.0
+%define rel 1
 
 Summary:   Cron daemon for executing programs at set times
 Name:      cronie
@@ -16,11 +16,7 @@ URL:       https://fedorahosted.org/cronie
 Source0:   https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
 # from cronie 1.4.8 tarball
 Source1:   cronie.init
-#Patch0:    cronie-systemd.patch
-Patch1:    cronie-1.4.11-fcntl_locking.patch
-Patch2:    cronie-1.4.11-pamenv.patch
-Patch3:    cronie-1.4.11-man-debug.patch
-Patch4:    cronie-check-config-param.patch
+Patch0:    cronie-1.5.0-temp-name.patch
 
 Requires:  dailyjobs
 Conflicts: vixie-cron
@@ -45,6 +41,8 @@ Requires(post): coreutils sed
 Requires(post): chkconfig
 Requires(preun): chkconfig
 
+Obsoletes: vixie-cron <= 3.0.1
+
 %description
 Cronie contains the standard UNIX daemon crond that runs specified programs at
 scheduled times and related tools. It is a fork of the original vixie-cron and
@@ -85,11 +83,7 @@ extra features.
 
 %prep
 %setup -q
-#%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch0 -p1
 
 %build
 %configure \
@@ -195,6 +189,12 @@ fi
 %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
 
 %changelog
+* Sat Jul 25 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.0-1
+- new upstream release.
+- dropped all patches.
+- imported Patch0 from rawhide.
+- added O:vixie-cron.
+
 * Thu Jun 26 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 1.4.11-2
 - run chkconfig for vixie-cron in triggerpostun script
 

c/crontabs/crontabs-vl.spec

@@ -2,7 +2,7 @@ Summary: Root crontab files used to schedule the execution of programs.
 Summary(ja): root のプログラム実行を予約する crontab ファイル
 Name: crontabs
 Version: 1.10
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 License: public domain
 Group: System Environment/Base
 Source0: crontab
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/sysconfig/crontab
 
 %changelog
+* Sat Jul 25 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10-5
+- updated crontab for cronie.
+
 * Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10-4
 - rebuild with VineSeed environment