Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2013-05-07 15:42:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2013-04-18 10:43:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-05-07 15:42:40.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 22 22:00:14 UTC 2013 - [email protected] + +- add auto-config-update-aarch64.diff: + * optionally automatically update config.guess/sub during build + +------------------------------------------------------------------- New: ---- auto-config-update-aarch64.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.oXxToN/_old 2013-05-07 15:42:46.000000000 +0200 +++ /var/tmp/diff_new_pack.oXxToN/_new 2013-05-07 15:42:46.000000000 +0200 @@ -60,6 +60,7 @@ Source10: beecrypt-4.1.2.tar.bz2 Source11: db-4.8.30.tar.bz2 Source12: baselibs.conf +Source6464: auto-config-update-aarch64.diff Patch1: beecrypt-4.1.2.diff Patch2: db.diff # quilt patches start here @@ -223,6 +224,9 @@ %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 +%ifarch aarch64 +%patch6464 +%endif cp config.guess config.sub db/dist/ cp config.guess config.sub beecrypt/ #chmod 755 scripts/find-supplements{,.ksyms} @@ -339,6 +343,10 @@ fi done popd +%ifarch aarch64 +install -m 755 config.guess %{buildroot}/usr/lib/rpm +install -m 755 config.sub %{buildroot}/usr/lib/rpm +%endif gzip -9 CHANGES rm -rf %{buildroot}/%{_libdir}/python%{py_ver} rm -f %{buildroot}%{_libdir}/*.la ++++++ auto-config-update-aarch64.diff ++++++ Index: build/parseBuildInstallClean.c =================================================================== --- build/parseBuildInstallClean.c.orig +++ build/parseBuildInstallClean.c @@ -46,7 +46,21 @@ int parseBuildInstallClean(rpmSpec spec, } else if (rc < 0) { goto exit; } - + + if (parsePart == PART_BUILD) { + char* buf = strdup( + "ref=/usr/lib/rpm\n" + "for s in guess sub; do\n" + " for c in $(find -maxdepth 3 -name \"config.$s\"); do\n" + " grep -q config-patches@ $c || continue\n" + " grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n" + " done\n" + "done\n" + ); + appendLineStringBuf(*sbp, buf); + free(buf); + } + while (! (nextPart = isPart(spec->line))) { appendStringBuf(*sbp, spec->line); if ((rc = readLine(spec, STRIP_NOTHING)) > 0) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
