|
|
@@ -22,12 +22,6 @@
|
|
|
## SUCH DAMAGE.
|
|
|
##
|
|
|
|
|
|
-# FIXME: with_mod_perl broken
|
|
|
-
|
|
|
-# package version
|
|
|
-%define V_apache 2.2.4
|
|
|
-%define V_mod_perl 2.0.3
|
|
|
-
|
|
|
# package information
|
|
|
Name: apache2
|
|
|
Summary: Apache HTTP Server (V2)
|
|
|
@@ -38,7 +32,7 @@ Distribution: OpenPKG Community
|
|
|
Class: PLUS
|
|
|
Group: Web
|
|
|
License: ASF
|
|
|
-Version: %{V_apache}
|
|
|
+Version: 2.2.4
|
|
|
Release: 20070529
|
|
|
|
|
|
# package options (generic)
|
|
|
@@ -60,7 +54,6 @@ Release: 20070529
|
|
|
%option with_mod_memcache no
|
|
|
%option with_mod_filecache no
|
|
|
%option with_mod_expires no
|
|
|
-%option with_mod_perl no
|
|
|
%option with_shared_core no
|
|
|
|
|
|
# fixing implicit inter-module dependencies and correlations
|
|
|
@@ -70,12 +63,11 @@ Release: 20070529
|
|
|
%endif
|
|
|
|
|
|
# list of sources
|
|
|
-Source0: http://www.apache.org/dist/httpd/httpd-%{V_apache}.tar.gz
|
|
|
-Source1: http://perl.apache.org/dist/mod_perl-%{V_mod_perl}.tar.gz
|
|
|
-Source2: rc.apache2
|
|
|
-Source3: apache2.base
|
|
|
-Source4: apache2.conf
|
|
|
-Source5: apache2.sh
|
|
|
+Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
|
|
|
+Source1: rc.apache2
|
|
|
+Source2: apache2.base
|
|
|
+Source3: apache2.conf
|
|
|
+Source4: apache2.sh
|
|
|
Patch0: apache2.patch
|
|
|
|
|
|
# build information
|
|
|
@@ -119,15 +111,10 @@ Conflicts: apache
|
|
|
|
|
|
%track
|
|
|
prog apache2 = {
|
|
|
- version = %{V_apache}
|
|
|
+ version = %{version}
|
|
|
url = http://www.apache.org/dist/httpd/
|
|
|
regex = httpd-(2.[02468]\.\d+)\.tar\.gz
|
|
|
}
|
|
|
- prog apache2:mod_perl = {
|
|
|
- version = %{V_mod_perl}
|
|
|
- url = http://perl.apache.org/dist/
|
|
|
- regex = mod_perl-(__VER__)\.tar\.gz
|
|
|
- }
|
|
|
|
|
|
%prep
|
|
|
# some pre-flight checks on options specified
|
|
|
@@ -143,47 +130,14 @@ Conflicts: apache
|
|
|
|
|
|
# unpack Apache distribution
|
|
|
%setup -q -c
|
|
|
- %patch -p0 -d httpd-%{V_apache}
|
|
|
+ %patch -p0 -d httpd-%{version}
|
|
|
%{l_shtool} subst \
|
|
|
-e 's;(" PLATFORM ");(%{l_openpkg_release -F "OpenPKG/%%t"});g' \
|
|
|
- httpd-%{V_apache}/server/core.c
|
|
|
-
|
|
|
- # unpack optional extension modules
|
|
|
-%if "%{with_mod_perl}" == "yes"
|
|
|
- %setup -q -T -D -a 1
|
|
|
-%endif
|
|
|
+ httpd-%{version}/server/core.c
|
|
|
|
|
|
%build
|
|
|
- # optionally prepare mod_perl
|
|
|
-%if "%{with_mod_perl}" == "yes"
|
|
|
- ( cd mod_perl-%{V_mod_perl}
|
|
|
- eval `%{l_prefix}/bin/perl -V:archname`
|
|
|
- eval `%{l_prefix}/bin/perl -V:version`
|
|
|
- eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib -V:installsitearch -V:installsitelib`
|
|
|
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
|
|
|
- perl=$RPM_BUILD_ROOT%{l_prefix}/bin/perl
|
|
|
- echo "#!/bin/sh" >$perl
|
|
|
- echo "exec %{l_prefix}/bin/perl \\" >>$perl
|
|
|
- echo " -I${RPM_BUILD_ROOT}${installarchlib} \\" >>$perl
|
|
|
- echo " -I${RPM_BUILD_ROOT}${installprivlib} \\" >>$perl
|
|
|
- echo " -I${RPM_BUILD_ROOT}${installsitearch} \\" >>$perl
|
|
|
- echo " -I${RPM_BUILD_ROOT}${installsitelib} \\" >>$perl
|
|
|
- echo " \"\$@\"" >>$perl
|
|
|
- chmod a+x $perl
|
|
|
- $perl Makefile.PL \
|
|
|
- MP_AP_PREFIX="`pwd`/../httpd-%{V_apache}" \
|
|
|
- MP_CCOPTS="%{l_cflags -O}" \
|
|
|
- MP_INST_APACHE2=1 \
|
|
|
- MP_USE_DSO=0 \
|
|
|
- MP_USE_STATIC=1 \
|
|
|
- MP_COMPAT_1X=1
|
|
|
- %{l_make} %{l_mflags}
|
|
|
- %{l_make} %{l_mflags} install
|
|
|
- ) || exit $?
|
|
|
-%endif
|
|
|
-
|
|
|
# configure package
|
|
|
- ( cd httpd-%{V_apache}
|
|
|
+ ( cd httpd-%{version}
|
|
|
( echo "ac_cv_func_uuid_create=no"
|
|
|
) >config.cache
|
|
|
export CC="%{l_cc}"
|
|
|
@@ -293,7 +247,7 @@ Conflicts: apache
|
|
|
%install
|
|
|
# install Apache
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
- ( cd httpd-%{V_apache}
|
|
|
+ ( cd httpd-%{version}
|
|
|
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/apache2.conf
|
|
|
rm -fr $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/{extra,original}
|