packages: cronie/cronie.spec - fix pam dir on install, disable selinux, audi...

[glen]

Author: glen                         Date: Thu Aug 13 15:53:06 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix pam dir on install, disable selinux,audit on ac (need more work)

---- Files affected:
packages/cronie:
   cronie.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/cronie/cronie.spec
diff -u packages/cronie/cronie.spec:1.13 packages/cronie/cronie.spec:1.14
--- packages/cronie/cronie.spec:1.13	Thu Aug 13 13:34:20 2009
+++ packages/cronie/cronie.spec	Thu Aug 13 17:53:00 2009
@@ -1,10 +1,15 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	selinux		# without SELinux support
 %bcond_without	inotify		# without inotify support
+%if "%{pld_release}" == "ac"
+%bcond_with		selinux		# without SELinux support
+%bcond_with		audit		# without audit support
+%else
+%bcond_without	selinux		# without SELinux support
 %bcond_without	audit		# without audit support
-#
+%endif
+
 Summary:	Cron daemon for executing programs at set times
 Name:		cronie
 Version:	1.4.1
@@ -25,6 +30,7 @@
 BuildRequires:	automake
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	pam-devel
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
@@ -40,12 +46,12 @@
 Provides:	crondaemon
 Provides:	crontabs = 1.7
 Provides:	group(crontab)
-%if "%{pld_release}" != "ti"
+%if "%{pld_release}" == "th"
 Provides:	vixie-cron = 4:4.4
 %endif
 Obsoletes:	crondaemon
 Obsoletes:	crontabs
-%if "%{pld_release}" != "ti"
+%if "%{pld_release}" == "th"
 Obsoletes:	vixie-cron <= 4:4.3
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -95,6 +101,7 @@
 	$RPM_BUILD_ROOT%{_sysconfdir}/{cron,cron.{d,hourly,daily,weekly,monthly},pam.d}
 
 %{__make} install \
+	pamdir=/etc/pam.d \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install contrib/0anacron $RPM_BUILD_ROOT/etc/cron.hourly/0anacron
@@ -208,6 +215,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2009/08/13 15:53:00  glen
+- fix pam dir on install, disable selinux,audit on ac (need more work)
+
 Revision 1.13  2009/08/13 11:34:20  hawk
 - don't provide/obsolete vixie-cron on Titanium
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.spec?r1=1.13&r2=1.14&f=u