testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

Accepting request 208781 from home:Andreas_Schwab:Factory

Browse Source 
- Substitute current values of %suse_release, %sles_release, %ul_release
  into suse_macros (bnc#851877)

OBS-URL: https://build.opensuse.org/request/show/208781
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=308
This commit is contained in:
Michael Schröder 2013-11-28 10:41:40 +00:00 committed by Git OBS Bridge
parent 0e4b13cd04
commit f76bde2ada
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpm-suse_macros
View File

@ -259,9 +259,9 @@
%supplements_kernel_module() \
%{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)}
%suse_version 1230
%sles_version 0
%ul_version 0
%suse_version @suse_version@
%sles_version @sles_version@
%ul_version @ul_version@
%do_profiling 1
%cflags_profile_generate -fprofile-generate

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 28 08:08:55 UTC 2013 - schwab@suse.de
- Substitute current values of %suse_release, %sles_release, %ul_release
into suse_macros (bnc#851877)
-------------------------------------------------------------------
Mon Nov 11 10:02:43 UTC 2013 - speilicke@suse.com

8
rpm.spec
View File

@ -250,10 +250,10 @@ cp config.guess config.sub beecrypt/
#chmod 755 scripts/debuginfo.prov
tar -xjvf %{SOURCE1}
tar -xjvf %{SOURCE2}
if [ -s /etc/rpm/suse_macros ]; then
cp -a /etc/rpm/suse_macros %{SOURCE4}
fi
cp -a %{SOURCE4} suse_macros
sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \
-e 's/@sles_version@/%{?sles_version}%{!?sles_version:0}/' \
-e 's/@ul_version@/%{?ul_version}%{!?ul_version:0}/' \
< %{SOURCE4} > suse_macros
rm -f m4/libtool.m4
rm -f m4/lt*.m4