From 957bf872a28012491be7e1a913c6b597fa3793835a88e45c45f9c17191b581ce Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Wed, 11 Nov 2015 14:07:44 +0000
Subject: [PATCH] Accepting request 343855 from home:pgajdos

- require apache-rpm-macros-control [bsc#893659]

- do not append macros.apache-module-test to macros.apache, provide
  separate macros file instead

OBS-URL: https://build.opensuse.org/request/show/343855
OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=23
---
 apache-rpm-macros.changes | 11 +++++++++++
 apache-rpm-macros.spec    |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/apache-rpm-macros.changes b/apache-rpm-macros.changes
index ccacc82..aff07d8 100644
--- a/apache-rpm-macros.changes
+++ b/apache-rpm-macros.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Nov 10 15:34:04 UTC 2015 - pgajdos@suse.com
+
+- require apache-rpm-macros-control [bsc#893659]
+
+-------------------------------------------------------------------
+Thu Nov  5 11:54:12 UTC 2015 - pgajdos@suse.com
+
+- do not append macros.apache-module-test to macros.apache, provide
+  separate macros file instead
+
 -------------------------------------------------------------------
 Wed Sep 30 17:14:29 UTC 2015 - pgajdos@suse.com
 
diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec
index 27e4f55..8da67a4 100644
--- a/apache-rpm-macros.spec
+++ b/apache-rpm-macros.spec
@@ -69,6 +69,7 @@ BuildRequires:  apache%{ap_major}-devel
 %else
 BuildRequires:  httpd-devel
 %endif
+Requires:       apache-rpm-macros-control
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -96,15 +97,15 @@ cat << eom > %{macros_file}
 %%apache_access_syntax_version   %{ap_access_syntax_version}
 eom
 echo >> %{macros_file}
-cat %{SOURCE1} >> %{macros_file}
 
 %install
 mkdir -p %{buildroot}%{macros_dir}
 install -m 644 %{macros_file} %{buildroot}%{macros_dir}
+install -m 644 %{SOURCE1}     %{buildroot}%{macros_dir}
 
 %files
 %defattr(-,root,root)
 %dir %{macros_dir}
-%{macros_dir}/%{macros_file}
+%{macros_dir}/macros.apache*
 
 %changelog