diff options
Diffstat (limited to 'httpd.spec')
| -rw-r--r-- | httpd.spec | 43 |
1 files changed, 21 insertions, 22 deletions
@@ -7,8 +7,8 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.4.2 -Release: 23%{?dist} +Version: 2.4.3 +Release: 2%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -37,25 +37,19 @@ Source23: manual.conf Source30: README.confd # build/scripts patches Patch1: httpd-2.4.1-apctl.patch -Patch2: httpd-2.4.1-apxs.patch +Patch2: httpd-2.4.3-apxs.patch Patch3: httpd-2.4.1-deplibs.patch -Patch5: httpd-2.4.1-layout.patch +Patch5: httpd-2.4.3-layout.patch # Features/functional changes -Patch20: httpd-2.0.48-release.patch +Patch20: httpd-2.4.3-release.patch Patch23: httpd-2.4.1-export.patch Patch24: httpd-2.4.1-corelimit.patch Patch25: httpd-2.4.1-selinux.patch Patch26: httpd-2.4.2-r1337344+.patch Patch27: httpd-2.4.2-icons.patch +Patch28: httpd-2.4.2-r1332643+.patch # Bug fixes -Patch40: httpd-2.4.2-restart.patch -Patch41: httpd-2.4.2-r1327036+.patch -Patch42: httpd-2.4.2-r1326980+.patch -Patch43: httpd-2.4.2-r1332643+.patch -Patch44: httpd-2.4.2-r1346905.patch -Patch45: httpd-2.4.2-r1357685.patch -Patch46: httpd-2.4.2-r1366693.patch -Patch47: httpd-2.4.2-r1365604.patch +Patch50: httpd-2.4.2-r1374214+.patch License: ASL 2.0 Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -162,18 +156,12 @@ authentication to the Apache HTTP Server. %patch25 -p1 -b .selinux %patch26 -p1 -b .r1337344+ %patch27 -p1 -b .icons +%patch28 -p1 -b .r1332643+ -%patch40 -p1 -b .restart -%patch41 -p1 -b .r1327036+ -%patch42 -p1 -b .r1326980+ -%patch43 -p1 -b .r1332643+ -%patch44 -p1 -b .r1346905 -%patch45 -p1 -b .r1357685 -%patch46 -p1 -b .r1366693 -%patch47 -p1 -b .r1365604 +%patch50 -p1 -b .r1374214+ # Patch in vendor/release string -sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 +sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch --fuzz=%{_default_patch_fuzz} -p1 # Prevent use of setcap in "install-suexec-caps" target. sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in @@ -530,6 +518,7 @@ rm -rf $RPM_BUILD_ROOT %{contentdir}/error/include/*.html %{contentdir}/noindex/index.html +%dir %{docroot} %dir %{docroot}/cgi-bin %dir %{docroot}/html @@ -585,6 +574,16 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %changelog +* Tue Aug 21 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.3-2 +- sync with rawhide, rebuild for remi repo + +* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-2 +- mod_ssl: add check for proxy keypair match (upstream r1374214) + +* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-1 +- update to 2.4.3 (#849883) +- own the docroot (#848121) + * Mon Aug 6 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.2-23 - sync with rawhide, rebuild for remi repo |