- update to 1.1.2

- disable swig bindings due to incompatible swig version

.cvsignore

@@ -1 +1 @@
-subversion-1.1.1.tar.gz
+subversion-1.1.2.tar.gz

sources

@@ -1 +1 @@
-30c9c93fb3abda4aada393f2c68a406b  subversion-1.1.1.tar.gz
+11ec307ef937721fddd800f9b36078a5  subversion-1.1.2.tar.gz

subversion.spec

@@ -5,8 +5,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.1.1
+Version: 1.1.2
-Release: 5
+Release: 3
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -59,6 +59,7 @@ BuildRequires: httpd-devel >= 2.0.45
 The mod_dav_svn package allows access to a Subversion repository
 using HTTP, via the Apache httpd server.
 
+%if 0
 %package perl
 Group: Development/Libraries
 Summary: Perl bindings to the Subversion libraries
@@ -68,6 +69,7 @@ Requires: subversion = %{version}-%{release}
 
 %description perl
 This package includes the Perl bindings to the Subversion libraries.
+%endif
 
 %prep
 %setup -q
@@ -90,18 +92,19 @@ perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.i
 
 export CC=gcc CXX=g++
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
-	--with-swig --with-neon=%{_prefix} \
+	--without-swig --with-neon=%{_prefix} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation
 make %{?_smp_mflags} all swig-py %{swigdirs} 
 make swig-pl
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make install install-swig-py install-swig-pl-lib \
+make install \
         DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
 
-make pure_vendor_install -C subversion/bindings/swig/perl/native \
+# install-swig-py install-swig-pl-lib
-        PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+#make pure_vendor_install -C subversion/bindings/swig/perl/native \
+#        PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # Add subversion.conf configuration file into httpd/conf.d directory.
 install -m 755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d
@@ -140,11 +143,8 @@ ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
 
 %if %{make_check}
 %check
-%ifarch x86_64 s390x ppc64
+make check CLEANUP=yes || :
-make check check-swig-pl CLEANUP=yes || :
+# check-swig-pl
-%else
-make check check-swig-pl CLEANUP=yes
-%endif
 %endif
 
 %clean
@@ -154,9 +154,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %postun -p /sbin/ldconfig
 
+%if 0
 %post perl -p /sbin/ldconfig
 
 %postun perl -p /sbin/ldconfig
+%endif
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -167,8 +169,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/*
 %{_libdir}/libsvn_*.so.*
 %{_mandir}/man*/*
-%{pydir}/svn
+#%{pydir}/svn
-%{pydir}/libsvn
+#%{pydir}/libsvn
 %{_datadir}/emacs/site-lisp
 %{_datadir}/xemacs/site-packages/lisp
 %exclude %{_libdir}/libsvn_swig_perl*
@@ -188,14 +190,20 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/httpd/modules/mod_dav_svn.so
 %{_libdir}/httpd/modules/mod_authz_svn.so
 
+%if 0
 %files perl
 %defattr(-,root,root,-)
 %{perl_vendorarch}/auto/SVN
 %{perl_vendorarch}/SVN
 %{_libdir}/libsvn_swig_perl*
 %{_mandir}/man*/*::*
+%endif
 
 %changelog
+* Mon Jan 10 2005 Joe Orton <jorton@redhat.com> 1.1.2-3
+- update to 1.1.2
+- disable swig bindings due to incompatible swig version
+
 * Wed Nov 24 2004 Joe Orton <jorton@redhat.com> 1.1.1-5
 - update subversion.conf examples to be SELinux-friendly
 

upstream

@@ -1 +1 @@
-subversion-1.1.1.tar.gz
+subversion-1.1.2.tar.gz