testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2009-02-09 17:05:08 +00:00 committed by Git OBS Bridge
parent 6607c124ea
commit 62f0188e16
4 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
disttag-macro.diff Normal file
View File

@ -0,0 +1,29 @@
--- build/parsePreamble.c
+++ build/parsePreamble.c 2009/02/09 13:05:35
@@ -330,6 +330,7 @@
{ RPMTAG_PACKAGER, "%{packager}" },
{ RPMTAG_DISTRIBUTION, "%{distribution}" },
{ RPMTAG_DISTURL, "%{disturl}" },
+ { RPMTAG_DISTTAG, "%{disttag}" },
{ -1, NULL }
};
--- macros.in
+++ macros.in 2009/02/09 13:03:08
@@ -259,6 +259,16 @@
#
#%disturl
+# Configurable distribution tag, same as Disttag: tag in a specfile.
+# The tag will be used to supply reliable information to tools like
+# rpmfind.
+#
+# Note: You should not configure with disturl (or build packages with
+# the Disttag: tag) unless you are willing to supply content in a
+# yet-to-be-determined format at the tag specified.
+#
+#%disttag
+
# Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
# marked as %doc should be installed.
#%_excludedocs

2
rpm-python.spec
View File

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

10
rpm.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Feb 9 14:16:52 CET 2009 - ro@suse.de
- define disttag as optional tag with macro just like disturl
-------------------------------------------------------------------
Thu Jan 29 10:34:22 CET 2009 - olh@suse.de
- obsolete old -XXbit packages (bnc#437293)
-------------------------------------------------------------------
Tue Jan 27 21:19:51 CET 2009 - agruen@suse.de

23
rpm.spec
View File

@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.4.2.3
Release: 25
Release: 27
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@ -98,6 +98,7 @@ Patch64: firmware.diff
Patch65: specfilemacro.diff
Patch66: rpm-filelist-bufferoverflow.diff
Patch67: modalias-encode.diff
Patch68: disttag-macro.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@ -181,7 +182,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
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68
chmod 755 scripts/find-supplements{,.ksyms}
chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
chmod 755 scripts/firmware.prov
@ -331,7 +332,12 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
Release: 473
Release: 475
# bug437293
%ifarch ppc64
Obsoletes: popt-64bit
%endif
#
#
%description -n popt
@ -354,9 +360,14 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
Release: 473
Release: 475
Requires: popt = 1.7
Requires: glibc-devel
# bug437293
%ifarch ppc64
Obsoletes: popt-devel-64bit
%endif
#
%description -n popt-devel
Popt is a C library for parsing command line parameters. Popt was
@ -389,6 +400,10 @@ Authors:
%doc %{_mandir}/man3/popt.3*
%changelog
* Mon Feb 09 2009 ro@suse.de
- define disttag as optional tag with macro just like disturl
* Thu Jan 29 2009 olh@suse.de
- obsolete old -XXbit packages (bnc#437293)
* Tue Jan 27 2009 agruen@suse.de
- find-supplements.ksyms: Fix "Supplements: packageand(
kernel-$flavor:$package)" dependency (bnc#429254).