- restore swig bindings support (from upstream via Max Bowsher, #141343)

- tweak SELinux commentary in default subversion.conf

subversion.conf

@@ -5,11 +5,14 @@ LoadModule authz_svn_module   modules/mod_authz_svn.so
 #
 # Example configuration to enable HTTP access for a directory
 # containing Subversion repositories, "/var/www/svn".  Each repository
-# must be readable and writable by the 'apache' user.  Note that if
+# must be readable and writable by the 'apache' user.  
-# SELinux is enabled, the repositories must be labelled with a context
+#
-# which httpd can write to; this will happen by default for
+# Note that if SELinux is enabled, the repositories must be labelled
-# directories created in /var/www.  Use "restorecon -R /var/www/svn"
+# with a context which httpd can write to; this will happen by default
-# to label the repositories if upgrading from a previous release.
+# for newly created directories in /var/www.  Use the command
+# "restorecon -R /var/www/svn" to label the repositories if migrating
+# from a system without SELinux enabled; to label a repository outside
+# /var/www, use "chcon -R -h -t httpd_sys_content_t /path/to/repos".
 #
 
 #

subversion.spec

@@ -10,7 +10,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.1.3
-Release: 6
+Release: 7
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -21,11 +21,12 @@ Source4: http://www.xsteve.at/prg/emacs/psvn.el
 Patch1: subversion-0.24.2-swig.patch
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
+Patch4: subversion-1.1.3-newswig.patch
 Patch6: subversion-1.0.3-pie.patch
 Patch7: subversion-1.1.3-java.patch
 Patch8: subversion-1.1.3-filepathver.patch
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo
-BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, docbook-style-xsl
+BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.22, docbook-style-xsl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -64,7 +65,6 @@ 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
@@ -74,7 +74,6 @@ Requires: subversion = %{version}-%{release}
 
 %description perl
 This package includes the Perl bindings to the Subversion libraries.
-%endif
 
 %if %{with_java}
 %package javahl
@@ -92,6 +91,7 @@ This package includes the JNI bindings to the Subversion libraries.
 %patch1 -p1 -b .swig
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
+%patch4 -p1 -b .newswig
 %patch6 -p1 -b .pie
 %if %{with_java}
 %patch7 -p1 -b .java
@@ -103,7 +103,7 @@ rm -rf neon apr apr-util db4
 %build
 ./autogen.sh
 
-# requirement for apr 0.9.5 seems to be bogus
+# requirement for apr 0.9.5 is bogus
 perl -pi -e 's/\.\[5-9\]/\.\[4-9\]/' configure
 
 # fix shebang lines, #111498
@@ -113,20 +113,16 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--without-swig --with-neon=%{_prefix} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation
-make %{?_smp_mflags} all %{swigdirs} 
+make %{?_smp_mflags} all
-#make swig-pl swig-py
+make swig-pl swig-py %{?_with_java:javahl} %{swigdirs}
-%if %{with_java}
-make javahl
-%endif
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make install %{?_with_java:install-javahl} \
+make install install-swig-py install-swig-pl-lib %{?_with_java:install-javahl} \
         DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
 
-# install-swig-py install-swig-pl-lib
+make pure_vendor_install -C subversion/bindings/swig/perl/native \
-#make pure_vendor_install -C subversion/bindings/swig/perl/native \
+        PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-#        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
@@ -136,7 +132,6 @@ 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 \) \) \
@@ -148,7 +143,6 @@ 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 \
@@ -168,8 +162,7 @@ ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
 %if %{make_check}
 %check
 export LANG=C LC_ALL=C
-make check CLEANUP=yes
+make check check-swig-pl CLEANUP=yes
-# check-swig-pl
 %endif
 
 %clean
@@ -179,11 +172,9 @@ 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)
@@ -194,14 +185,12 @@ 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
-%if 0
 %exclude %{_libdir}/libsvn_swig_perl*
 %exclude %{_mandir}/man*/*::*
-%endif
 
 %files devel
 %defattr(-,root,root)
@@ -209,9 +198,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libsvn*.a
 %{_libdir}/libsvn*.la
 %{_libdir}/libsvn*.so
-%if 0
 %exclude %{_libdir}/libsvn_swig_perl*
-%endif
 
 %files -n mod_dav_svn
 %defattr(-,root,root)
@@ -219,14 +206,12 @@ 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
 
 %if %{with_java}
 %files javahl
@@ -236,6 +221,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Mar 22 2005 Joe Orton <jorton@redhat.com> 1.1.3-7
+- restore swig bindings support (from upstream via Max Bowsher, #141343)
+- tweak SELinux commentary in default subversion.conf
+
 * Wed Mar  9 2005 Joe Orton <jorton@redhat.com> 1.1.3-6
 - fix svn_load_dirs File::Path version requirement