From eba229be0e8da03bdd3113201449951354ed14290328d780932884c51e1c9070 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 10 May 2012 10:52:07 +0000 Subject: [PATCH] - remove duplicated rb_ macros - they are in ruby OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=201 --- rpm-suse_macros | 2 -- rpm.changes | 5 +++++ rpm.spec | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index 7d7b9ae..59ae5f6 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -11,8 +11,6 @@ # package build macros %make_install make install DESTDIR=%{?buildroot} %makeinstall make DESTDIR=%{?buildroot:%{buildroot}} install -%rb_arch %(echo %{_host_cpu}-linux | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/") -%rb_ver %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/, "")') %insserv_prereq insserv sed %fillup_prereq fillup coreutils grep diffutils %suseconfig_fonts_prereq perl aaa_base diff --git a/rpm.changes b/rpm.changes index 8f1059e..be4dc39 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 10 10:51:41 UTC 2012 - coolo@suse.com + +- remove duplicated rb_ macros - they are in ruby + ------------------------------------------------------------------- Fri Apr 20 14:40:50 CEST 2012 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index b97f8ed..8e08ae5 100644 --- a/rpm.spec +++ b/rpm.spec @@ -160,6 +160,7 @@ all installed packages. RPM also supports database queries. %package devel Summary: Include Files and Libraries mandatory for Development +Group: System/Packages Requires: rpm = %{version} # for people confusing the one with the other Recommends: rpm-build = %{version} @@ -174,6 +175,7 @@ need an intimate knowledge of RPM packages in order to function. %package build Summary: Tools and Scripts to create rpm packages +Group: System/Packages Requires: rpm = %{version} Provides: rpm:%_bindir/rpmbuild Provides: rpmbuild