From 70c651fe5c0addbfd8196617fc124f823ab08ab7 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Nov 02 2016 11:32:07 +0000
Subject: no longer package /etc/sysconfig/httpd


---

diff --git a/httpd.spec b/httpd.spec
index 9566281..d282f14 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,12 +8,11 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.23
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
 Source2: httpd.logrotate
-Source3: httpd.sysconf
 Source4: httpd-ssl-pass-dialog
 Source5: httpd.tmpfiles
 Source6: httpd.service
@@ -339,10 +338,8 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
 
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-for s in httpd htcacheclean; do
-  install -m 644 -p $RPM_SOURCE_DIR/${s}.sysconf \
-                    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/${s}
-done
+install -m 644 -p $RPM_SOURCE_DIR/htcacheclean.sysconf \
+   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean
 
 # tmpfiles.d configuration
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d 
@@ -685,6 +682,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Wed Nov  2 2016 Joe Orton <jorton@redhat.com> - 2.4.23-5
+- no longer package /etc/sysconfig/httpd
+
 * Mon Jul 18 2016 Joe Orton <jorton@redhat.com> - 2.4.23-4
 - add security fix for CVE-2016-5387
 
diff --git a/httpd.sysconf b/httpd.sysconf
deleted file mode 100644
index 44a8246..0000000
--- a/httpd.sysconf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# This file is no longer used to configure additional environment variables
-# for the httpd process.
-#
-# It has been replaced by systemd. If you want to customize, the best
-# way is to create a file "/etc/systemd/system/httpd.service",
-# containing
-#   .include /lib/systemd/system/httpd.service
-#   ...make your changes here...
-# For more info about custom unit files, see
-# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
-
-
-# To set OPTIONS environment variable which was set in this file
-# in older versions, you need to create a file named
-# "/etc/systemd/system/httpd.service" containing:
-#	.include /lib/systemd/system/httpd.service
-#	[Service]
-#	#
-#	# To pass additional options (for instance, -D definitions) to the
-#	# httpd binary at startup, set OPTIONS here.
-#	#
-#	Environment=OPTIONS=-DMY_DEFINE
-
-# Note: With previous versions of httpd, the MPM could be changed by
-# editing an "HTTPD" variable here.  With the current version, that
-# variable is now ignored.  The MPM is a loadable module, and the
-# choice of MPM can be changed by editing the configuration file
-# /etc/httpd/conf.modules.d/00-mpm.conf.
-#