delete paches
This commit is contained in:
parent
eb078d9d91
commit
1cf6d3dd42
@ -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
|
|
||||||
@ -8,7 +8,7 @@
|
|||||||
Name: httpd
|
Name: httpd
|
||||||
Summary: Apache HTTP Server
|
Summary: Apache HTTP Server
|
||||||
Version: 2.4.34
|
Version: 2.4.34
|
||||||
Release: 12
|
Release: 13
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://httpd.apache.org/
|
URL: https://httpd.apache.org/
|
||||||
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
|
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
|
Patch0001: httpd-2.4.1-apctl.patch
|
||||||
Patch0002: httpd-2.4.9-apxs.patch
|
Patch0002: httpd-2.4.9-apxs.patch
|
||||||
Patch0003: httpd-2.4.1-deplibs.patch
|
Patch0003: httpd-2.4.1-deplibs.patch
|
||||||
Patch0004: httpd-2.4.34-layfix.patch
|
|
||||||
Patch0006: httpd-2.4.3-apctl-systemd.patch
|
Patch0006: httpd-2.4.3-apctl-systemd.patch
|
||||||
Patch0019: httpd-2.4.25-detect-systemd.patch
|
Patch0019: httpd-2.4.25-detect-systemd.patch
|
||||||
Patch0021: httpd-2.4.33-mddefault.patch
|
Patch0021: httpd-2.4.33-mddefault.patch
|
||||||
@ -536,6 +535,12 @@ exit $rv
|
|||||||
%{_rpmconfigdir}/macros.d/macros.httpd
|
%{_rpmconfigdir}/macros.d/macros.httpd
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.4.34-12
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user