[cronie/f21: 4/4] New version of cronie 1.4.12.

[Marcela Mašláňová]

commit 3f14d3b751231bb9ad3a87c4e79ae68313e6a378
Merge: 1c88ff6 42a8554
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Thu Sep 18 10:44:21 2014 +0200

    New version of cronie 1.4.12.

 .gitignore                       |    5 -
 correct-env.patch                |   56 ------------
 cronie-1.4.10-copy-env.patch     |  172 --------------------------------------
 cronie-1.4.10-random-delay.patch |  163 ------------------------------------
 cronie-1.4.10-use-setenv.patch   |   27 ------
 cronie-1.4.11-kill_fd.patch      |   39 ---------
 cronie-1.4.8-inotify-fix.patch   |   94 ---------------------
 cronie.patch                     |    6 --
 cronie.spec                      |   22 ++++-
 cronie.systemd                   |   11 ---
 sources                          |    2 +-
 unitfile-killprocess.patch       |   11 ---
 12 files changed, 20 insertions(+), 588 deletions(-)
---
diff --cc cronie.spec
index 8c1a34e,9902a1d..29eb3f1
--- a/cronie.spec
+++ b/cronie.spec
@@@ -5,16 -5,12 +5,24 @@@
  
  Summary:   Cron daemon for executing programs at set times
  Name:      cronie
++<<<<<<< HEAD
 +Version:   1.4.11
 +Release:   9%{?dist}
 +Patch0:    correct-env.patch
 +Patch1:    unitfile-killprocess.patch
 +Patch2:    cronie-1.4.11-kill_fd.patch
++=======
+ Version:   1.4.12
+ Release:   1%{?dist}
++>>>>>>> master
  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
++<<<<<<< HEAD
 +Source1:   https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
++=======
++>>>>>>> master
  Requires:  dailyjobs
  
  %if %{with selinux}
@@@ -78,12 -74,7 +86,9 @@@ extra features
  
  %prep
  %setup -q
- %patch0 -p1 -b .jobenv
- %patch1 -p1
- %patch2 -p1
  
 +cp %{SOURCE1} .
 +
  %build
  %configure \
  %if %{with pam}
@@@ -177,7 -168,7 +182,11 @@@ exit 
  %files
  %doc AUTHORS README ChangeLog
  %{!?_licensedir:%global license %%doc}
++<<<<<<< HEAD
 +%license COPYING gpl-2.0.txt
++=======
+ %license COPYING
++>>>>>>> master
  %attr(755,root,root) %{_sbindir}/crond
  %attr(4755,root,root) %{_bindir}/crontab
  %{_mandir}/man8/crond.*
@@@ -209,6 -200,10 +218,13 @@@
  %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Wed Sep 17 2014 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.12-1
+ - new release 1.4.12
+ - remove gpl2 license, because it's part of upstream COPYING now
+ 
++>>>>>>> master
  * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.11-9
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild