Accepting request 47475 from home:oertel:branches:openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/47475
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=62

rpm-suse_macros

@@ -208,8 +208,8 @@
 #           and
 #            name of (old) START variable (unless -s is given)
 #
-# template for variables into etc/sysconfig/package:
+# template for variables into /etc/sysconfig/package:
-#     var/adm/fillup-templates/sysconfig.package
+#     /var/adm/fillup-templates/sysconfig.package
 %fillup_and_insserv(finpsyY) \
     %{-p:echo "-p option for fillup_and_insserv no longer supported (ever only used on SL8.0)"; exit 1;} \
     %{-s:echo "STARTVAR for fillup_and_insserv no longer supported (rc.config is gone since SL8.0)"; exit 1;} \
@@ -224,7 +224,7 @@
 	SV_B='^### BEGIN INIT INFO' \
 	SV_E='^### END INIT INFO' \
 	SV_KW=Default-Enabled \
-	SV_VALUE=`sed -n -e "/$SV_B/,/$SV_E/{/^# [^[:space:]]*$SV_KW:[[:space:]]*\\([^[:space:]]*\\).*/s//\\1/p;}" < etc/init.d/$SCRIPTNAME` \
+	SV_VALUE=`sed -n -e "/$SV_B/,/$SV_E/{/^# [^[:space:]]*$SV_KW:[[:space:]]*\\([^[:space:]]*\\).*/s//\\1/p;}" < /etc/init.d/$SCRIPTNAME` \
 	test "$FORCE_YES" = "1" && SV_VALUE="yes" \
 	test -n "$SV_VALUE" || SV_VALUE=%{-y:"yes"}%{!-y:"no"} \
 	INSSRV_ARRAY="$INSSRV_ARRAY $SCRIPTNAME $SV_VALUE" \
@@ -237,7 +237,7 @@
 # this part really calls fillup for the appropriate files
 #
 %do_real_fillup() \
-    TEMPLATE_DIR=var/adm/fillup-templates \
+    TEMPLATE_DIR=/var/adm/fillup-templates \
     SYSC_TEMPLATE=$TEMPLATE_DIR/sysconfig.$PNAME \
     SD_NAME="" \
     %{sysc_fillup}
@@ -251,15 +251,15 @@
 	shift 2 \
 	test -n "$SCRIPTNAME" -a -n "$SV_VALUE" || { echo "SCRIPTNAME or SV_VALUE unknown"; exit 1;} \
 	if test "$FIRST_ARG" = "1" -a "$SV_VALUE" = "no" ; then \
-	    sbin/insserv ${YAST_IS_RUNNING:+-f} -r etc/init.d/$SCRIPTNAME \
+	    /sbin/insserv ${YAST_IS_RUNNING:+-f} -r /etc/init.d/$SCRIPTNAME \
 	elif test "$FIRST_ARG" = "1" -o "$FORCE_YES" = "1" ; then \
-	    sbin/insserv ${YAST_IS_RUNNING:+-f} etc/init.d/$SCRIPTNAME \
+	    /sbin/insserv ${YAST_IS_RUNNING:+-f} /etc/init.d/$SCRIPTNAME \
 	fi \
     done 
 
 # macro: insserv_cleanup
 %insserv_cleanup() \
-    sbin/insserv etc/init.d
+    /sbin/insserv /etc/init.d
 
 # macro: fillup_only
 #    do the fillup for sysconfig files
@@ -277,7 +277,7 @@
 %fillup_only(dans) \
     %{-n:PNAME=%{1}}%{!-n:PNAME=%{name}} \
     %{-s:SUBPNAME=-%{2}}%{!-s:SUBPNAME=%{-a:-%{name}}} \
-    TEMPLATE_DIR=var/adm/fillup-templates \
+    TEMPLATE_DIR=/var/adm/fillup-templates \
     SYSC_TEMPLATE=$TEMPLATE_DIR/sysconfig.$PNAME$SUBPNAME \
     SD_NAME="" \
     %{-d:%{-s:SD_NAME=%{3}/}%{!-s:SD_NAME=%{2}/}} \
@@ -286,16 +286,16 @@
 
 # internal only: sysc_fillup
 %sysc_fillup() \
-    if [ -x bin/fillup ] ; then \
+    if [ -x /bin/fillup ] ; then \
 	if [ -f $SYSC_TEMPLATE ] ; then \
-	    echo "Updating etc/sysconfig/$SD_NAME$PNAME..." \
+	    echo "Updating /etc/sysconfig/$SD_NAME$PNAME..." \
-	    mkdir -p etc/sysconfig/$SD_NAME \
+	    mkdir -p /etc/sysconfig/$SD_NAME \
-	    touch etc/sysconfig/$SD_NAME$PNAME \
+	    touch /etc/sysconfig/$SD_NAME$PNAME \
-	    bin/fillup -q etc/sysconfig/$SD_NAME$PNAME $SYSC_TEMPLATE \
+	    /bin/fillup -q /etc/sysconfig/$SD_NAME$PNAME $SYSC_TEMPLATE \
 	fi \
     else \
 	echo "ERROR: fillup not found. This should not happen. Please compare" \
-	echo "etc/sysconfig/$PNAME and $TEMPLATE_DIR/sysconfig.$PNAME and" \
+	echo "/etc/sysconfig/$PNAME and $TEMPLATE_DIR/sysconfig.$PNAME and" \
 	echo "update by hand." \
     fi
 
@@ -316,16 +316,16 @@
 %remove_and_set(n:y) \
     %{-n:PNAME=%{-n*}}%{!-n:PNAME=%{name}} \
     DEF_VAL=%{-y:"yes"}%{!-y:"no"} \
-    DEL_TEMPL=var/adm/fillup-templates/$PNAME.del \
+    DEL_TEMPL=/var/adm/fillup-templates/$PNAME.del \
     rm -f $DEL_TEMPL \
     for var in %{?*} ; do \
 	echo -e "#\\n$var=$DEF_VAL\\n" >> $DEL_TEMPL \
     done \
-    if [ -f etc/sysconfig/$PNAME ] ; then \
+    if [ -f /etc/sysconfig/$PNAME ] ; then \
-	bin/fillup -q -t -r -i -d "=" etc/sysconfig/$PNAME $DEL_TEMPL etc/sysconfig/$PNAME.deleted.$$ \
+	/bin/fillup -q -t -r -i -d "=" /etc/sysconfig/$PNAME $DEL_TEMPL /etc/sysconfig/$PNAME.deleted.$$ \
-	test -f etc/sysconfig/$PNAME.new && mv etc/sysconfig/$PNAME.new etc/sysconfig/$PNAME \
+	test -f /etc/sysconfig/$PNAME.new && mv /etc/sysconfig/$PNAME.new /etc/sysconfig/$PNAME \
     fi  \
-    for i in $DEL_TEMPL etc/sysconfig/$PNAME.deleted.$$ ; do \
+    for i in $DEL_TEMPL /etc/sysconfig/$PNAME.deleted.$$ ; do \
 	if [ -f $i ] ; then \
 	    . $i \
 	    rm -f $i \
@@ -333,25 +333,25 @@
     done
 
 %insserv_force_if_yast() \
-    sbin/insserv ${YAST_IS_RUNNING:+-f} %{?*}
+    /sbin/insserv ${YAST_IS_RUNNING:+-f} %{?*}
 
 %run_ldconfig /sbin/ldconfig
 
 %install_info(:-:) \
     ALL_ARGS=(%{**}) \
     NUM_ARGS=${#ALL_ARGS[@]} \
-    if test -x sbin/install-info ; then \
+    if test -x /sbin/install-info ; then \
 	if test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
-	    sbin/install-info "${ALL_ARGS[@]}" \
+	    /sbin/install-info "${ALL_ARGS[@]}" \
 	fi \
     fi ; 
 
 %install_info_delete(:-:) \
     ALL_ARGS=(%{**}) \
     NUM_ARGS=${#ALL_ARGS[@]} \
-    if test -x sbin/install-info ; then \
+    if test -x /sbin/install-info ; then \
 	if ! test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
-	    sbin/install-info --quiet --delete "${ALL_ARGS[@]}" \
+	    /sbin/install-info --quiet --delete "${ALL_ARGS[@]}" \
 	fi ; \
     fi ; 
 

rpm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep  8 11:35:46 CEST 2010 - ro@suse.de
+
+- add leading / where appropriate in rpm-suse_macros (bnc#625763)
+
 -------------------------------------------------------------------
 Thu Sep  2 10:26:05 UTC 2010 - dimstar@opensuse.org