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=71

Browse Source
This commit is contained in:
OBS User unknown 2009-01-29 21:24:24 +00:00 committed by Git OBS Bridge
parent 55eea812d8
commit 6607c124ea
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modalias-kernel_module.diff
View File

@ -1,4 +1,6 @@
--- scripts/find-supplements.ksyms Index: scripts/find-supplements.ksyms
===================================================================
--- scripts/find-supplements.ksyms.orig
+++ scripts/find-supplements.ksyms +++ scripts/find-supplements.ksyms
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
#! /bin/sh #! /bin/sh
@ -9,7 +11,8 @@
case "$1" in case "$1" in
kernel-module-*) ;; # Fedora kernel module package names start with kernel-module-*) ;; # Fedora kernel module package names start with
@@ -47,10 +49,53 @@ @@ -46,11 +48,54 @@ combine_modaliases() {
print_modaliases "$class" "$variants" "$pos"
} }
-for module in $(grep -E '/lib/modules/.+\.ko$'); do -for module in $(grep -E '/lib/modules/.+\.ko$'); do
@ -33,7 +36,7 @@
+ | sed -nre "s,(.+:.+),modalias(kernel-${krel##*-}:\\1),p" | tee -a $modlist + | sed -nre "s,(.+:.+),modalias(kernel-${krel##*-}:\\1),p" | tee -a $modlist
+ done + done
+ if ! test -s "$modlist" && test $have_module = 0; then + if ! test -s "$modlist" && test $have_module = 0; then
+ echo "packageand(kernel-${krel##*-}:$PACKAGE-kmp)" + echo "packageand(kernel-${krel##*-}:$PACKAGE)"
+ fi + fi
+ rm -f $modlist + rm -f $modlist
+} +}

2
rpm-python.spec
View File

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

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 27 21:19:51 CET 2009 - agruen@suse.de
- find-supplements.ksyms: Fix "Supplements: packageand(
kernel-$flavor:$package)" dependency (bnc#429254).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 5 15:37:07 CET 2009 - mmarek@suse.cz Mon Jan 5 15:37:07 CET 2009 - mmarek@suse.cz

9
rpm.spec
View File

@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on AutoReqProv: on
Summary: The RPM Package Manager Summary: The RPM Package Manager
Version: 4.4.2.3 Version: 4.4.2.3
Release: 23 Release: 25
Source: rpm-%{version}.tar.bz2 Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2 Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2 Source2: RPM-Tips.html.tar.bz2
@ -331,7 +331,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 471 Release: 473
# #
%description -n popt %description -n popt
@ -354,7 +354,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 471 Release: 473
Requires: popt = 1.7 Requires: popt = 1.7
Requires: glibc-devel Requires: glibc-devel
@ -389,6 +389,9 @@ Authors:
%doc %{_mandir}/man3/popt.3* %doc %{_mandir}/man3/popt.3*
%changelog %changelog
* Tue Jan 27 2009 agruen@suse.de
- find-supplements.ksyms: Fix "Supplements: packageand(
kernel-$flavor:$package)" dependency (bnc#429254).
* Mon Jan 05 2009 mmarek@suse.cz * Mon Jan 05 2009 mmarek@suse.cz
- findksyms.diff: make sure that the input files for join are - findksyms.diff: make sure that the input files for join are
sorted properly (bnc#450714) sorted properly (bnc#450714)