From 827aa5b39175733a98242760823369c7f1afed2a987fdf6edfd2e3fa398bfb7a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 28 Jan 2012 14:20:26 +0000 Subject: [PATCH 1/3] - make the buildrequires more inclusive, rpm is special OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=187 --- python3-rpm.spec | 2 -- rpm-python.spec | 2 -- rpm.changes | 5 +++++ rpm.spec | 13 +++++++++++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/python3-rpm.spec b/python3-rpm.spec index 6bd2afc..25367fd 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: python3-rpm Version: 4.9.1.2 Release: 0 diff --git a/rpm-python.spec b/rpm-python.spec index fe0857e..51eb559 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: rpm-python Version: 4.9.1.2 Release: 0 diff --git a/rpm.changes b/rpm.changes index 006a21f..c35c913 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 28 14:18:25 UTC 2012 - coolo@suse.com + +- make the buildrequires more inclusive, rpm is special + ------------------------------------------------------------------- Fri Jan 20 11:43:05 UTC 2012 - mvyskocil@suse.cz diff --git a/rpm.spec b/rpm.spec index 9e70c08..2bb5736 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,10 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: rpm +BuildRequires: binutils +BuildRequires: bzip2 BuildRequires: file-devel +BuildRequires: findutils +BuildRequires: gcc +BuildRequires: gettext-tools +BuildRequires: glibc-devel +BuildRequires: glibc-devel +BuildRequires: gzip BuildRequires: libacl-devel BuildRequires: libbz2-devel BuildRequires: libcap-devel @@ -27,7 +33,10 @@ BuildRequires: libselinux-devel BuildRequires: libsemanage-devel BuildRequires: libtool BuildRequires: lua51-devel +BuildRequires: make BuildRequires: ncurses-devel +BuildRequires: patch +BuildRequires: perl-base BuildRequires: popt-devel BuildRequires: xz-devel BuildRequires: zlib-devel From d55a07dc5ac751468e7cf312f3d3b658b18bb312ae90062eed411709214a1429 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 28 Jan 2012 14:20:55 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=188 --- python3-rpm.spec | 1 + rpm-python.spec | 1 + rpm.spec | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/python3-rpm.spec b/python3-rpm.spec index 25367fd..5b826aa 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python3-rpm Version: 4.9.1.2 Release: 0 diff --git a/rpm-python.spec b/rpm-python.spec index 51eb559..5af67c9 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 Version: 4.9.1.2 Release: 0 diff --git a/rpm.spec b/rpm.spec index 2bb5736..94485bc 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rpm BuildRequires: binutils BuildRequires: bzip2 @@ -23,7 +24,6 @@ BuildRequires: findutils BuildRequires: gcc BuildRequires: gettext-tools BuildRequires: glibc-devel -BuildRequires: glibc-devel BuildRequires: gzip BuildRequires: libacl-devel BuildRequires: libbz2-devel From cf5e044e00ba6a63af2d6f142b264c6aa3f5110dbb6ddd96028d24dc95be9781 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 1 Feb 2012 13:47:14 +0000 Subject: [PATCH 3/3] Accepting request 102231 from home:lnussel:branches:Base:System - avoid error message if /usr/lib/rpm/brp-suse.d is empty bash automatically sorts patterns alphabetically OBS-URL: https://build.opensuse.org/request/show/102231 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=189 --- brp.diff | 2 +- python3-rpm.spec | 1 + rpm-python.spec | 1 + rpm.changes | 5 +++++ rpm.spec | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/brp.diff b/brp.diff index bca3cad..8f6f59e 100644 --- a/brp.diff +++ b/brp.diff @@ -29,7 +29,7 @@ + exit 0 +fi + -+ls -1 /usr/lib/rpm/brp-suse.d/brp* | sort | while read script; do ++for script in /usr/lib/rpm/brp-suse.d/brp*; do + if test -x "$script"; then + echo "calling $script" + $script || exit 1 diff --git a/python3-rpm.spec b/python3-rpm.spec index 5b826aa..6bd2afc 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -16,6 +16,7 @@ # + Name: python3-rpm Version: 4.9.1.2 Release: 0 diff --git a/rpm-python.spec b/rpm-python.spec index 5af67c9..fe0857e 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -16,6 +16,7 @@ # + Name: rpm-python Version: 4.9.1.2 Release: 0 diff --git a/rpm.changes b/rpm.changes index c35c913..51de8e6 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 31 11:06:52 UTC 2012 - lnussel@suse.de + +- avoid error message if /usr/lib/rpm/brp-suse.d is empty + ------------------------------------------------------------------- Sat Jan 28 14:18:25 UTC 2012 - coolo@suse.com diff --git a/rpm.spec b/rpm.spec index 94485bc..04d3e74 100644 --- a/rpm.spec +++ b/rpm.spec @@ -16,6 +16,7 @@ # + Name: rpm BuildRequires: binutils BuildRequires: bzip2