- 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
This commit is contained in:
Michael Schröder 2011-05-23 14:22:48 +00:00 committed by Git OBS Bridge
parent b4c7d58372
commit 0f8a66a15d
3 changed files with 18 additions and 1 deletions

11
emptychangelog.diff Normal file
View File

@ -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;

View File

@ -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

View File

@ -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