From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 11 Aug 2009 20:18:54 +0000 (+0000)
Subject: - supported way is to set via configure visible vars
X-Git-Tag: auto/th/cronie-1_4_1-1~4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcronie.git;a=commitdiff_plain;h=695ed2ed4cbb91906598e6e30ad7d012e65f45da

- supported way is to set via configure visible vars

Changed files:
    cronie-paths.patch -> 1.2
    cronie.spec -> 1.3
---

diff --git a/cronie-paths.patch b/cronie-paths.patch
deleted file mode 100644
index 7bb1ceb..0000000
--- a/cronie-paths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- cronie-1.4.1/src/cron-paths.h~	2009-08-11 22:01:57.847314880 +0200
-+++ cronie-1.4.1/src/cron-paths.h	2009-08-11 22:06:36.364162561 +0200
-@@ -17,11 +17,11 @@
- 		/* cron allow/deny file.  At least cron.deny must
- 		 * exist for ordinary users to run crontab.
- 		 */
--#define	CRON_ALLOW	"/etc/cron.allow"
--#define	CRON_DENY	"/etc/cron.deny"
-+#define	CRON_ALLOW	"/etc/cron/cron.allow"
-+#define	CRON_DENY	"/etc/cron/cron.deny"
- 
- 		/* 4.3BSD-style crontab f.e. /etc/crontab */
--#define SYSCRONTAB	"/etc/crontab"
-+#define SYSCRONTAB	"/etc/cron.d/crontab"
- 
- 		/* system crontab dir f.e. /etc/cron.d/ */
- #define SYS_CROND_DIR	"/etc/cron.d"
diff --git a/cronie.spec b/cronie.spec
index 78a364d..c4e9b91 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -15,7 +15,6 @@ Source2:	cron.logrotate
 Source3:	cron.sysconfig
 Source4:	%{name}.crontab
 Source5:	%{name}.pam
-Patch0:		%{name}-paths.patch
 URL:		https://fedorahosted.org/cronie/
 BuildRequires:	audit-libs-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
@@ -59,10 +58,12 @@ however this could be overloaded in settings.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
+	SYSCRONTAB=/etc/cron.d/crontab \
+	SYS_CROND_DIR=/etc/cron.d \
+	--sysconfdir=/etc/cron.d \
 	--with-pam \
 	--with%{?!with_selinux:out}-selinux \
 	--with-audit \