Accepting request 33357 from Base:System

Copy from Base:System/rpm based on submit request 33357 from user mlschroe

OBS-URL: https://build.opensuse.org/request/show/33357
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=93
This commit is contained in:
OBS User autobuild 2010-02-25 10:12:30 +00:00 committed by Git OBS Bridge
parent d4083a0d7a
commit d87b91e318
4 changed files with 19 additions and 3 deletions

10
readlineofi.diff Normal file
View File

@ -0,0 +1,10 @@
--- build/parseSpec.c.orig 2010-02-15 11:49:29.000000000 +0000
+++ build/parseSpec.c 2010-02-24 10:38:25.000000000 +0000
@@ -283,6 +283,7 @@ int readLine(rpmSpec spec, int strip)
retry:
if ((rc = readLineFromOFI(spec, ofi)) != 0)
return rc;
+ ofi = spec->fileStack;
/* Copy next file line into the spec line buffer */
rc = copyNextLineFromOFI(spec, ofi);

View File

@ -25,7 +25,7 @@ License: GPLv2+
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.7.1
Release: 8
Release: 9
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 24 11:57:30 CET 2010 - mls@suse.de
- fix readLine segfault [bnc#582599]
-------------------------------------------------------------------
Sat Dec 12 23:42:26 CET 2009 - jengelh@medozas.de

View File

@ -28,7 +28,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.7.1
Release: 8
Release: 9
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@ -102,6 +102,7 @@ Patch65: fixabsfilelists.diff
Patch66: fixqueryreturn.diff
Patch67: lazystatfs.diff
Patch68: defclean.diff
Patch69: readlineofi.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@ -161,7 +162,7 @@ rm -f rpmdb/db.h
%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
%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
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
#chmod 755 scripts/find-supplements{,.ksyms}
#chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
#chmod 755 scripts/firmware.prov