Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-10-18 22:03:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm", Maintainer is "m...@suse.com"
Changes:
--------
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-10-12 08:15:33.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-10-18
22:03:05.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Oct 16 18:39:11 CEST 2012 - r...@suse.de
+
+- new patch: powerpc-fix-platform.diff
+ fix platform detection for ppc vs ppc64 (failed on ppc64 with
+ personality changed to ppc)
+
+-------------------------------------------------------------------
New:
----
powerpc-fix-platform.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
rpm-python.spec: same change
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.cPJ0wY/_old 2012-10-18 22:03:06.000000000 +0200
+++ /var/tmp/diff_new_pack.cPJ0wY/_new 2012-10-18 22:03:06.000000000 +0200
@@ -135,6 +135,7 @@
Patch80: obsoletesdeptag.diff
Patch81: fdopen_strncat.diff
Patch82: fix-fd-leak.diff
+Patch83: powerpc-fix-platform.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -211,7 +212,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
-%patch -P 80 -P 81 -P 82
+%patch -P 80 -P 81 -P 82 -P 83
#chmod 755 scripts/find-supplements{,.ksyms}
#chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
#chmod 755 scripts/firmware.prov
++++++ powerpc-fix-platform.diff ++++++
--- lib/rpmrc.c 2012/10/16 16:37:34 1.1
+++ lib/rpmrc.c 2012/10/16 16:38:10
@@ -1091,7 +1091,7 @@
# if defined(__linux__) && defined(__powerpc__)
{
int powerlvl;
- if (sscanf(rpmat.platform, "power%d", &powerlvl) == 1 && powerlvl
> 6)
+ if (!rstreq(un.machine, "ppc") && sscanf(rpmat.platform,
"power%d", &powerlvl) == 1 && powerlvl > 6)
strcpy(un.machine, "ppc64p7");
}
# endif /* ppc64*-linux */
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
