pool/apache-rpm-macros
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 259105 from home:pgajdos:apache2

Browse Source 
- fix %{apache_branch} macro

OBS-URL: https://build.opensuse.org/request/show/259105
OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=2
This commit is contained in:
Tomáš Chvátal 2014-10-31 09:10:22 +00:00 committed by Git OBS Bridge
parent f1411e98c3
commit 1ec1632ec4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache-rpm-macros.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 31 08:56:11 UTC 2014 - pgajdos@suse.com
- fix %{apache_branch} macro
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 17 12:11:26 UTC 2014 - pgajdos@suse.com Fri Oct 17 12:11:26 UTC 2014 - pgajdos@suse.com

3
apache-rpm-macros.spec
View File

@ -17,7 +17,7 @@
%define ap_major 2 %define ap_major 2
%define ap_branch %(rpm -q --qf %%{version} apache%{ap_major} | sed 's:\(\..*\)\..*:\1:') %define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | sed "s:\\(\\..*\\)\\..*:\\1:")
%define ap_pname apache%{ap_major} %define ap_pname apache%{ap_major}
%define ap_apxs %{_sbindir}/apxs%{ap_major} %define ap_apxs %{_sbindir}/apxs%{ap_major}
%define ap_cflags %(%{ap_apxs} -q CFLAGS) %define ap_cflags %(%{ap_apxs} -q CFLAGS)
@ -46,7 +46,6 @@ RPM Macros intended for Apache modules spec files.
%prep %prep
%build %build
echo "%{ap_branch}"
cat << eom > %{macros_file} cat << eom > %{macros_file}
%%apache_major %{ap_major} %%apache_major %{ap_major}
%%apache_branch %{ap_branch} %%apache_branch %{ap_branch}