From ad94ee7229e8d35d3915f33bfa35262591e68a9eaff5002128b23a89b423759f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 8 Dec 2010 14:18:22 +0000 Subject: [PATCH] Accepting request 55210 from home:coolo:branches:openSUSE:Factory 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 --- initscriptsprov.diff | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/initscriptsprov.diff b/initscriptsprov.diff index abcb602..4a95d90 100644 --- a/initscriptsprov.diff +++ b/initscriptsprov.diff @@ -1,25 +1,25 @@ 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 +--- 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-08 15:16:52.530842661 +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 ++[ -x /usr/lib/rpm/sysvinitdeps.sh ] && ++ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/sysvinitdeps.sh -P | sort -u + 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 -+++ 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 @@ +#!/bin/sh + -+#IFS=$'\n' ++# -P blindly assumed +while read file; do + case $file in + */etc/init.d/*) @@ -32,13 +32,13 @@ Index: rpm-4.8.0/scripts/find-provides.sysv +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 +--- 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-08 15:16:52.531842720 +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 \ ++ sysvinitdeps.sh \ rpmdb_loadcvt rpmdiff rpm2cpio.sh tcl.req tgpg rpmconfig_DATA = \