dist-git conversion

- add Provides: svn (#245087)
- fix without-java build (Lennert Buytenhek, #245467)

Makefile

@@ -1,7 +0,0 @@
-# Makefile for source rpm: subversion
-# $Id: Makefile,v 1.2 2004/09/23 08:27:44 jorton Exp $
-NAME := subversion
-SPECFILE = $(firstword $(wildcard *.spec))
-UPSTREAM_CHECKS := asc
-
-include ../common/Makefile.common

sources

@@ -1 +1 @@
-6b991b63e3e1f69670c9e15708e40176  subversion-1.4.3.tar.gz
+32786fe2f322982c0567346de18f6460  subversion-1.4.6.tar.gz

subversion-1.4.4-swig1333.patch

@@ -0,0 +1,21 @@
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=453166
+
+# For some reason, rubyhead.swg is included without being needed (at least 
+# for the current swig 1.3.33 version). This leads to a redefinition of 
+# _mSWIG. The documentation of SWIG only talks about including just 
+# the external_runtime file, not any additional includes. Also, the other
+# bindings do not include anything from SWIG apart from the external 
+# runtime. So I think this patch should suffice.  
+#
+#  -- Torsten Landschoff
+
+Index: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
+===================================================================
+--- subversion-1.4.4/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.swig133
++++ subversion-1.4.4/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
+@@ -1,4 +1,3 @@
+-#include "rubyhead.swg"
+ #include "swig_ruby_external_runtime.swg"
+ #include "swigutil_rb.h"
+ #include <st.h>

subversion.spec

@@ -14,8 +14,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.4.3
-Release: 5
+Version: 1.4.6
+Release: 3%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -27,11 +27,13 @@ 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.3-java.patch
+Patch8: subversion-1.4.4-swig1333.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
-BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
+BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext, perl-devel
 BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
 BuildRequires: neon-devel >= 0:0.24.7-1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides: svn = %{version}-%{release}
 
 %define __perl_requires %{SOURCE3}
 
@@ -106,6 +108,7 @@ This package includes the Ruby bindings to the Subversion libraries.
 %if %{with_java}
 %patch7 -p1 -b .java
 %endif
+%patch8 -p1 -b .swig1333
 
 %build
 ./autogen.sh
@@ -203,9 +206,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %postun ruby -p /sbin/ldconfig
 
+%if %{with_java}
 %post javahl -p /sbin/ldconfig
 
 %postun javahl -p /sbin/ldconfig
+%endif
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -260,6 +265,20 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Feb 13 2008 Joe Orton <jorton@redhat.com> 1.4.6-3.fc7
+- fix swig build
+
+* Wed Feb 13 2008 Joe Orton <jorton@redhat.com> 1.4.6-2.fc7
+- BuildRequire: perl-devel
+
+* Thu Jan 31 2008 Joe Orton <jorton@redhat.com> 1.4.6-1.fc7
+- update to 1.4.6
+
+* Tue Jul  3 2007 Joe Orton <jorton@redhat.com> 1.4.4-1.fc7
+- update to 1.4.4
+- add Provides: svn (#245087)
+- fix without-java build (Lennert Buytenhek, #245467)
+
 * Wed Apr 11 2007 Joe Orton <jorton@redhat.com> 1.4.3-5
 - fix version of apr/apr-util in BR (#216181)
 

upstream

@@ -1 +1 @@
-subversion-1.4.3.tar.gz
+subversion-1.4.4.tar.gz