OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Feb-2004 12:09:50
Branch: HEAD Handle: 2004021311095000
Modified files:
openpkg-src/cfengine cfengine.patch cfengine.spec
Log:
upgrading package: cfengine 2.1.1 -> 2.1.3
Summary:
Revision Changes Path
1.5 +18 -22 openpkg-src/cfengine/cfengine.patch
1.38 +13 -6 openpkg-src/cfengine/cfengine.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cfengine/cfengine.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 cfengine.patch
--- openpkg-src/cfengine/cfengine.patch 13 Jan 2004 07:46:33 -0000 1.4
+++ openpkg-src/cfengine/cfengine.patch 13 Feb 2004 11:09:50 -0000 1.5
@@ -1,25 +1,21 @@
Index: doc/Makefile.in
---- doc/Makefile.in.orig 2003-10-22 18:30:05.000000000 +0200
-+++ doc/Makefile.in 2003-11-09 12:34:30.000000000 +0100
-@@ -142,7 +142,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--man_MANS = cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8
cfrun.8 cfservd.8
-+man_MANS = cfengine.8
+--- doc/Makefile.in.orig 2004-02-09 22:17:57.000000000 +0100
++++ doc/Makefile.in 2004-02-13 11:36:46.000000000 +0100
+@@ -70,7 +70,7 @@
+ docDATA_INSTALL = $(INSTALL_DATA)
+ htmlDATA_INSTALL = $(INSTALL_DATA)
+ psDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(doc_DATA) $(html_DATA) $(ps_DATA)
++DATA =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+@@ -665,7 +665,7 @@
+ uninstall: uninstall-am
- info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo
cfengine-Anomalies.texinfo
+ install-am: all-am
+- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
-Index: src/filedir.c
---- src/filedir.c.orig 2004-01-11 14:13:29.000000000 +0100
-+++ src/filedir.c 2004-01-13 08:41:57.000000000 +0100
-@@ -554,7 +554,7 @@
- return;
- }
- #else
--if (((newperm & 07777) == (dstat->st_mode & 07777) && (action != touch)) /*
file okay */
-+if (((newperm & 07777) == (dstat->st_mode & 07777)) && (action != touch)) /*
file okay */
- {
- Debug("File okay, newperm = %o, stat = %o\n",(newperm & 07777),(dstat->st_mode
& 07777));
- fixmode = false;
-
+ installcheck: installcheck-am
+ install-strip:
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cfengine/cfengine.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 cfengine.spec
--- openpkg-src/cfengine/cfengine.spec 7 Feb 2004 17:54:03 -0000 1.37
+++ openpkg-src/cfengine/cfengine.spec 13 Feb 2004 11:09:50 -0000 1.38
@@ -35,8 +35,8 @@
Class: PLUS
Group: System
License: GPL
-Version: 2.1.1
-Release: 20040207
+Version: 2.1.3
+Release: 20040213
# package options
%option with_fsl yes
@@ -81,6 +81,7 @@
%patch -p0
%build
+ # configure package
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPLAGS="%{l_cppflags}" \
@@ -91,16 +92,22 @@
--with-berkeleydb=%{l_prefix} \
--with-openssl=%{l_prefix} \
--with-workdir=%{l_prefix}/var/cfengine
+
+ # build package
%{l_make} %{l_mflags -O}
%install
+ # install package
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/var/cfengine
+ $RPM_BUILD_ROOT%{l_prefix}/var/cfengine \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
+ $RPM_BUILD_ROOT%{l_prefix}/info
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/doc
- rmdir $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/doc
+ %{l_shtool} install -c -m 644 \
+ doc/*.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+ %{l_shtool} install -c -m 644 \
+ doc/*.info* $RPM_BUILD_ROOT%{l_prefix}/info/
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
# install run-command script
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
