testing/rpm
SHA256
6
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

- update to rpm-4.8.0

Browse Source 
* updated python bindings
  * new transaction ordering code

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=40
This commit is contained in:
Michael Schröder
2010-03-26 10:56:28 +00:00
committed by Git OBS Bridge
parent 3de0fb7483
commit a6846b83ca
30 changed files with 960 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
build.diff
View File

@@ -1,25 +1,9 @@
Many changes to Makefiles/autogen and the like to make it build
on SUSE systems.
---
autogen.sh | 16 +++--
build/Makefile.am | 2
configure.ac | 153 ++++++++++++++++++++++++++++++++-------------------
db3/configure | 6 +-
file/src/Makefile.am | 2
installplatform | 9 ++-
lib/Makefile.am | 2
popt/autogen.sh | 2
rpmdb/Makefile.am | 4 -
rpmio/Makefile.am | 10 +--
scripts/Makefile.am | 8 ++
11 files changed, 132 insertions(+), 82 deletions(-)
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -1009,6 +1009,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH=arm
--- ./configure.ac.orig 2010-03-24 16:35:40.000000000 +0000
+++ ./configure.ac 2010-03-25 15:16:21.000000000 +0000
@@ -1006,6 +1006,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH=arm
mipsel*) RPMCANONCOLOR=0; RPMCANONARCH=mipsel ;;
mips*) RPMCANONCOLOR=0; RPMCANONARCH=mips ;;
m68k*) RPMCANONCOLOR=0; RPMCANONARCH=m68k ;;
@@ -27,7 +11,7 @@ Index: configure.ac
sh3*) RPMCANONCOLOR=0; RPMCANONARCH=sh3 ;;
sh4*) RPMCANONCOLOR=0; RPMCANONARCH=sh4 ;;
*) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;;
@@ -1019,6 +1020,7 @@ esac
@@ -1016,6 +1017,7 @@ esac
RPMCANONVENDOR="$build_vendor"
case "${build_vendor}" in
unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse)
@@ -35,7 +19,7 @@ Index: configure.ac
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
test -f /etc/SuSE-release && RPMCANONVENDOR=suse
test -f /etc/pld-release && RPMCANONVENDOR=pld
@@ -1031,6 +1033,9 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
@@ -1028,6 +1030,9 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
esac
RPMCANONOS="$host_os_noversion"
RPMCANONGNU="$host_os_gnu"
@@ -45,28 +29,23 @@ Index: configure.ac
AC_SUBST(RPMCANONCOLOR)
AC_SUBST(RPMCANONARCH)
AC_SUBST(RPMCANONVENDOR)
Index: db3/configure
===================================================================
--- db3/configure.orig
+++ db3/configure
--- ./db3/configure.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./db3/configure 2010-03-25 15:17:41.000000000 +0000
@@ -10,9 +10,9 @@ rm -f config.cache
# XXX edit CFLAGS= ... out of invocation args ???
ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
-CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
- --enable-shared --enable-static --enable-rpc \
- --with-uniquename=_rpmdb --srcdir=$db_dist
+CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \
+ --enable-shared --enable-static --enable-rpc \
--enable-shared --enable-static \
- --with-uniquename=_rpmdb --srcdir=$db_dist
+ --with-uniquename=_rpmdb --srcdir=$db_dist $ARGS
mv Makefile Makefile.orig
cat Makefile.orig | sed -e '/^install[:-]/c\
Index: installplatform
===================================================================
--- installplatform.orig
+++ installplatform
@@ -54,9 +54,9 @@ for SUBST in $SUBSTS ; do
--- ./installplatform.orig 2009-12-07 14:36:49.000000000 +0000
+++ ./installplatform 2010-03-25 15:16:21.000000000 +0000
@@ -47,9 +47,9 @@ for SUBST in $SUBSTS ; do
ARCH_INSTALL_POST='%{nil}'
case "${ARCH}-${OS}" in
sparc64*-linux) LIB=lib64 ;;
@@ -79,7 +58,7 @@ Index: installplatform
*) LIB=lib;;
esac
@@ -136,6 +136,9 @@ for SUBST in $SUBSTS ; do
@@ -129,6 +129,9 @@ for SUBST in $SUBSTS ; do
apple)
VENDORSED='-e s,^@apple@,,'
;;