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

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

Browse Source 
THANKS!!!

OBS-URL: https://build.opensuse.org/request/show/55210
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=78
This commit is contained in:
Stephan Kulow 2010-12-08 14:18:22 +00:00 committed by Git OBS Bridge
parent 2143da3046
commit ad94ee7229
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
initscriptsprov.diff
View File

@ -1,25 +1,25 @@
Index: rpm-4.8.0/autodeps/linux.prov 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.orig/autodeps/linux.prov 2010-12-08 15:16:12.984842683 +0100
+++ rpm-4.8.0/autodeps/linux.prov 2010-12-07 18:08:04.078718111 +0100 +++ rpm-4.8.0/autodeps/linux.prov 2010-12-08 15:16:52.530842661 +0100
@@ -107,4 +107,9 @@ fi @@ -107,4 +107,9 @@ fi
[ -x /usr/lib/rpm/gstreamer-provides ] && [ -x /usr/lib/rpm/gstreamer-provides ] &&
printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/gstreamer-provides | sort -u printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/gstreamer-provides | sort -u
+# +#
+# --- Provides of sysvinit scripts +# --- Provides of sysvinit scripts
+[ -x /usr/lib/rpm/find-provides.sysv ] && +[ -x /usr/lib/rpm/sysvinitdeps.sh ] &&
+ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/find-provides.sysv | sort -u + printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/sysvinitdeps.sh -P | sort -u
+ +
exit 0 exit 0
Index: rpm-4.8.0/scripts/find-provides.sysv Index: rpm-4.8.0/scripts/sysvinitdeps.sh
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /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 +++ rpm-4.8.0/scripts/sysvinitdeps.sh 2010-12-08 15:17:11.183843303 +0100
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#!/bin/sh +#!/bin/sh
+ +
+#IFS=$'\n' +# -P blindly assumed
+while read file; do +while read file; do
+ case $file in + case $file in
+ */etc/init.d/*) + */etc/init.d/*)
@ -32,13 +32,13 @@ Index: rpm-4.8.0/scripts/find-provides.sysv
+done +done
Index: rpm-4.8.0/scripts/Makefile.am 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.orig/scripts/Makefile.am 2010-12-08 15:16:12.985844013 +0100
+++ rpm-4.8.0/scripts/Makefile.am 2010-12-07 15:29:01.862718365 +0100 +++ rpm-4.8.0/scripts/Makefile.am 2010-12-08 15:16:52.531842720 +0100
@@ -40,6 +40,7 @@ rpmconfig_SCRIPTS = \ @@ -40,6 +40,7 @@ rpmconfig_SCRIPTS = \
pkgconfigdeps.sh libtooldeps.sh \ pkgconfigdeps.sh libtooldeps.sh \
ocaml-find-requires.sh ocaml-find-provides.sh \ ocaml-find-requires.sh ocaml-find-provides.sh \
fontconfig.prov desktop-file.prov \ fontconfig.prov desktop-file.prov \
+ find-provides.sysv \ + sysvinitdeps.sh \
rpmdb_loadcvt rpmdiff rpm2cpio.sh tcl.req tgpg rpmdb_loadcvt rpmdiff rpm2cpio.sh tcl.req tgpg
rpmconfig_DATA = \ rpmconfig_DATA = \