|
|
@@ -40,7 +40,7 @@ Class: BASE
|
|
|
Group: SCM
|
|
|
License: Apache/BSD
|
|
|
Version: %{V_opkg}
|
|
|
-Release: 20080117
|
|
|
+Release: 20080118
|
|
|
|
|
|
# package options
|
|
|
%option with_cvs2svn no
|
|
|
@@ -68,8 +68,8 @@ Prefix: %{l_prefix}
|
|
|
BuildRoot: %{l_buildroot}
|
|
|
BuildPreReq: OpenPKG, openpkg >= 20060823, make, libtool, sed, pkgconfig
|
|
|
PreReq: OpenPKG, openpkg >= 20060823
|
|
|
-BuildPreReq: diffutils, libxml, db, openssl, zlib, libiconv, expat
|
|
|
-PreReq: diffutils, libxml, db, openssl, zlib, libiconv, expat
|
|
|
+BuildPreReq: diffutils, db, openssl, zlib, libiconv, expat
|
|
|
+PreReq: diffutils, db, openssl, zlib, libiconv, expat
|
|
|
%if "%{with_cvs2svn}" == "yes"
|
|
|
PreReq: rcs, python, python::with_dbm = yes
|
|
|
%endif
|
|
|
@@ -165,8 +165,8 @@ AutoReqProv: no
|
|
|
--with-dbm=db45 \
|
|
|
--with-ssl=openssl \
|
|
|
--with-zlib \
|
|
|
+ --without-libxml2 \
|
|
|
--without-gssapi \
|
|
|
- --with-libxml2 \
|
|
|
%if "%{with_apache}" == "yes"
|
|
|
--with-apxs \
|
|
|
--disable-mod-activation \
|
|
|
@@ -271,6 +271,7 @@ AutoReqProv: no
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apu-config
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/aprutil.exp
|
|
|
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libexpat.*
|
|
|
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/neon
|
|
|
rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion >/dev/null 2>&1 || true
|
|
|
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/apr-0
|
