From b4c7d58372ca6b5c1805a31a03d77ee56a90e5db49ce160c4f126bbabaae2df0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 20 May 2011 12:41:26 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/rpm revision 135.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=80d1868b4796876b00119a4df2cdea7d --- rpm-python.spec | 2 +- rpm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index d36cddf..5092424 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -26,7 +26,7 @@ License: GPLv2+ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.9.0 -Release: 3 +Release: 4 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.spec b/rpm.spec index e5130ee..34320cd 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,7 +29,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.9.0 -Release: 5 +Release: 7 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 From 0f8a66a15da4c2a8723ddfacf8666d319a20604b86dd91b5f82575bd6b6cc17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Mon, 23 May 2011 14:22:48 +0000 Subject: [PATCH 2/3] - do not die if the changelog section is empty [bnc#695400] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=117 --- emptychangelog.diff | 11 +++++++++++ rpm.changes | 5 +++++ rpm.spec | 3 ++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 emptychangelog.diff diff --git a/emptychangelog.diff b/emptychangelog.diff new file mode 100644 index 0000000..cdcc15c --- /dev/null +++ b/emptychangelog.diff @@ -0,0 +1,11 @@ +--- ./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; diff --git a/rpm.changes b/rpm.changes index 955ed73..a29e766 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 23 16:21:52 CEST 2011 - mls@suse.de + +- do not die if the changelog section is empty [bnc#695400] + ------------------------------------------------------------------- Fri May 20 13:28:37 CEST 2011 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 34320cd..71c86fb 100644 --- a/rpm.spec +++ b/rpm.spec @@ -116,6 +116,7 @@ Patch78: nomagiccheck.diff Patch79: findsupplements.diff Patch80: magic_and_path.diff Patch81: safemacro.diff +Patch82: emptychangelog.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -179,7 +180,7 @@ rm -f rpmdb/db.h %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 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov From 9c41a3fd8a34b07bedb15e686d06f162a28df49057807d74c272a5e584bf5cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 3 Jun 2011 13:20:15 +0000 Subject: [PATCH 3/3] - add --assume-exec option to elfdeps OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=119 --- assumeexec.diff | 27 +++++++++++++++++++++++++++ fileattrs.diff | 4 ++-- rpm.changes | 6 ++++++ rpm.spec | 3 ++- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 assumeexec.diff diff --git a/assumeexec.diff b/assumeexec.diff new file mode 100644 index 0000000..d74def4 --- /dev/null +++ b/assumeexec.diff @@ -0,0 +1,27 @@ +--- 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 + }; diff --git a/fileattrs.diff b/fileattrs.diff index 914a75d..a7ac98d 100644 --- a/fileattrs.diff +++ b/fileattrs.diff @@ -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 diff --git a/rpm.changes b/rpm.changes index a29e766..1adf6ca 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 3 15:19:02 CEST 2011 - mls@suse.de + +- 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 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 71c86fb..855d62c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -117,6 +117,7 @@ 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 @@ -180,7 +181,7 @@ rm -f rpmdb/db.h %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