rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- use arch-specific mmn

Browse Source
This commit is contained in:
Joe Orton 2011-02-23 17:04:04 +00:00
parent dd3f4c7662
commit d546d00c90
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
httpd.spec
View File

@ -1,13 +1,14 @@
%define contentdir /var/www %define contentdir /var/www
%define suexec_caller apache %define suexec_caller apache
%define mmn 20051115 %define mmn 20051115
%define mmnisa %{mmn}-%{__isa_name}-%{__isa_bits}
%define vstring Fedora %define vstring Fedora
%define mpms worker event %define mpms worker event
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.2.17 Version: 2.2.17
Release: 7%{?dist} Release: 8%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -50,7 +51,7 @@ Requires(pre): /usr/sbin/useradd
Requires(post): chkconfig Requires(post): chkconfig
Provides: webserver Provides: webserver
Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
Provides: httpd-mmn = %{mmn} Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
%description %description
@ -100,7 +101,7 @@ Epoch: 1
BuildRequires: openssl-devel BuildRequires: openssl-devel
Requires(post): openssl, /bin/cat Requires(post): openssl, /bin/cat
Requires(pre): httpd Requires(pre): httpd
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn} Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
Obsoletes: stronghold-mod_ssl Obsoletes: stronghold-mod_ssl
%description -n mod_ssl %description -n mod_ssl
@ -131,12 +132,12 @@ sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
# Safety check: prevent build if defined MMN does not equal upstream MMN. # Safety check: prevent build if defined MMN does not equal upstream MMN.
vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
if test "x${vmmn}" != "x%{mmn}"; then if test "x${vmmn}" != "x%{mmn}"; then
: Error: Upstream MMN is now ${vmmn}, packaged MMN is %{mmn}. : Error: Upstream MMN is now ${vmmn}, packaged MMN is %{mmn}
: Update the mmn macro and rebuild. : Update the mmn macro and rebuild.
exit 1 exit 1
fi fi
: Building with MMN %{mmn} and vendor string '%{vstring}' : Building with MMN %{mmn}, MMN-ISA %{mmnisa} and vendor string '%{vstring}'
%build %build
# forcibly prevent use of bundled apr, apr-util, pcre # forcibly prevent use of bundled apr, apr-util, pcre
@ -266,7 +267,7 @@ mv $RPM_BUILD_ROOT%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
$RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_bindir}
# Make the MMN accessible to module packages # Make the MMN accessible to module packages
echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
# docroot # docroot
mkdir $RPM_BUILD_ROOT%{contentdir}/html mkdir $RPM_BUILD_ROOT%{contentdir}/html
@ -496,6 +497,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh %{_libdir}/httpd/build/*.sh
%changelog %changelog
* Wed Feb 23 2011 Joe Orton <jorton@redhat.com> - 2.2.17-8
- use arch-specific mmn
* Mon Jan 31 2011 Joe Orton <jorton@redhat.com> - 2.2.17-7 * Mon Jan 31 2011 Joe Orton <jorton@redhat.com> - 2.2.17-7
- generate dummy mod_ssl cert with CA:FALSE constraint (#667841) - generate dummy mod_ssl cert with CA:FALSE constraint (#667841)
- add man page stubs for httpd.event, httpd.worker - add man page stubs for httpd.event, httpd.worker