From 1cf6d3dd4200e76713fd758750621b8ccae2e2db Mon Sep 17 00:00:00 2001
From: zhuchengliang <zhuchengliang4@huawei.com>
Date: Sat, 11 Jan 2020 14:15:19 +0800
Subject: [PATCH] delete paches

---
 httpd-2.4.34-layfix.patch | 24 ------------------------
 httpd.spec                |  9 +++++++--
 2 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 httpd-2.4.34-layfix.patch

diff --git a/httpd-2.4.34-layfix.patch b/httpd-2.4.34-layfix.patch
deleted file mode 100644
index 39728a1..0000000
--- a/httpd-2.4.34-layfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- httpd-2.4.34/config.layout.layfix
-+++ httpd-2.4.34/config.layout
-@@ -133,6 +133,7 @@
- # Layout used in Fedora httpd packaging.
- <Layout Fedora>
-     prefix:        /usr
-+    localstatedir: /var
-     exec_prefix:   ${prefix}
-     bindir:        ${prefix}/bin
-     sbindir:       ${prefix}/sbin
-@@ -144,11 +145,10 @@
-     installbuilddir: ${libdir}/httpd/build
-     errordir:      ${datadir}/error
-     iconsdir:      ${datadir}/icons
--    htdocsdir:     /var/www/html
-+    htdocsdir:     ${localstatedir}/www/html
-     manualdir:     ${datadir}/manual
--    cgidir:        /var/www/cgi-bin
-+    cgidir:        ${localstatedir}/www/cgi-bin
-     includedir:    ${prefix}/include/httpd
--    localstatedir: /var
-     runtimedir:    /run/httpd
-     logfiledir:    ${localstatedir}/log/httpd
-     proxycachedir: ${localstatedir}/cache/httpd/proxy
diff --git a/httpd.spec b/httpd.spec
index 35f04e4..1611622 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
 Name:             httpd
 Summary:          Apache HTTP Server
 Version:          2.4.34
-Release:          12
+Release:          13
 License:          ASL 2.0
 URL:              https://httpd.apache.org/
 Source0:          https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -53,7 +53,6 @@ Source44:         httpd@.service
 Patch0001:        httpd-2.4.1-apctl.patch
 Patch0002:        httpd-2.4.9-apxs.patch
 Patch0003:        httpd-2.4.1-deplibs.patch
-Patch0004:        httpd-2.4.34-layfix.patch
 Patch0006:        httpd-2.4.3-apctl-systemd.patch
 Patch0019:        httpd-2.4.25-detect-systemd.patch
 Patch0021:        httpd-2.4.33-mddefault.patch
@@ -536,6 +535,12 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.34-13
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:delete patches
+
 * Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.4.34-12
 - Type:bugfix
 - ID:NA
-- 
Gitee