|
|
@@ -73,8 +73,8 @@ Prefix: %{l_prefix}
|
|
|
BuildRoot: %{l_buildroot}
|
|
|
BuildPreReq: OpenPKG, openpkg >= 20060823, perl, make
|
|
|
PreReq: OpenPKG, openpkg >= 20060823, perl
|
|
|
-BuildPreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
|
|
|
-PreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
|
|
|
+BuildPreReq: apr, apr::with_db = yes, pcre
|
|
|
+PreReq: apr, apr::with_db = yes, pcre
|
|
|
%if "%{with_mod_ldap}" == "yes"
|
|
|
BuildPreReq: apr::with_ldap = yes
|
|
|
PreReq: apr::with_ldap = yes
|
|
|
@@ -235,8 +235,6 @@ Conflicts: apache13
|
|
|
# install Apache
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
|
|
|
- rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.conf
|
|
|
- rm -fr $RPM_BUILD_ROOT%{l_prefix}/etc/apache/{extra,original}
|
|
|
|
|
|
# adjust permissions
|
|
|
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/envvars
|
|
|
@@ -275,6 +273,10 @@ Conflicts: apache13
|
|
|
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
|
|
|
|
|
|
# strip down installation
|
|
|
+ find $RPM_BUILD_ROOT%{l_prefix}/share/apache -name "*.orig" -print | xargs rm -f
|
|
|
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/apache/htdocs/apache_pb*
|
|
|
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/apache/{extra,original}
|
|
|
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/apache
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/cgi/test-cgi
|
|
|
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
|
|
|
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
|
