From b1d2e68b39188abe87e6451cfef8e1f5da597329e2c97eb4ce4d77071e914426 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 27 Nov 2017 09:36:15 +0000
Subject: [PATCH 1/2] Accepting request 544719 from
 home:RBrownSUSE:branches:Apache

Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544719
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=534
---
 apache2.changes |  6 ++++++
 apache2.spec    | 13 +++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apache2.changes b/apache2.changes
index bcc60d4..efbe086 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:43:30 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Nov 20 08:43:45 UTC 2017 - pgajdos@suse.com
 
diff --git a/apache2.spec b/apache2.spec
index d401114..72767ee 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define apache_mmn	%(test -s %{SOURCE0} && { echo -n apache_mmn_; bzcat %{SOURCE0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; })
 %define suse_maintenance_mmn  0
 %define	default_mpm	prefork
@@ -517,7 +522,7 @@ cp -p %{buildroot}/%{sysconfdir}/httpd.conf ./httpd.conf.default
 rm %{buildroot}/%{sysconfdir}/httpd-*.conf
 #
 # create directories
-mkdir -p %{buildroot}/%{_var}/adm/fillup-templates \
+mkdir -p %{buildroot}/%{_fillupdir} \
 	 %{buildroot}/%{proxycachedir} \
 	 %{buildroot}/%{localstatedir}
 #
@@ -574,7 +579,7 @@ mkdir -p %{buildroot}/%{sysconfdir}/vhosts.d
 #
 # install sysconfig template
 install -m 644 $RPM_SOURCE_DIR/sysconfig.%{name} \
-	%{buildroot}/%{_var}/adm/fillup-templates/sysconfig.%{name}
+	%{buildroot}/%{_fillupdir}/sysconfig.%{name}
 #
 # install configuration files:
 mkdir -p %{buildroot}/%{runtimedir}
@@ -609,7 +614,7 @@ EOF
 %if "%{_lib}" != "lib64"
 sed -e 's/lib64/%{_lib}/' -i \
   %{buildroot}/%{sysconfdir}/loadmodule.conf \
-  %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.%{name}
+  %{buildroot}/%{_fillupdir}/sysconfig.%{name}
 %endif
 
 # remove configuration for mpms which have not been built
@@ -836,7 +841,7 @@ mv %{buildroot}/%{sysconfdir}/original .
 %{_sbindir}/suexec2
 %{iconsdir}
 %{errordir}
-%{_var}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 %attr(755,root,root) %{_libdir}/%{name}_MMN
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mod_*.so

From 3799de22270bf00d1ac716d75758e7e98ef951ef74722399e2b442cd677a3086 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 27 Nov 2017 09:37:09 +0000
Subject: [PATCH 2/2] - Add which and w3m as dependencies. poo#28406

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=535
---
 apache2.changes | 5 +++++
 apache2.spec    | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/apache2.changes b/apache2.changes
index efbe086..5e8bf27 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 26 17:25:10 UTC 2017 - sergiolindo.empresa@gmail.com
+
+- Add which and w3m as dependencies. poo#28406 
+
 -------------------------------------------------------------------
 Thu Nov 23 13:43:30 UTC 2017 - rbrown@suse.com
 
diff --git a/apache2.spec b/apache2.spec
index 72767ee..39a1c62 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -153,6 +153,8 @@ BuildRequires:  zlib-devel
 Requires:       %{_sysconfdir}/mime.types
 Requires:       %{name}-MPM
 Requires:       logrotate
+Requires:       w3m
+Requires:       which
 %if 0%{?suse_version} < 1210
 Requires(post): %insserv_prereq
 %endif