From 7ad830020f6c48c3f0661f251c89a791fc9e25ab Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 10 Jan 2005 09:24:20 +0000 Subject: [PATCH] Update for 1.1.2. --- subversion.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subversion.spec b/subversion.spec index d2def4d..120b3f8 100644 --- a/subversion.spec +++ b/subversion.spec @@ -18,7 +18,6 @@ Patch1: subversion-0.24.2-swig.patch Patch2: subversion-0.20.1-deplibs.patch Patch3: subversion-0.31.0-rpath.patch Patch6: subversion-1.0.3-pie.patch -Patch7: subversion-1.1.1-db43.patch BuildPreReq: autoconf, libtool, python, python-devel, texinfo BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, docbook-style-xsl BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1 @@ -77,7 +76,6 @@ This package includes the Perl bindings to the Subversion libraries. %patch2 -p1 -b .deplibs %patch3 -p1 -b .rpath %patch6 -p1 -b .pie -%patch7 -p1 -b .db43 rm -rf neon apr apr-util db4 @@ -94,8 +92,8 @@ export CC=gcc CXX=g++ %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --without-swig --with-neon=%{_prefix} \ --with-apxs=%{_sbindir}/apxs --disable-mod-activation -make %{?_smp_mflags} all swig-py %{swigdirs} -make swig-pl +make %{?_smp_mflags} all %{swigdirs} +#make swig-pl swig-py %install rm -rf ${RPM_BUILD_ROOT} @@ -114,6 +112,7 @@ install -m 644 $RPM_SOURCE_DIR/subversion.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/h rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \ ${RPM_BUILD_ROOT}%{pydir}/*/*.{a,la} +%if 0 # remove stuff produced with Perl modules find $RPM_BUILD_ROOT -type f \ -a \( -name .packlist -o \( -name '*.bs' -a -empty \) \) \ @@ -125,6 +124,7 @@ find $RPM_BUILD_ROOT%{_libdir}/perl5 -type f -perm 555 -print0 | # unnecessary libraries for swig bindings rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a} +%endif # Trim what goes in docdir rm -rf tools/*/*.in tools/test-scripts \