pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=46

Browse Source
This commit is contained in:
OBS User unknown 2008-07-04 22:53:44 +00:00 committed by Git OBS Bridge
parent 5ce52dbafc
commit 7a11aca07d
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
requires-ge-macro.diff Normal file
View File

@ -0,0 +1,10 @@
--- macros.in
+++ macros.in
@@ -1242,6 +1242,7 @@
# %dir %{perl_sitearch}/auto/Image
#
%requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+%requires_ge() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch)
%perl_sitelib %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib)
%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)

2
rpm-python.spec
View File

@ -17,7 +17,7 @@ License: GPL v2 or later
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2
Release: 249
Release: 251
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 30 14:02:35 CEST 2008 - dmueller@suse.de
- add a requires_ge macro as well
-------------------------------------------------------------------
Thu Jun 26 18:40:46 CEST 2008 - schwab@suse.de

11
rpm.spec
View File

@ -20,7 +20,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.4.2
Release: 201
Release: 203
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@ -134,6 +134,7 @@ Patch105: lzma-payload-2.diff
Patch106: debugsource-package.diff
Patch107: whatrequires-doc.diff
Patch108: remove-brp-strips.diff
Patch109: requires-ge-macro.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@ -206,7 +207,7 @@ rm -f rpmdb/db.h
%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 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89
%patch -P 90 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99
%patch -P 100 -P 101 -P 102 -P 103 -P -P 106 -P 107 -P 108
%patch -P 100 -P 101 -P 102 -P 103 -P -P 106 -P 107 -P 108 -P 109
%patch -P 104 -P 105 -b .lzma
chmod 755 scripts/find-supplements{,.ksyms}
chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
@ -352,7 +353,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
Release: 429
Release: 431
#
%description -n popt
@ -375,7 +376,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
Release: 429
Release: 431
Requires: popt = 1.7
Requires: glibc-devel
@ -410,6 +411,8 @@ Authors:
%doc %{_mandir}/man3/popt.3*
%changelog
* Mon Jun 30 2008 dmueller@suse.de
- add a requires_ge macro as well
* Thu Jun 26 2008 schwab@suse.de
- Fix db configure script.
* Thu May 15 2008 dmueller@suse.de