update to rpm-4.9.0
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
This commit is contained in:
18
build.diff
18
build.diff
@@ -1,9 +1,9 @@
|
||||
Many changes to Makefiles/autogen and the like to make it build
|
||||
on SUSE systems.
|
||||
|
||||
--- ./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
|
||||
--- ./configure.ac.orig 2011-05-11 14:27:32.000000000 +0000
|
||||
+++ ./configure.ac 2011-05-11 15:18:44.000000000 +0000
|
||||
@@ -850,6 +850,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH=arm
|
||||
mipsel*) RPMCANONCOLOR=0; RPMCANONARCH=mipsel ;;
|
||||
mips*) RPMCANONCOLOR=0; RPMCANONARCH=mips ;;
|
||||
m68k*) RPMCANONCOLOR=0; RPMCANONARCH=m68k ;;
|
||||
@@ -11,7 +11,7 @@ on SUSE systems.
|
||||
sh3*) RPMCANONCOLOR=0; RPMCANONARCH=sh3 ;;
|
||||
sh4*) RPMCANONCOLOR=0; RPMCANONARCH=sh4 ;;
|
||||
*) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;;
|
||||
@@ -1016,6 +1017,7 @@ esac
|
||||
@@ -860,6 +861,7 @@ esac
|
||||
RPMCANONVENDOR="$build_vendor"
|
||||
case "${build_vendor}" in
|
||||
unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse)
|
||||
@@ -19,7 +19,7 @@ on SUSE systems.
|
||||
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
|
||||
test -f /etc/SuSE-release && RPMCANONVENDOR=suse
|
||||
test -f /etc/pld-release && RPMCANONVENDOR=pld
|
||||
@@ -1028,6 +1030,9 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
|
||||
@@ -872,6 +874,9 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
|
||||
esac
|
||||
RPMCANONOS="$host_os_noversion"
|
||||
RPMCANONGNU="$host_os_gnu"
|
||||
@@ -29,8 +29,8 @@ on SUSE systems.
|
||||
AC_SUBST(RPMCANONCOLOR)
|
||||
AC_SUBST(RPMCANONARCH)
|
||||
AC_SUBST(RPMCANONVENDOR)
|
||||
--- ./db3/configure.orig 2009-12-07 14:36:49.000000000 +0000
|
||||
+++ ./db3/configure 2010-03-25 15:17:41.000000000 +0000
|
||||
--- ./db3/configure.orig 2010-12-03 12:11:57.000000000 +0000
|
||||
+++ ./db3/configure 2011-05-11 15:18:44.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=.*$%%'`"
|
||||
@@ -43,8 +43,8 @@ on SUSE systems.
|
||||
|
||||
mv Makefile Makefile.orig
|
||||
cat Makefile.orig | sed -e '/^install[:-]/c\
|
||||
--- ./installplatform.orig 2009-12-07 14:36:49.000000000 +0000
|
||||
+++ ./installplatform 2010-03-25 15:16:21.000000000 +0000
|
||||
--- ./installplatform.orig 2010-12-03 12:11:57.000000000 +0000
|
||||
+++ ./installplatform 2011-05-11 15:18:44.000000000 +0000
|
||||
@@ -47,9 +47,9 @@ for SUBST in $SUBSTS ; do
|
||||
ARCH_INSTALL_POST='%{nil}'
|
||||
case "${ARCH}-${OS}" in
|
||||
|
Reference in New Issue
Block a user