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: 05-May-2004 11:31:37
Branch: HEAD Handle: 2004050510313600
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rc
Log:
use a cruel workaround until I know how to solve it more clean: skip
.snap (FreeBSD 5) and .snapshot (NetApp) directories in *.rpmxxx
checking inside the run-command processor
Summary:
Revision Changes Path
1.173 +1 -0 openpkg-src/openpkg/HISTORY
1.326 +1 -1 openpkg-src/openpkg/openpkg.spec
1.55 +1 -1 openpkg-src/openpkg/rc
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.172 -r1.173 HISTORY
--- openpkg-src/openpkg/HISTORY 1 May 2004 18:25:58 -0000 1.172
+++ openpkg-src/openpkg/HISTORY 5 May 2004 09:31:36 -0000 1.173
@@ -2,6 +2,7 @@
2004
====
+20040505 rc: skip .snap (FreeBSD 5) and .snapshot (NetApp) directories in *.rpmxxx
checking
20040501 use better GCC detection in "rpmtool cflags" (taken over from "gcc"
package)
20040429 make sure <prefix>/etc/rc does not complain in cronjobs of non-privileged
setups
20040429 port to NetBSD 1.6.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.325 -r1.326 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 1 May 2004 18:25:58 -0000 1.325
+++ openpkg-src/openpkg/openpkg.spec 5 May 2004 09:31:36 -0000 1.326
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040501
+%define V_openpkg 20040505
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.54 -r1.55 rc
--- openpkg-src/openpkg/rc 29 Apr 2004 15:08:20 -0000 1.54
+++ openpkg-src/openpkg/rc 5 May 2004 09:31:36 -0000 1.55
@@ -292,7 +292,7 @@
# check for upgraded package with unresolved configuration file conflicts
if [ -d "$prefix/etc/$s_name" -a ".$eval" != .1 ]; then
- if [ ".`find $prefix/etc/$s_name -print 2>/dev/null | egrep
'.*\.rpm(new|orig|save)$'`" != . ]; then
+ if [ ".`find $prefix/etc/$s_name -type f -print 2>/dev/null | egrep -v
'.*/\.(snap|snapshot)/.*' | egrep '.*\.rpm(new|orig|save)$'`" != . ]; then
case "$cmd" in
start|restart ) type="ERROR" ;;
* ) type="WARNING" ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
