From 58359a2d97ce4c84752edade2a029c2922dd53a5f94e9dca328b143002d910e2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Dec 2011 16:02:05 +0000 Subject: [PATCH 1/5] - 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 | 1 + rpm-suse_macros | 42 +++++------------------------------------- rpm.changes | 7 +++++++ rpm.spec | 1 + 4 files changed, 14 insertions(+), 37 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index 961cad7..26cee30 100644 --- a/rpm-python.spec +++ b/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 diff --git a/rpm-suse_macros b/rpm-suse_macros index 6db533a..7d7b9ae 100644 --- a/rpm-suse_macros +++ b/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 \ - [ -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 ; \ diff --git a/rpm.changes b/rpm.changes index 11e5893..c9a372d 100644 --- a/rpm.changes +++ b/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 diff --git a/rpm.spec b/rpm.spec index 0d70bf3..70956c9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rpm BuildRequires: file-devel BuildRequires: libacl-devel From 578995eb8c5dabee5b6620769bb3bcc5246ac4fc65a4ea81dc1491700d857925 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 21 Dec 2011 13:58:52 +0000 Subject: [PATCH 2/5] Updating link to change in openSUSE:Factory/rpm revision 169.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=4dbcd8173fc74dccd09334946415f8ff --- rpm-python.spec | 1 - rpm.spec | 1 - 2 files changed, 2 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index 26cee30..961cad7 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rpm-python BuildRequires: file-devel BuildRequires: libacl-devel diff --git a/rpm.spec b/rpm.spec index 70956c9..0d70bf3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rpm BuildRequires: file-devel BuildRequires: libacl-devel From 836ddb15e039a13658e657905e28c4f7d4978af19f136f5892d1eea2e7d3d42b Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Wed, 21 Dec 2011 13:58:56 +0000 Subject: [PATCH 3/5] generated via source service OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=167 --- rpm-python.spec | 1 + rpm.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/rpm-python.spec b/rpm-python.spec index 961cad7..26cee30 100644 --- a/rpm-python.spec +++ b/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 diff --git a/rpm.spec b/rpm.spec index 0d70bf3..70956c9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rpm BuildRequires: file-devel BuildRequires: libacl-devel From 602bc6f0883616401ea9f47d21174d1f0a7f63bb19b503d02d098070b61bdfca Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 7 Jan 2012 09:50:46 +0000 Subject: [PATCH 4/5] - go back to lua 5.1 for now (no easy port to 5.2 possible) OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=169 --- rpm-python.spec | 3 +-- rpm.changes | 5 +++++ rpm.spec | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index 26cee30..a27b01e 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rpm-python BuildRequires: file-devel BuildRequires: libacl-devel diff --git a/rpm.changes b/rpm.changes index c9a372d..9929626 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 7 10:50:31 CET 2012 - dmueller@suse.de + +- go back to lua 5.1 for now (no easy port to 5.2 possible) + ------------------------------------------------------------------- Mon Dec 19 16:01:17 UTC 2011 - coolo@suse.de diff --git a/rpm.spec b/rpm.spec index 70956c9..cde3558 100644 --- a/rpm.spec +++ b/rpm.spec @@ -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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rpm BuildRequires: file-devel BuildRequires: libacl-devel @@ -25,7 +24,7 @@ BuildRequires: libelf-devel BuildRequires: libselinux-devel BuildRequires: libsemanage-devel BuildRequires: libtool -BuildRequires: lua-devel +BuildRequires: lua51-devel BuildRequires: ncurses-devel BuildRequires: popt-devel BuildRequires: xz-devel @@ -146,6 +145,7 @@ Authors: %package devel Summary: Include Files and Libraries mandatory for Development +Group: System/Packages Requires: rpm = %{version} Requires: popt-devel From 38bb0c17c9632f28d14594caea24ce821e510ac98457ce7046c3554f746819b9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 8 Jan 2012 17:58:16 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=170 --- rpm-python.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm-python.spec b/rpm-python.spec index a27b01e..4178715 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -24,7 +24,7 @@ BuildRequires: libelf-devel BuildRequires: libselinux-devel BuildRequires: libsemanage-devel BuildRequires: libtool -BuildRequires: lua-devel +BuildRequires: lua51-devel BuildRequires: ncurses-devel BuildRequires: popt-devel BuildRequires: python-devel