Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2012-01-11 15:38:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2011-12-21 14:58:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-01-11 15:38:54.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Jan 7 10:50:31 CET 2012 - [email protected] + +- go back to lua 5.1 for now (no easy port to 5.2 possible) + +------------------------------------------------------------------- +Mon Dec 19 16:01:17 UTC 2011 - [email protected] + +- define %suse_update_config as obsolete and make it a wrapper + around autoreconf --force --install +- show diff in %suse_update_libdir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.P1BOMT/_old 2012-01-11 15:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.P1BOMT/_new 2012-01-11 15:38:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpm-python # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ BuildRequires: libselinux-devel BuildRequires: libsemanage-devel BuildRequires: libtool -BuildRequires: lua-devel +BuildRequires: lua51-devel BuildRequires: ncurses-devel BuildRequires: popt-devel BuildRequires: python-devel ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.P1BOMT/_old 2012-01-11 15:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.P1BOMT/_new 2012-01-11 15:38:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ BuildRequires: libselinux-devel BuildRequires: libsemanage-devel BuildRequires: libtool -BuildRequires: lua-devel +BuildRequires: lua51-devel BuildRequires: ncurses-devel BuildRequires: popt-devel BuildRequires: xz-devel @@ -145,6 +145,7 @@ %package devel Summary: Include Files and Libraries mandatory for Development +Group: System/Packages Requires: rpm = %{version} Requires: popt-devel ++++++ rpm-suse_macros ++++++ --- /var/tmp/diff_new_pack.P1BOMT/_old 2012-01-11 15:38:58.000000000 +0100 +++ /var/tmp/diff_new_pack.P1BOMT/_new 2012-01-11 15:38:58.000000000 +0100 @@ -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 \ - [ -d $AUTOMAKE_DIR ] || AUTOMAKE_DIR=/usr/share/automake* \ - %{!-c:\ - [ -d $AUTOMAKE_DIR ] || { \ - 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 \ - + echo 'WARNING: REMOVE %%suse_update_config. If your sources are really' \ + echo 'too old to cover current architectures, prefer autoreconf --force --install' \ + autoreconf --force --install \ + %nil %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 ; \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
