OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Mar-2005 20:26:36
Branch: HEAD Handle: 2005030619263600
Modified files:
openpkg-src/subversion subversion.patch subversion.spec
Log:
add two patches from gentoo for perl bindings; add first cut for
building python bindings
Summary:
Revision Changes Path
1.7 +12 -0 openpkg-src/subversion/subversion.patch
1.84 +25 -3 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 subversion.patch
--- openpkg-src/subversion/subversion.patch 6 Mar 2005 17:48:58 -0000
1.6
+++ openpkg-src/subversion/subversion.patch 6 Mar 2005 19:26:36 -0000
1.7
@@ -44,3 +44,15 @@
`$swig -perl -ldflags`)],
test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
);
+Index: Makefile.in
+--- Makefile.in.orig 2004-12-20 14:32:23 +0100
++++ Makefile.in 2005-03-06 20:25:18 +0100
+@@ -576,7 +576,7 @@
+ done
+
+ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
++ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor
+
+ swig-pl_DEPS = libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_ra
libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl
$(SWIG_PL_DIR)/native/Makefile
+ swig-pl: $(swig-pl_DEPS)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.83 -r1.84 subversion.spec
--- openpkg-src/subversion/subversion.spec 6 Mar 2005 17:48:58 -0000
1.83
+++ openpkg-src/subversion/subversion.spec 6 Mar 2005 19:26:36 -0000
1.84
@@ -45,6 +45,7 @@
%option with_cvs2svn no
%option with_svn2cvs no
%option with_perl no
+%option with_python no
# list of sources
Source0:
http://subversion.tigris.org/tarballs/subversion-%{V_dist}.tar.gz
@@ -68,10 +69,17 @@
BuildPreReq: perl
PreReq: perl, perl-xml, cvs, rcs
%endif
+%if "%{with_perl}" == "yes" || "%{with_python}" == "yes"
+BuildPreReq: swig
+%endif
%if "%{with_perl}" == "yes"
-BuildPreReq: perl, swig
+BuildPreReq: perl
PreReq: perl
%endif
+%if "%{with_python}" == "yes"
+BuildPreReq: python, swig
+PreReq: python
+%endif
AutoReq: no
AutoReqProv: no
@@ -110,6 +118,12 @@
-e 's;/etc/subversion;%{l_prefix}/etc/subversion;g' \
subversion/libsvn_subr/config_impl.h \
subversion/libsvn_subr/config_file.c
+%if "%{with_perl}" == "yes"
+ bindings="${bindings}${bindings+,}perl"
+%endif
+%if "%{with_python}" == "yes"
+ bindings="${bindings}${bindings+,}python"
+%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags libxml2 .}" \
@@ -120,9 +134,9 @@
--with-neon=%{l_prefix} \
--with-zlib \
--enable-static \
-%if "%{with_perl}" == "yes"
+%if "%{with_perl}" == "yes" || "%{with_python}" == "yes"
--with-swig=%{l_prefix}/bin/swig-old \
- --enable-swig-bindings=perl \
+ --enable-swig-bindings="$bindings" \
%endif
--disable-nls \
--disable-shared \
@@ -133,8 +147,13 @@
%if "%{with_perl}" == "yes"
( cd apr; ln -s .libs/libapr-0.a . ) || exit $?
( cd apr-util; ln -s .libs/libaprutil-0.a . ) || exit $?
+ %{l_shtool} mkdir -f -p -m 755 \
+
subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
%{l_make} %{l_mflags} swig-pl
%endif
+%if "%{with_python}" == "yes"
+ %{l_make} %{l_mflags} swig-py
+%endif
%install
# install package
@@ -143,6 +162,9 @@
%if "%{with_perl}" == "yes"
%{l_make} %{l_mflags} install-swig-pl DESTDIR=$RPM_BUILD_ROOT
%endif
+%if "%{with_python}" == "yes"
+ %{l_make} %{l_mflags} install-swig-py DESTDIR=$RPM_BUILD_ROOT
+%endif
# strip down installation
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/mod_dav_svn.h
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
