From a788ce60044316b05ca5b51c78ee52b851bdc5428efcb2739554847ea8aaacac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 11 Dec 2011 21:57:42 +0000 Subject: [PATCH] Accepting request 96285 from home:coolo:branches:openSUSE:Factory - let rpm call everything below /usr/lib/rpm/brp-suse.d and do no longer define a hard coded list of brp scripts OBS-URL: https://build.opensuse.org/request/show/96285 OBS-URL: https://build.opensuse.org/package/show/Base:System/brp-check-suse?expand=0&rev=30 --- brp-check-suse-1.0.tar.bz2 | 4 ++-- brp-check-suse.changes | 6 ++++++ brp-check-suse.spec | 26 ++++++++++++-------------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/brp-check-suse-1.0.tar.bz2 b/brp-check-suse-1.0.tar.bz2 index 1250477..6c6866c 100644 --- a/brp-check-suse-1.0.tar.bz2 +++ b/brp-check-suse-1.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21c282d25a06765929a76642cbf03a66569ac1c829f3297caebae795df7c42fb -size 60416 +oid sha256:06647a77ac03df8df021f73de95cc6470faf1bf03ab6063b1a843d1135295d93 +size 62374 diff --git a/brp-check-suse.changes b/brp-check-suse.changes index 666332f..adc8c89 100644 --- a/brp-check-suse.changes +++ b/brp-check-suse.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 9 14:18:30 UTC 2011 - coolo@suse.com + +- let rpm call everything below /usr/lib/rpm/brp-suse.d and do no + longer define a hard coded list of brp scripts + ------------------------------------------------------------------- Sat Sep 17 20:51:34 UTC 2011 - jengelh@medozas.de diff --git a/brp-check-suse.spec b/brp-check-suse.spec index edfaeb2..1b5648f 100644 --- a/brp-check-suse.spec +++ b/brp-check-suse.spec @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: brp-check-suse -License: GPLv2+ -Group: Development/Tools/Building AutoReqProv: off -Summary: build root policy check scripts +Summary: Build root policy check scripts +License: GPL-2.0+ +Group: Development/Tools/Building Version: 1.0 -Release: 44 +Release: 0 Url: http://gitorious.org/opensuse/brp-check-suse/ # # Note: don't rebuild this manually. Instead submit your patches @@ -34,32 +32,32 @@ Url: http://gitorious.org/opensuse/brp-check-suse/ # make package # Source0: %{name}-%{version}.tar.bz2 -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides" %global __find_provides %provfind %description -build root policy check scripts - +This package contains all suse scripts called in the +build root checking or in parts implemeting SUSE policies. %prep %setup -q +%ifnarch x86_64 s390x ppc64 +rm brp-65-lib64-linux +%endif %build # nothing to do %install -install -d $RPM_BUILD_ROOT/usr/lib/rpm -install -d $RPM_BUILD_ROOT/etc/rpm -cp -a brp-* $RPM_BUILD_ROOT/usr/lib/rpm -cp -a macros.* $RPM_BUILD_ROOT/etc/rpm +install -d $RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d +mv brp*data $RPM_BUILD_ROOT/usr/lib/rpm/ +cp -a brp-* $RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d %files %defattr(-, root, root) %doc COPYING -/etc/rpm/* /usr/lib/rpm/* %changelog