rpms/cfengine/FC-3 cfengine.spec, 1.6, 1.7 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5

[Jeff Sheltren (sheltren)]

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32295

Modified Files:
	cfengine.spec sources .cvsignore 
Log Message:
update to upstream 2.1.13, multiple spec file changes


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfengine.spec	15 Dec 2004 19:33:17 -0000	1.6
+++ cfengine.spec	17 Mar 2005 23:13:53 -0000	1.7
@@ -1,16 +1,17 @@
-Summary: GNU cfengine - a systems administration tool for networks
+Summary: A systems administration tool for networks
 Name: cfengine
-Epoch: 0
-Version: 2.1.9
-Release: 2
+Version: 2.1.13
+Release: 4
 License: GPL
-Group: System Environment/Daemons
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.9.tar.gz
+Group: Applications/System
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.13.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
 URL: http://www.cfengine.org/
-BuildRequires: db4-devel,openssl-devel,texinfo,tetex-dvips,bison,flex,m4
+BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
+Requires(post): /sbin/chkconfig, /sbin/install-info
+Requires(preun): /sbin/chkconfig, /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -22,12 +23,10 @@
 configurations. Cfengine is designed to be a part of a computer immune
 system.
 
-#---------------------------------------------------------------------
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
-#---------------------------------------------------------------------
 
 %build
 # Since /usr is managed by rpmdb, we can build stuff in there
@@ -35,10 +34,9 @@
 # ./configure BERKELEY_DB_LIB=-ldb --prefix=/usr --infodir=/usr/share/info
 %configure BERKELEY_DB_LIB=-ldb --with-docs
 make
-
 # Some of the example files have execute bit for some reason.
 chmod 644 inputs/*example
-#---------------------------------------------------------------------
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,56 +45,46 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 make DESTDIR=$RPM_BUILD_ROOT install
 # make directory tree for cfengine configs
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_var}/%{name}
 for i in ppkeys inputs outputs
 do
- 	mkdir -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/%{name}/$i
+ 	mkdir -m 0700 $RPM_BUILD_ROOT%{_var}/%{name}/$i
 done
 
 # It's ugly, but thats the way Mark wants to have it. :(
 # If we don't create this link, cfexecd will not be able to start
 # (hardcoded) /var/sbin/cfagent in scheduled intervals. Other option 
 # would be to patch cfengine to use %{_sbindir}/cfagent
-mkdir -p $RPM_BUILD_ROOT/var/cfengine/bin
-ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/var/cfengine/bin/
+mkdir -p $RPM_BUILD_ROOT/%{_var}/%{name}/bin
+ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/%{_var}/%{name}/bin/
 
 # Startup file for cfexecd and cfservd
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 for i in %{SOURCE1} %{SOURCE2} %{SOURCE3}
 do
-	install -m 0755 $i $RPM_BUILD_ROOT%{_initrddir}/
+	install -p -m 0755 $i $RPM_BUILD_ROOT%{_initrddir}/
 done
 
-#
-# Appearantly this %{_infodir}/dir gets build on RH9, but it doesn't
-# appear in my RH8 box. Confusing situation...
-#
-if [ -f $RPM_BUILD_ROOT%{_infodir}/dir ]; then
-	rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-fi
-if [ -f NEWS -a -z "`cat NEWS`" ]; then
-	rm -f NEWS
-fi
-#
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 # All this stuff is pushed into doc directory.
-#
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} 
-#---------------------------------------------------------------------
+
 
 %post
 # cfagent won't run nicely, unless your host has keys.
-if [ ! -d /mnt/sysimage -a ! -f %{_localstatedir}/%{name}/ppkeys/localhost.priv ]; then
+if [ ! -d /mnt/sysimage -a ! -f %{_var}/%{name}/ppkeys/localhost.priv ]; then
 	%{_sbindir}/cfkey
-	/sbin/install-info --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
 fi
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
+# add init files to chkconfig
 if [ "$1" = "1" ]; then
 	chkconfig --add cfenvd
 	chkconfig --add cfexecd
 	chkconfig --add cfservd
-	chkconfig cfenvd off
-	chkconfig cfexecd off
-	chkconfig cfservd off
 fi
+
+
 %preun
 if [ "$1" = "0" ]; then
         /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
@@ -105,15 +93,13 @@
 	chkconfig --del cfservd
 fi
 
-#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %doc contrib
 %doc inputs
@@ -123,18 +109,36 @@
 %{_sbindir}/*
 %{_mandir}/man8/*
 %{_infodir}/cfengine*
-%config(noreplace) %{_initrddir}/cfenvd
-%config(noreplace) %{_initrddir}/cfexecd
-%config(noreplace) %{_initrddir}/cfservd
-/var/cfengine/bin
-%dir %{_localstatedir}/%{name}
-%dir %{_localstatedir}/%{name}/inputs
-%dir %{_localstatedir}/%{name}/outputs
-%dir %{_localstatedir}/%{name}/ppkeys
+%config %{_initrddir}/cfenvd
+%config %{_initrddir}/cfexecd
+%config %{_initrddir}/cfservd
+%dir %{_var}/%{name}
+%dir %{_var}/%{name}/bin
+%dir %{_var}/%{name}/inputs
+%dir %{_var}/%{name}/outputs
+%dir %{_var}/%{name}/ppkeys
 
-#---------------------------------------------------------------------
 
 %changelog
+* Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-4
+- add buildrequires: tetex
+
+* Wed Mar  9 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-3
+- change _localstatdir macros to _var
+- change group to Applications/System
+- add buildrequires: libacl-devel
+- add requires(post,preun) for chkconfig and install-info
+
+* Wed Mar  9 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-2
+- Remove unnecessary 'chkconfig <init_script> off' from post section
+
+* Mon Mar  7 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.13-1
+- Various spec file changes: change summary, line separators, defattr
+- Remove epoch 0
+
+* Mon Feb 27 2005 David Dorgan <davidd at micro-gravity.com> - 0:2.1.13-0
+- Updated to version 2.1.13
+
 * Sun Aug 15 2004 Juha Ylitalo <jylitalo at iki.fi> - 0:2.1.9-2
 - nowdays we need --with-docs to get man pages included
 - texinfo added into buildrequires list


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2004 19:33:17 -0000	1.4
+++ sources	17 Mar 2005 23:13:53 -0000	1.5
@@ -1 +1 @@
-421ac1ba0fd9cbe0384f1b0eded1afd8  cfengine-2.1.9.tar.gz
+2c002fc37f2fc9f87248ad8b9e899091  cfengine-2.1.13.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2004 19:33:17 -0000	1.4
+++ .cvsignore	17 Mar 2005 23:13:53 -0000	1.5
@@ -1 +1 @@
-cfengine-2.1.9.tar.gz
+cfengine-2.1.13.tar.gz