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

firmware.diff

@@ -0,0 +1,37 @@
+Index: autodeps/linux.prov
+===================================================================
+--- autodeps/linux.prov.orig
++++ autodeps/linux.prov
+@@ -12,6 +12,7 @@ pythonlist=
+ tcllist=
+ monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
+ mimetypelist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(desktop)\$"))
++firmwarelist=($(printf "%s\n" "${filelist[@]}" | grep "/lib/firmware/"))
+ 
+ #
+ # --- Alpha does not mark 64bit dependencies
+@@ -65,6 +66,11 @@ done | sort -u
+     printf "%s\n" "${mimetypelist[@]}" | /usr/lib/rpm/mimetypes.prov | sort -u
+ 
+ #
++# --- firmware files
++[ -x /usr/lib/rpm/firmware.prov -a -n "$firmwarelist" ] &&
++     printf "%s\n" "${firmwarelist[@]}" | /usr/lib/rpm/firmware.prov | sort -u
++
++#
+ # --- Mono exes/dlls
+ : ${MONO_PREFIX=/usr}
+ if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then
+Index: scripts/firmware.prov
+===================================================================
+--- /dev/null
++++ scripts/firmware.prov
+@@ -0,0 +1,8 @@
++#!/bin/sh
++# Add firmware files in /lib/firmware into RPM provides
++
++while read instfile ; do
++  case $instfile in
++    */lib/firmware/*) test -f "$instfile" && echo "firmware(${instfile##*/lib/firmware/})" ;;
++  esac
++done

rpm-python.spec

@@ -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:        15
+Release:        16
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec

rpm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 21 16:30:19 CET 2008 - mls@suse.de
+
+- add firmware.prov provides helper
+
 -------------------------------------------------------------------
 Fri Nov 21 14:38:57 CET 2008 - mmarek@suse.cz
 

rpm.spec

@@ -27,7 +27,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2.3
-Release:        15
+Release:        16
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -94,6 +94,7 @@ Patch60:        mimetype.diff
 Patch61:        debugedit-canon-fix.diff
 Patch62:        fingerprint.diff
 Patch63:        finddebuginfo-absolute-links.diff
+Patch64:        firmware.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -177,9 +178,10 @@ 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
+%patch -P 60 -P 61 -P 62 -P 63 -P 64
 chmod 755 scripts/find-supplements{,.ksyms}
 chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
+chmod 755 scripts/firmware.prov
 tar -xjvf %{SOURCE1}
 tar -xjvf %{SOURCE2}
 if [ -s /etc/rpm/suse_macros ]; then
@@ -241,6 +243,7 @@ find $RPM_BUILD_ROOT/usr/src/packages/* -type d | sed -e "s@$RPM_BUILD_ROOT@@" >
 install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm
 install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/lib/rpm
 install -m 755 scripts/find-supplements{,.ksyms} $RPM_BUILD_ROOT/usr/lib/rpm
+install -m 755 scripts/firmware.prov $RPM_BUILD_ROOT/usr/lib/rpm
 rm -f $RPM_BUILD_ROOT/usr/lib/locale $RPM_BUILD_ROOT/usr/lib/rpmrc
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
 chmod 755 $RPM_BUILD_ROOT/etc/rpm
@@ -325,7 +328,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        463
+Release:        464
 #
 
 %description -n popt
@@ -348,7 +351,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        463
+Release:        464
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -383,6 +386,8 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Fri Nov 21 2008 mls@suse.de
+- add firmware.prov provides helper
 * Fri Nov 21 2008 mmarek@suse.cz
 - fixed sed expression in find-provides.ksyms
 * Tue Nov 18 2008 jblunck@suse.de