- define %suse_update_config as obsolete and make it a wrapper

around autoreconf --force --install
- show diff in %suse_update_libdir

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

rpm-python.spec

@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           rpm-python
 BuildRequires:  file-devel
 BuildRequires:  libacl-devel

rpm-suse_macros

@@ -115,44 +115,11 @@
    %nil
 
 # %{suse_update_config [-fcl] [dirs...]}
-#   -f: force, ignore timestamp
-#   -c: no config.guess,config.sub
-#   -l: no ltconfig,ltmain.sh
 %suse_update_config(fcl) \
-    AUTOMAKE_DIR=/usr/share/automake \
+    echo 'WARNING: REMOVE %%suse_update_config. If your sources are really' \
-    [ -d $AUTOMAKE_DIR ] || AUTOMAKE_DIR=/usr/share/automake* \
+    echo 'too old to cover current architectures, prefer autoreconf --force --install' \
-    %{!-c:\
+    autoreconf --force --install \
-      [ -d $AUTOMAKE_DIR ] || { \
+    %nil
-        echo 'Please, install automake.' \
-        exit 1 \
-      } \
-    } \
-    for d in . %{?*}; do \
-      %{!-c:\
-        for f in config.sub config.guess; do \
-          if test -f $d/$f -a ! $d/$f -ef $AUTOMAKE_DIR/$f ; then \
-            %{!-f:[ $d/$f -nt $AUTOMAKE_DIR/$f ] ||} cp -f $AUTOMAKE_DIR/$f $d/$f \
-          fi \
-	  if test -d $d -a ! -f $d/depcomp -a -f $AUTOMAKE_DIR/depcomp ; then \
-	    cp -f $AUTOMAKE_DIR/depcomp $d/depcomp \
-	    echo "please add depcomp to sources for new automake!" \
-	  fi \
-	  if test -f $d/missing -a ! $d/missing -ef $AUTOMAKE_DIR/missing ; then \
-	     cp -f $AUTOMAKE_DIR/missing $d/missing \
-	  fi \
-        done \
-      } \
-      %{!-l:\
-        for f in ltconfig ltmain.sh; do \
-          if test -f $d/$f; then \
-	    sed 's/linux-gnu\\([^*][^*]*\\)\\*/linux*\\1*/g; s/linux-gnu/linux/g; s,/lib\\\>,/%_lib,g; s,/%_lib\\([\$-]\\),/lib\\1,g' $d/$f > $d/$f-$$ && \
-	    mv -f $d/$f-$$ $d/$f \
-	    chmod +x $d/$f \
-          fi \
-        done \
-      } \
-    done \
-
 
 %suse_update_libdir() \
    if [ %_lib != lib ]; then \
@@ -162,6 +129,7 @@
         cp $file $file.nolib64 \
         echo "patching $file" \
         sed -e "s,/lib\\\>,/%_lib,g" $file.nolib64 | sed -e "s,/%_lib/cpp,/lib/cpp,; s,/usr/%_lib/perl,/usr/lib/perl, ; s,/%_lib\\([\$-]\\),/lib\\1,g" > $file \
+	diff -u $file.nolib64 $file \
         rm -f $file.nolib64 \
      done; \
    fi ; \

rpm.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 19 16:01:17 UTC 2011 - coolo@suse.de
+
+- define %suse_update_config as obsolete and make it a wrapper
+  around autoreconf --force --install
+- show diff in %suse_update_libdir
+
 -------------------------------------------------------------------
 Thu Dec 15 12:48:24 UTC 2011 - coolo@suse.com
 

rpm.spec

@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           rpm
 BuildRequires:  file-devel
 BuildRequires:  libacl-devel