OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Feb-2005 20:29:08
Branch: HEAD Handle: 2005020119290700
Modified files:
openpkg-src/openpkg openpkg.spec rpm.patch.bugfix
Log:
remove the strangely created (and empty) $RPM_BUILD_ROOT/var, but
mostly port to BSD/ia64 by removing a superfluous and possibly
incorrect cast
Summary:
Revision Changes Path
1.393 +1 -0 openpkg-src/openpkg/openpkg.spec
1.54 +25 -0 openpkg-src/openpkg/rpm.patch.bugfix
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.392 -r1.393 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 1 Feb 2005 19:03:10 -0000 1.392
+++ openpkg-src/openpkg/openpkg.spec 1 Feb 2005 19:29:07 -0000 1.393
@@ -845,6 +845,7 @@
for dir in man/ja man/pl man/ru man/sk src; do
rm -rf $RPM_BUILD_ROOT%{l_prefix}/$dir >/dev/null 2>&1 || true
done
+ rm -rf $RPM_BUILD_ROOT/var >/dev/null 2>&1 || true
for file in rpme rpmi rpmsign rpmu rpmverify rpmquery gendiff; do
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/$file >/dev/null 2>&1 || true
done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.53 -r1.54 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 20 Jan 2005 11:08:53 -0000
1.53
+++ openpkg-src/openpkg/rpm.patch.bugfix 1 Feb 2005 19:29:07 -0000
1.54
@@ -46,6 +46,31 @@
}
+---------------------------------------------------------------------------
+| Repair for BSD/ia64: Remove a seemingly unnecessary (and incorrect?) cast.
+| The basename(3) already returns (char *) as required by the format string.
++---------------------------------------------------------------------------
+Index: build/parsePrep.c
+--- build/parsePrep.c.orig 2002-08-07 16:20:20 +0200
++++ build/parsePrep.c 2005-02-01 19:12:14 +0100
+@@ -136,14 +136,14 @@
+ "if [ $STATUS -ne 0 ]; then\n"
+ " exit $STATUS\n"
+ "fi",
+- c, /[EMAIL PROTECTED]@*/ (const char *) basename(fn), /[EMAIL
PROTECTED]@*/
++ c, /[EMAIL PROTECTED]@*/ basename(fn), /[EMAIL PROTECTED]@*/
+ zipper,
+ fn, strip, args);
+ zipper = _free(zipper);
+ } else {
+ sprintf(buf,
+ "echo \"Patch #%d (%s):\"\n"
+- "patch -p%d %s -s < %s", c, (const char *) basename(fn),
++ "patch -p%d %s -s < %s", c, basename(fn),
+ strip, args, fn);
+ }
+
+
++---------------------------------------------------------------------------
| Do not pick of the vendor BeeCrypt package on RedHat Linux.
+---------------------------------------------------------------------------
Index: configure.ac
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
