Author: ranger
Date: Fri Jun 15 01:06:19 2007
New Revision: 829
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=829&repname=user%3a+ranger
Log:
still working on rpm
Modified:
trunk/experimental/10.3/crypto/finkinfo/rpm.info
trunk/experimental/10.3/crypto/finkinfo/rpm.patch
trunk/experimental/10.4/crypto/finkinfo/rpm.info
trunk/experimental/10.4/crypto/finkinfo/rpm.patch
trunk/experimental/common/crypto/finkinfo/rpm.info
trunk/experimental/common/crypto/finkinfo/rpm.patch
Modified: trunk/experimental/10.3/crypto/finkinfo/rpm.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/crypto/finkinfo/rpm.info&rev=829&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/crypto/finkinfo/rpm.info (original)
+++ trunk/experimental/10.3/crypto/finkinfo/rpm.info Fri Jun 15 01:06:19 2007
@@ -33,7 +33,13 @@
make
<<
-InstallScript: make -j1 install DESTDIR="%d"
+InstallScript: <<
+#!/bin/sh -ev
+ make -j1 install DESTDIR="%d"
+ install -d -m 755 %i/etc/rpm
+ echo '%_dbapi 4' > %i/etc/rpm/macros
+ echo '%_dbapi_rebuild 4' >> %i/etc/rpm/macros
+<<
DocFiles: CHANGES COPYING CREDITS GROUPS README
SplitOff: <<
Package: %N4.4-shlibs
@@ -61,6 +67,8 @@
Files: include lib/*.la lib/*.dylib lib/*.a
<<
+ConfFiles: %p/etc/rpm/macros
+
Homepage: http://www.rpm.org/
DescDetail: <<
The RPM Package Manager (RPM) is a powerful command line driven package
Modified: trunk/experimental/10.3/crypto/finkinfo/rpm.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/crypto/finkinfo/rpm.patch&rev=829&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/crypto/finkinfo/rpm.patch (original)
+++ trunk/experimental/10.3/crypto/finkinfo/rpm.patch Fri Jun 15 01:06:19 2007
@@ -1,6 +1,6 @@
--- rpm-4.5/autodeps/darwin.prov 2005-01-04 09:41:39.000000000 -0800
-+++ rpm-4.5-new/autodeps/darwin.prov 2007-06-12 19:13:41.000000000 -0700
++++ rpm-4.5-new/autodeps/darwin.prov 2007-06-13 10:52:54.000000000 -0700
@@ -5,7 +5,7 @@
# This script reads filenames from STDIN and outputs any relevant provides
# information that needs to be included in the package.
@@ -10,8 +10,41 @@
for f in $filelist; do
libname=$(basename $f | sed -e 's;\..*;;')
+--- rpm-4.5/autodeps/darwin.req 2005-01-04 09:41:39.000000000 -0800
++++ rpm-4.5-new/autodeps/darwin.req 2007-06-13 10:55:52.000000000 -0700
+@@ -15,7 +15,7 @@
+ | sed -n -e '/ (compatibility version .* current version .*)/p' \
+ | sed -e 's/ (compatibility version .* current version .*)//'
+ fi
+-done | sort -u | sed "s/['\"]/\\\&/g" | xargs -n 1 basename | sort -u
++done | sort -u | sed "s/['\"]/\\\&/g" | grep -v -E
'^(/System/Library/|/Library/|/lib/|/usr/lib/|/usr/local/lib/)' | xargs -n 1
basename | sort -u
+
+ for f in $scriptlist; do
+ if [ -x $f ]; then
+--- rpm-4.5/lib/rpmrc.c 2007-05-25 10:36:02.000000000 -0700
++++ rpm-4.5-new/lib/rpmrc.c 2007-06-13 11:03:40.000000000 -0700
+@@ -585,7 +585,7 @@
+ addMacro(NULL, "___build_pre", NULL, ___build_pre, RMIL_DEFAULT);
+
+ setVarDefault(-1, "_topdir",
+- "/usr/src/rpm", "%{_usr}/src/rpm");
++ "/usr/src/rpm", "%{_usr}/var/rpm-src");
+ setVarDefault(-1, "_tmppath",
+ "/var/tmp", "%{_var}/tmp");
+ setVarDefault(-1, "_dbpath",
+--- rpm-4.5/rpmdb/rpmdb.c 2007-05-25 10:36:33.000000000 -0700
++++ rpm-4.5-new/rpmdb/rpmdb.c 2007-06-13 10:58:01.000000000 -0700
+@@ -3868,7 +3868,7 @@
+
+ /* Remove /etc/rpm/macros.db1 configuration file if db3 rebuilt. */
+ if (rc == 0 && _newdbapi == 1 && _olddbapi == 3) {
+- const char * mdb1 = "/etc/rpm/macros.db1";
++ const char * mdb1 = "@FINKPREFIX@/etc/rpm/macros.db1";
+ struct stat st;
+ if (!stat(mdb1, &st) && S_ISREG(st.st_mode) && !unlink(mdb1))
+ rpmMessage(RPMMESS_DEBUG,
--- rpm-4.5/rpmio/fts.c 2007-05-25 10:36:36.000000000 -0700
-+++ rpm-4.5-new/rpmio/fts.c 2007-06-12 19:13:41.000000000 -0700
++++ rpm-4.5-new/rpmio/fts.c 2007-06-13 10:52:54.000000000 -0700
@@ -34,6 +34,7 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -28,8 +61,19 @@
#include "fts.h"
#include "rpmio.h"
#include "rpmurl.h"
+--- rpm-4.5/rpmio/macro.c 2007-05-25 10:36:36.000000000 -0700
++++ rpm-4.5-new/rpmio/macro.c 2007-06-13 10:57:49.000000000 -0700
+@@ -2419,7 +2419,7 @@
+
+ #if defined(EVAL_MACROS)
+
+-char *rpmMacrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros:~/.rpmmacros";
++char *rpmMacrofiles = "@FINKPREFIX@/etc/rpm/macros:~/.rpmmacros";
+
+ int
+ main(int argc, char *argv[])
--- rpm-4.5/rpmio/rpmio.h 2007-05-25 12:00:39.000000000 -0700
-+++ rpm-4.5-new/rpmio/rpmio.h 2007-06-12 20:15:06.000000000 -0700
++++ rpm-4.5-new/rpmio/rpmio.h 2007-06-13 10:52:54.000000000 -0700
@@ -664,7 +664,11 @@
* @param prompt prompt string
* @return password
Modified: trunk/experimental/10.4/crypto/finkinfo/rpm.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/rpm.info&rev=829&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/rpm.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/rpm.info Fri Jun 15 01:06:19 2007
@@ -33,7 +33,13 @@
make
<<
-InstallScript: make -j1 install DESTDIR="%d"
+InstallScript: <<
+#!/bin/sh -ev
+ make -j1 install DESTDIR="%d"
+ install -d -m 755 %i/etc/rpm
+ echo '%_dbapi 4' > %i/etc/rpm/macros
+ echo '%_dbapi_rebuild 4' >> %i/etc/rpm/macros
+<<
DocFiles: CHANGES COPYING CREDITS GROUPS README
SplitOff: <<
Package: %N4.4-shlibs
@@ -61,6 +67,8 @@
Files: include lib/*.la lib/*.dylib lib/*.a
<<
+ConfFiles: %p/etc/rpm/macros
+
Homepage: http://www.rpm.org/
DescDetail: <<
The RPM Package Manager (RPM) is a powerful command line driven package
Modified: trunk/experimental/10.4/crypto/finkinfo/rpm.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/rpm.patch&rev=829&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/rpm.patch (original)
+++ trunk/experimental/10.4/crypto/finkinfo/rpm.patch Fri Jun 15 01:06:19 2007
@@ -1,6 +1,6 @@
--- rpm-4.5/autodeps/darwin.prov 2005-01-04 09:41:39.000000000 -0800
-+++ rpm-4.5-new/autodeps/darwin.prov 2007-06-12 19:13:41.000000000 -0700
++++ rpm-4.5-new/autodeps/darwin.prov 2007-06-13 10:52:54.000000000 -0700
@@ -5,7 +5,7 @@
# This script reads filenames from STDIN and outputs any relevant provides
# information that needs to be included in the package.
@@ -10,8 +10,41 @@
for f in $filelist; do
libname=$(basename $f | sed -e 's;\..*;;')
+--- rpm-4.5/autodeps/darwin.req 2005-01-04 09:41:39.000000000 -0800
++++ rpm-4.5-new/autodeps/darwin.req 2007-06-13 10:55:52.000000000 -0700
+@@ -15,7 +15,7 @@
+ | sed -n -e '/ (compatibility version .* current version .*)/p' \
+ | sed -e 's/ (compatibility version .* current version .*)//'
+ fi
+-done | sort -u | sed "s/['\"]/\\\&/g" | xargs -n 1 basename | sort -u
++done | sort -u | sed "s/['\"]/\\\&/g" | grep -v -E
'^(/System/Library/|/Library/|/lib/|/usr/lib/|/usr/local/lib/)' | xargs -n 1
basename | sort -u
+
+ for f in $scriptlist; do
+ if [ -x $f ]; then
+--- rpm-4.5/lib/rpmrc.c 2007-05-25 10:36:02.000000000 -0700
++++ rpm-4.5-new/lib/rpmrc.c 2007-06-13 11:03:40.000000000 -0700
+@@ -585,7 +585,7 @@
+ addMacro(NULL, "___build_pre", NULL, ___build_pre, RMIL_DEFAULT);
+
+ setVarDefault(-1, "_topdir",
+- "/usr/src/rpm", "%{_usr}/src/rpm");
++ "/usr/src/rpm", "%{_usr}/var/rpm-src");
+ setVarDefault(-1, "_tmppath",
+ "/var/tmp", "%{_var}/tmp");
+ setVarDefault(-1, "_dbpath",
+--- rpm-4.5/rpmdb/rpmdb.c 2007-05-25 10:36:33.000000000 -0700
++++ rpm-4.5-new/rpmdb/rpmdb.c 2007-06-13 10:58:01.000000000 -0700
+@@ -3868,7 +3868,7 @@
+
+ /* Remove /etc/rpm/macros.db1 configuration file if db3 rebuilt. */
+ if (rc == 0 && _newdbapi == 1 && _olddbapi == 3) {
+- const char * mdb1 = "/etc/rpm/macros.db1";
++ const char * mdb1 = "@FINKPREFIX@/etc/rpm/macros.db1";
+ struct stat st;
+ if (!stat(mdb1, &st) && S_ISREG(st.st_mode) && !unlink(mdb1))
+ rpmMessage(RPMMESS_DEBUG,
--- rpm-4.5/rpmio/fts.c 2007-05-25 10:36:36.000000000 -0700
-+++ rpm-4.5-new/rpmio/fts.c 2007-06-12 19:13:41.000000000 -0700
++++ rpm-4.5-new/rpmio/fts.c 2007-06-13 10:52:54.000000000 -0700
@@ -34,6 +34,7 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -28,8 +61,19 @@
#include "fts.h"
#include "rpmio.h"
#include "rpmurl.h"
+--- rpm-4.5/rpmio/macro.c 2007-05-25 10:36:36.000000000 -0700
++++ rpm-4.5-new/rpmio/macro.c 2007-06-13 10:57:49.000000000 -0700
+@@ -2419,7 +2419,7 @@
+
+ #if defined(EVAL_MACROS)
+
+-char *rpmMacrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros:~/.rpmmacros";
++char *rpmMacrofiles = "@FINKPREFIX@/etc/rpm/macros:~/.rpmmacros";
+
+ int
+ main(int argc, char *argv[])
--- rpm-4.5/rpmio/rpmio.h 2007-05-25 12:00:39.000000000 -0700
-+++ rpm-4.5-new/rpmio/rpmio.h 2007-06-12 20:15:06.000000000 -0700
++++ rpm-4.5-new/rpmio/rpmio.h 2007-06-13 10:52:54.000000000 -0700
@@ -664,7 +664,11 @@
* @param prompt prompt string
* @return password
Modified: trunk/experimental/common/crypto/finkinfo/rpm.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/rpm.info&rev=829&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/rpm.info (original)
+++ trunk/experimental/common/crypto/finkinfo/rpm.info Fri Jun 15 01:06:19 2007
@@ -27,7 +27,14 @@
perl -pi -e 's,-lpopt,%p/lib/libpopt.la,g' Makefile
make
<<
-InstallScript: make -j1 install DESTDIR="%d"
+InstallScript: <<
+#!/bin/sh -ev
+ make -j1 install DESTDIR="%d"
+ install -d -m 755 %i/etc/rpm
+ echo '%_dbapi 4' > %i/etc/rpm/macros
+ echo '%_dbapi_rebuild 4' >> %i/etc/rpm/macros
+<<
+ConfFiles: %p/etc/rpm/macros
SplitOff: <<
Package: %N4.4-shlibs
Description: Shared libraries for RPM
Modified: trunk/experimental/common/crypto/finkinfo/rpm.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/rpm.patch&rev=829&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/rpm.patch (original)
+++ trunk/experimental/common/crypto/finkinfo/rpm.patch Fri Jun 15 01:06:19 2007
@@ -1,6 +1,6 @@
diff -uNr rpm-4.5/autodeps/darwin.prov rpm-4.5-new/autodeps/darwin.prov
--- rpm-4.5/autodeps/darwin.prov 2005-01-04 09:41:39.000000000 -0800
-+++ rpm-4.5-new/autodeps/darwin.prov 2007-06-12 19:13:41.000000000 -0700
++++ rpm-4.5-new/autodeps/darwin.prov 2007-06-13 10:52:54.000000000 -0700
@@ -5,7 +5,7 @@
# This script reads filenames from STDIN and outputs any relevant provides
# information that needs to be included in the package.
@@ -10,9 +10,45 @@
for f in $filelist; do
libname=$(basename $f | sed -e 's;\..*;;')
+diff -uNr rpm-4.5/autodeps/darwin.req rpm-4.5-new/autodeps/darwin.req
+--- rpm-4.5/autodeps/darwin.req 2005-01-04 09:41:39.000000000 -0800
++++ rpm-4.5-new/autodeps/darwin.req 2007-06-13 10:55:52.000000000 -0700
+@@ -15,7 +15,7 @@
+ | sed -n -e '/ (compatibility version .* current version .*)/p' \
+ | sed -e 's/ (compatibility version .* current version .*)//'
+ fi
+-done | sort -u | sed "s/['\"]/\\\&/g" | xargs -n 1 basename | sort -u
++done | sort -u | sed "s/['\"]/\\\&/g" | grep -v -E
'^(/System/Library/|/Library/|/lib/|/usr/lib/|/usr/local/lib/)' | xargs -n 1
basename | sort -u
+
+ for f in $scriptlist; do
+ if [ -x $f ]; then
+diff -uNr rpm-4.5/lib/rpmrc.c rpm-4.5-new/lib/rpmrc.c
+--- rpm-4.5/lib/rpmrc.c 2007-05-25 10:36:02.000000000 -0700
++++ rpm-4.5-new/lib/rpmrc.c 2007-06-13 11:03:40.000000000 -0700
+@@ -585,7 +585,7 @@
+ addMacro(NULL, "___build_pre", NULL, ___build_pre, RMIL_DEFAULT);
+
+ setVarDefault(-1, "_topdir",
+- "/usr/src/rpm", "%{_usr}/src/rpm");
++ "/usr/src/rpm", "%{_usr}/var/rpm-src");
+ setVarDefault(-1, "_tmppath",
+ "/var/tmp", "%{_var}/tmp");
+ setVarDefault(-1, "_dbpath",
+diff -uNr rpm-4.5/rpmdb/rpmdb.c rpm-4.5-new/rpmdb/rpmdb.c
+--- rpm-4.5/rpmdb/rpmdb.c 2007-05-25 10:36:33.000000000 -0700
++++ rpm-4.5-new/rpmdb/rpmdb.c 2007-06-13 10:58:01.000000000 -0700
+@@ -3868,7 +3868,7 @@
+
+ /* Remove /etc/rpm/macros.db1 configuration file if db3 rebuilt. */
+ if (rc == 0 && _newdbapi == 1 && _olddbapi == 3) {
+- const char * mdb1 = "/etc/rpm/macros.db1";
++ const char * mdb1 = "@FINKPREFIX@/etc/rpm/macros.db1";
+ struct stat st;
+ if (!stat(mdb1, &st) && S_ISREG(st.st_mode) && !unlink(mdb1))
+ rpmMessage(RPMMESS_DEBUG,
diff -uNr rpm-4.5/rpmio/fts.c rpm-4.5-new/rpmio/fts.c
--- rpm-4.5/rpmio/fts.c 2007-05-25 10:36:36.000000000 -0700
-+++ rpm-4.5-new/rpmio/fts.c 2007-06-12 19:13:41.000000000 -0700
++++ rpm-4.5-new/rpmio/fts.c 2007-06-13 10:52:54.000000000 -0700
@@ -34,6 +34,7 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
@@ -29,9 +65,21 @@
#include "fts.h"
#include "rpmio.h"
#include "rpmurl.h"
+diff -uNr rpm-4.5/rpmio/macro.c rpm-4.5-new/rpmio/macro.c
+--- rpm-4.5/rpmio/macro.c 2007-05-25 10:36:36.000000000 -0700
++++ rpm-4.5-new/rpmio/macro.c 2007-06-13 10:57:49.000000000 -0700
+@@ -2419,7 +2419,7 @@
+
+ #if defined(EVAL_MACROS)
+
+-char *rpmMacrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros:~/.rpmmacros";
++char *rpmMacrofiles = "@FINKPREFIX@/etc/rpm/macros:~/.rpmmacros";
+
+ int
+ main(int argc, char *argv[])
diff -uNr rpm-4.5/rpmio/rpmio.h rpm-4.5-new/rpmio/rpmio.h
--- rpm-4.5/rpmio/rpmio.h 2007-05-25 12:00:39.000000000 -0700
-+++ rpm-4.5-new/rpmio/rpmio.h 2007-06-12 20:15:06.000000000 -0700
++++ rpm-4.5-new/rpmio/rpmio.h 2007-06-13 10:52:54.000000000 -0700
@@ -664,7 +664,11 @@
* @param prompt prompt string
* @return password
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
