From a5a72df59c19f49d2f70a73fd038f00dc5985eab Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 24 2017 08:18:51 +0000
Subject: import httpd24-1.1-18.el7


---

diff --git a/SOURCES/macros-build b/SOURCES/macros-build
new file mode 100644
index 0000000..902e79a
--- /dev/null
+++ b/SOURCES/macros-build
@@ -0,0 +1,8 @@
+%scl_package_override() %{expand:
+  %{?_@SCL@_mmn:       %global _httpd_mmn        %_@SCL@_mmn}
+  %{?_@SCL@_apxs:      %global _httpd_apxs       %_@SCL@_apxs}
+  %{?_@SCL@_moddir:    %global _httpd_moddir     %_@SCL@_moddir}
+  %{?_@SCL@_contentdir:%global _httpd_contentdir %_@SCL@_contentdir}
+  %{?_@SCL@_modconfdir:%global _httpd_modconfdir %_@SCL@_modconfdir}
+  %{?_@SCL@_confdir:   %global _httpd_confdir    %_@SCL@_confdir}
+}
diff --git a/SPECS/httpd24.spec b/SPECS/httpd24.spec
index 608fd67..3e2a03e 100644
--- a/SPECS/httpd24.spec
+++ b/SPECS/httpd24.spec
@@ -15,12 +15,13 @@
 Summary:       Package that installs %scl
 Name:          %scl_name
 Version:       1.1
-Release:       14%{?dist}
+Release:       18%{?dist}
 License:       GPLv2+
 Group: Applications/File
 Source0: README
 Source1: LICENSE
 Source2: README.7
+Source3: macros-build
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: scl-utils-build
@@ -138,6 +139,11 @@ cat >> %{buildroot}%{_scl_scripts}/service-environment << EOF
 HTTPD24_HTTPD_SCLS_ENABLED="%{scl}"
 EOF
 
+# Add the scl_package_override macro
+sed -e 's/@SCL@/%{scl_name_base}%{scl_name_version}/g' %{SOURCE3} \
+   >>%{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
+cat  %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
+
 %post runtime
 # Simple copy of context from system root to DSC root.
 # In case new version needs some additional rules or context definition,
@@ -170,6 +176,10 @@ restorecon -R %{_scl_root} >/dev/null 2>&1 || :
 %{_root_sysconfdir}/rpm/macros.%{scl_name_base}-scldevel
 
 %changelog
+* Tue Jun 06 2017 Luboš Uhliarik <luhliari@redhat.com> - 1.1-18
+- rebuild
+- Resolves: #1457316 - [RFE] please consider using scl_package_override
+
 * Fri May 06 2016 Jan Kaluza <jkaluza@redhat.com> - 1.1-14
 - Resolves:#1219112 - fix error in man page