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

Accepting request 55074 from home:coolo:branches:openSUSE:Factory

Browse Source 
looks good

OBS-URL: https://build.opensuse.org/request/show/55074
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=77
This commit is contained in:
Marcus Meissner 2010-12-08 13:40:05 +00:00 committed by Git OBS Bridge
parent 0b2ed809ac
commit 2143da3046
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
initscriptsprov.diff Normal file
View File

@ -0,0 +1,44 @@
Index: rpm-4.8.0/autodeps/linux.prov
===================================================================
--- rpm-4.8.0.orig/autodeps/linux.prov 2010-12-07 15:25:03.000000000 +0100
+++ rpm-4.8.0/autodeps/linux.prov 2010-12-07 18:08:04.078718111 +0100
@@ -107,4 +107,9 @@ fi
[ -x /usr/lib/rpm/gstreamer-provides ] &&
printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/gstreamer-provides | sort -u
+#
+# --- Provides of sysvinit scripts
+[ -x /usr/lib/rpm/find-provides.sysv ] &&
+ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/find-provides.sysv | sort -u
+
exit 0
Index: rpm-4.8.0/scripts/find-provides.sysv
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ rpm-4.8.0/scripts/find-provides.sysv 2010-12-07 18:07:43.332842047 +0100
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+#IFS=$'\n'
+while read file; do
+ case $file in
+ */etc/init.d/*)
+ provs=`grep '^# *Provides:' $file | sed 's,^.*:,,'`
+ for p in $provs; do
+ echo "sysvinit($p)"
+ done
+ ;;
+ esac
+done
Index: rpm-4.8.0/scripts/Makefile.am
===================================================================
--- rpm-4.8.0.orig/scripts/Makefile.am 2010-12-07 15:25:02.000000000 +0100
+++ rpm-4.8.0/scripts/Makefile.am 2010-12-07 15:29:01.862718365 +0100
@@ -40,6 +40,7 @@ rpmconfig_SCRIPTS = \
pkgconfigdeps.sh libtooldeps.sh \
ocaml-find-requires.sh ocaml-find-provides.sh \
fontconfig.prov desktop-file.prov \
+ find-provides.sysv \
rpmdb_loadcvt rpmdiff rpm2cpio.sh tcl.req tgpg
rpmconfig_DATA = \

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 7 14:33:33 UTC 2010 - coolo@novell.com
- add script to provide sysvinit(<PROV>) from /etc/init.d/*
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 19 16:09:20 UTC 2010 - chris@computersalat.de Fri Nov 19 16:09:20 UTC 2010 - chris@computersalat.de

2
rpm.spec
View File

@ -118,6 +118,7 @@ Patch80: fixsbits.diff
Patch81: pkgconfig-0.24.diff Patch81: pkgconfig-0.24.diff
Patch82: rpm-gst-provides.patch Patch82: rpm-gst-provides.patch
Patch83: langnoc.diff Patch83: langnoc.diff
Patch84: initscriptsprov.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
# avoid bootstrapping problem # avoid bootstrapping problem
@ -180,6 +181,7 @@ rm -f rpmdb/db.h
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %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 %patch -P 80 -P 81 -P 82 -P 83
%patch84 -p1
#chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-supplements{,.ksyms}
#chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
#chmod 755 scripts/firmware.prov #chmod 755 scripts/firmware.prov