rpms/cfengine/devel cfengine.spec, 1.8, 1.9 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5
Jeff Sheltren (sheltren)
fedora-extras-commits at redhat.com
Thu Apr 14 15:14:41 UTC 2005
Author: sheltren
Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15237
Modified Files:
cfengine.spec sources .cvsignore
Log Message:
update to upstream 2.1.14
Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cfengine.spec 5 Mar 2005 21:10:20 -0000 1.8
+++ cfengine.spec 14 Apr 2005 15:14:39 -0000 1.9
@@ -1,15 +1,17 @@
-Summary: Systems administration tool for networks
+Summary: A systems administration tool for networks
Name: cfengine
-Version: 2.1.9
+Version: 2.1.14
Release: 2
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.14.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
@@ -23,7 +25,7 @@
%prep
-%setup
+%setup -q
%build
@@ -32,7 +34,6 @@
# ./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
@@ -44,59 +45,49 @@
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
+# (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}
+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 || :
+ /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
chkconfig --del cfenvd
chkconfig --del cfexecd
chkconfig --del cfservd
@@ -108,7 +99,7 @@
%files
-%defattr(-,root,root, 0755)
+%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%doc contrib
%doc inputs
@@ -118,17 +109,42 @@
%{_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
+* Thu Apr 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.14-2
+- Bump release for FC4/devel package
+
+* Sat Apr 9 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.14-1
+- Update to upstream 2.1.14
+
+* 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
@@ -187,7 +203,7 @@
* Wed Apr 09 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.2
- fixed URL
- removed Requires as redundant
-- remove %{_infodir}/dir from package, if it would exist
+- remove %{_infodir}/dir from package, if it would exist
(which is not the case in RH8)
* Wed Apr 09 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:2.0.6-0.fdr.1
@@ -207,14 +223,14 @@
- new upstream version.
* Thu Jun 20 2002 Juha Ylitalo <juha.ylitalo at iki.fi> - 2.0.2-4
-- added check that if we are doing initial install
+- added check that if we are doing initial install
(meaning that /mnt/sysimage is mounted), there is no point at
running cfkey until system boots up with correct root directory
* Thu Jun 13 2002 Juha Ylitalo <juha.ylitalo at iki.fi> - 2.0.2-3
- fixed revision numberings to go on in sensible way
- added missing man page
-- changed cfexecd and cfservd to start later
+- changed cfexecd and cfservd to start later
(assuming your using chkconfig for setting things)
- additional check in cfexecd start() for making sure that local cfkeys
have been created.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/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 14 Apr 2005 15:14:39 -0000 1.5
@@ -1 +1,4 @@
-421ac1ba0fd9cbe0384f1b0eded1afd8 cfengine-2.1.9.tar.gz
+82967f7e5ab075628793771e18b1d689 cfengine-2.1.14.tar.gz
+19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd
+fe6c086a41f428d47bde30646e0310c4 cfservd
+37c565f98d2b252c9c6cf1c88d654e02 cfenvd
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/.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 14 Apr 2005 15:14:39 -0000 1.5
@@ -1 +1,4 @@
-cfengine-2.1.9.tar.gz
+cfengine-2.1.14.tar.gz
+cfexecd
+cfservd
+cfenvd
More information about the fedora-extras-commits
mailing list