- Fedora layout is now upstream, drop patch
This commit is contained in:
parent
71609fae14
commit
84d2251c2d
@ -1,33 +0,0 @@
|
||||
|
||||
Add layout for Fedora.
|
||||
|
||||
--- httpd-2.4.3/config.layout.layout
|
||||
+++ httpd-2.4.3/config.layout
|
||||
@@ -370,3 +370,27 @@
|
||||
logfiledir: ${localstatedir}/log/httpd
|
||||
proxycachedir: ${localstatedir}/cache/httpd
|
||||
</Layout>
|
||||
+
|
||||
+# Fedora/RHEL layout
|
||||
+<Layout Fedora>
|
||||
+ prefix: /usr
|
||||
+ exec_prefix: ${prefix}
|
||||
+ bindir: ${prefix}/bin
|
||||
+ sbindir: ${prefix}/sbin
|
||||
+ libdir: ${prefix}/lib
|
||||
+ libexecdir: ${prefix}/libexec
|
||||
+ mandir: ${prefix}/man
|
||||
+ sysconfdir: /etc/httpd/conf
|
||||
+ datadir: ${prefix}/share/httpd
|
||||
+ installbuilddir: ${libdir}/httpd/build
|
||||
+ errordir: ${datadir}/error
|
||||
+ iconsdir: ${datadir}/icons
|
||||
+ htdocsdir: /var/www/html
|
||||
+ manualdir: ${datadir}/manual
|
||||
+ cgidir: /var/www/cgi-bin
|
||||
+ includedir: ${prefix}/include/httpd
|
||||
+ localstatedir: /var
|
||||
+ runtimedir: /run/httpd
|
||||
+ logfiledir: ${localstatedir}/log/httpd
|
||||
+ proxycachedir: ${localstatedir}/cache/httpd/proxy
|
||||
+</Layout>
|
@ -58,7 +58,6 @@ Source44: httpd@.service
|
||||
Patch1: httpd-2.4.1-apctl.patch
|
||||
Patch2: httpd-2.4.9-apxs.patch
|
||||
Patch3: httpd-2.4.1-deplibs.patch
|
||||
Patch5: httpd-2.4.3-layout.patch
|
||||
Patch6: httpd-2.4.3-apctl-systemd.patch
|
||||
# Needed for socket activation and mod_systemd patch
|
||||
Patch19: httpd-2.4.25-detect-systemd.patch
|
||||
@ -218,7 +217,6 @@ interface for storing and accessing per-user session data.
|
||||
%patch1 -p1 -b .apctl
|
||||
%patch2 -p1 -b .apxs
|
||||
%patch3 -p1 -b .deplibs
|
||||
%patch5 -p1 -b .layout
|
||||
%patch6 -p1 -b .apctlsystemd
|
||||
|
||||
%patch19 -p1 -b .detectsystemd
|
||||
|
Loading…
Reference in New Issue
Block a user