Hello community, here is the log from the commit of package apache-rpm-macros for openSUSE:Factory checked in at 2016-01-23 01:03:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes 2015-12-20 10:51:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 2016-01-23 01:03:20.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 11 15:21:58 UTC 2016 - pgajdos@suse.com + +- version 20160111 + * added %{apache_version} + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.eJoweb/_old 2016-01-23 01:03:21.000000000 +0100 +++ /var/tmp/diff_new_pack.eJoweb/_new 2016-01-23 01:03:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache-rpm-macros # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,10 @@ %define ap_major 2 %if 0%{?suse_version} %define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; }) +%define ap_version %(rpm -q --qf "%%{version}" apache%{ap_major} | tr '.' ' ' | { read maj min patch; printf "%d%02d%02d" $maj $min $patch; }) %else %define ap_branch %(rpm -q --qf "%%{version}" httpd | tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; }) +%define ap_version %(rpm -q --qf "%%{version}" httpd | tr '.' ' ' | { read maj min patch; printf "%d%02d%02d" $maj $min $patch; }) %endif %define ap_pname apache%{ap_major} %define ap_apxs %(ls -1 /usr/{,s}bin/apxs{,2} 2>/dev/null | head -n 1) @@ -57,7 +59,7 @@ %endif %define macros_file macros.apache Name: apache-rpm-macros -Version: 20151211 +Version: 20160111 Release: 0 Summary: Apache RPM Macros License: Apache-2.0 @@ -81,6 +83,7 @@ cat << eom > %{macros_file} %%apache_major %{ap_major} %%apache_branch %{ap_branch} +%%apache_version %{ap_version} %%apache_pname %{ap_pname} %%apache_apxs %{ap_apxs} %%apache_cflags %{ap_cflags}