pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 120583 from Base:System

Browse Source 
- remove duplicated rb_ macros - they are in ruby

OBS-URL: https://build.opensuse.org/request/show/120583
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=177
This commit is contained in:
Stephan Kulow 2012-05-10 13:13:16 +00:00 committed by Git OBS Bridge
commit 079744fa68
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm-suse_macros
View File

@ -11,8 +11,6 @@
# package build macros # package build macros
%make_install make install DESTDIR=%{?buildroot} %make_install make install DESTDIR=%{?buildroot}
%makeinstall make DESTDIR=%{?buildroot:%{buildroot}} install %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 %insserv_prereq insserv sed
%fillup_prereq fillup coreutils grep diffutils %fillup_prereq fillup coreutils grep diffutils
%suseconfig_fonts_prereq perl aaa_base %suseconfig_fonts_prereq perl aaa_base

5
rpm.changes
View File

@ -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 Fri Apr 20 14:40:50 CEST 2012 - mls@suse.de

2
rpm.spec
View File

@ -160,6 +160,7 @@ all installed packages. RPM also supports database queries.
%package devel %package devel
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
Group: System/Packages
Requires: rpm = %{version} Requires: rpm = %{version}
# for people confusing the one with the other # for people confusing the one with the other
Recommends: rpm-build = %{version} Recommends: rpm-build = %{version}
@ -174,6 +175,7 @@ need an intimate knowledge of RPM packages in order to function.
%package build %package build
Summary: Tools and Scripts to create rpm packages Summary: Tools and Scripts to create rpm packages
Group: System/Packages
Requires: rpm = %{version} Requires: rpm = %{version}
Provides: rpm:%_bindir/rpmbuild Provides: rpm:%_bindir/rpmbuild
Provides: rpmbuild Provides: rpmbuild