Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Mon Jun 6 09:40:59 CEST 2011.
-------- --- rpm/rpm.changes 2011-05-20 13:31:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2011-06-03 15:20:15.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 3 15:19:02 CEST 2011 - [email protected] + +- add --assume-exec option to elfdeps, so that the dependency + generator really works for libs without x-bits + +------------------------------------------------------------------- +Mon May 23 16:21:52 CEST 2011 - [email protected] + +- do not die if the changelog section is empty [bnc#695400] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- assumeexec.diff emptychangelog.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.0lA0lz/_old 2011-06-06 09:39:15.000000000 +0200 +++ /var/tmp/diff_new_pack.0lA0lz/_new 2011-06-06 09:39:15.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.9.0 -Release: 4 +Release: 5 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.0lA0lz/_old 2011-06-06 09:39:15.000000000 +0200 +++ /var/tmp/diff_new_pack.0lA0lz/_new 2011-06-06 09:39:15.000000000 +0200 @@ -29,7 +29,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.9.0 -Release: 7 +Release: 9 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -116,6 +116,8 @@ Patch79: findsupplements.diff Patch80: magic_and_path.diff Patch81: safemacro.diff +Patch82: emptychangelog.diff +Patch83: assumeexec.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -179,7 +181,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 +%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 ++++++ assumeexec.diff ++++++ --- tools/elfdeps.c.orig 2011-06-03 13:12:32.000000000 +0000 +++ tools/elfdeps.c 2011-06-03 13:17:45.000000000 +0000 @@ -14,6 +14,7 @@ int filter_private = 0; int soname_only = 0; +int assume_exec = 0; typedef struct elfInfo_s { Elf *elf; @@ -226,7 +227,7 @@ static int processFile(const char *fn, i ei->isElf64 = 0; #endif ei->isDSO = (ehdr->e_type == ET_DYN); - ei->isExec = (st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)); + ei->isExec = assume_exec || (st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)); processSections(ei); } @@ -279,6 +280,7 @@ int main(int argc, char *argv[]) { "requires", 'R', POPT_ARG_VAL, &requires, -1, NULL, NULL }, { "filter-private", 0, POPT_ARG_VAL, &filter_private, -1, NULL, NULL }, { "soname-only", 0, POPT_ARG_VAL, &soname_only, -1, NULL, NULL }, + { "assume-exec", 0, POPT_ARG_VAL, &assume_exec, -1, NULL, NULL }, POPT_AUTOHELP POPT_TABLEEND }; ++++++ emptychangelog.diff ++++++ --- ./build/parseChangelog.c.orig 2011-05-23 14:19:48.000000000 +0000 +++ ./build/parseChangelog.c 2011-05-23 14:20:36.000000000 +0000 @@ -238,7 +238,7 @@ int parseChangelog(rpmSpec spec) } } - if (addChangelog(spec->packages->header, sb)) { + if (sb && addChangelog(spec->packages->header, sb)) { goto exit; } res = nextPart; ++++++ fileattrs.diff ++++++ --- /var/tmp/diff_new_pack.0lA0lz/_old 2011-06-06 09:39:16.000000000 +0200 +++ /var/tmp/diff_new_pack.0lA0lz/_new 2011-06-06 09:39:16.000000000 +0200 @@ -33,8 +33,8 @@ --- ./fileattrs/elflib.attr.orig 2011-05-18 09:28:23.000000000 +0000 +++ ./fileattrs/elflib.attr 2011-05-18 09:31:30.000000000 +0000 @@ -0,0 +1,4 @@ -+%__elflib_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private} -+%__elflib_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private} ++%__elflib_provides %{_rpmconfigdir}/elfdeps --assume-exec --provides %{?__filter_GLIBC_PRIVATE:--filter-private} ++%__elflib_requires %{_rpmconfigdir}/elfdeps --assume-exec --requires %{?__filter_GLIBC_PRIVATE:--filter-private} +%__elflib_magic ^ELF (32|64)-bit.*shared object +%__elflib_exclude_path ^/usr/lib/debug/ --- ./fileattrs/firmware.attr.orig 2011-05-18 09:27:44.000000000 +0000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
