rpms/subversion/F-9 sources, 1.28, 1.29 subversion.spec, 1.110, 1.111 upstream, 1.16, 1.17 subversion-1.0.3-pie.patch, 1.9, NONE subversion-1.4.4-macropen.patch, 1.1, NONE subversion-1.4.4-swig1333.patch, 1.1, NONE subversion-1.4.6-javadir.patch, 1.1, NONE

Mon Jul 7 19:00:02 UTC 2008

Author: jorton

Update of /cvs/extras/rpms/subversion/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25157

Modified Files:
	sources subversion.spec upstream 
Removed Files:
	subversion-1.0.3-pie.patch subversion-1.4.4-macropen.patch 
	subversion-1.4.4-swig1333.patch subversion-1.4.6-javadir.patch 
Log Message:
* Mon Jul  7 2008 Joe Orton <jorton at redhat.com> 1.5.0-9.fc9
- rebuild for F9



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29

--- sources	21 Dec 2007 19:51:45 -0000	1.28
+++ sources	7 Jul 2008 18:59:06 -0000	1.29
@@ -1 +1 @@
-32786fe2f322982c0567346de18f6460  subversion-1.4.6.tar.gz
+c40c1ebc1f228d8ea17dd0e7997a60c1  subversion-1.5.0.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-9/subversion.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- subversion.spec	3 Mar 2008 23:59:22 -0000	1.110
+++ subversion.spec	7 Jul 2008 18:59:06 -0000	1.111
@@ -1,5 +1,5 @@
 # set to zero to avoid running test suite
-%define make_check 0
+%define make_check 1
 
 %define with_java 1
 
@@ -14,8 +14,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.4.6
-Release: 7
+Version: 1.5.0
+Release: 8%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -25,11 +25,9 @@
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
-Patch6: subversion-1.0.3-pie.patch
+Patch6: subversion-1.5.0-pie.patch
 Patch7: subversion-1.1.3-java.patch
-Patch8: subversion-1.4.4-macropen.patch
-Patch9: subversion-1.4.4-swig1333.patch
-Patch10: subversion-1.4.6-javadir.patch
+Patch8: subversion-1.5.0-perl510.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
@@ -87,7 +85,7 @@
 Group: Development/Libraries
 Summary: JNI bindings to the Subversion libraries
 Requires: subversion = %{version}-%{release}
-BuildRequires: java-devel
+BuildRequires: java-devel-openjdk
 
 %description javahl
 This package includes the JNI bindings to the Subversion libraries.
@@ -111,12 +109,11 @@
 %if %{with_java}
 %patch7 -p1 -b .java
 %endif
-%patch8 -p1 -b .macropen
-%patch9 -p1 -b .swig133
-%patch10 -p1 -b .javadir
+%patch8 -p1 -b .perl510
 
 %build
-./autogen.sh
+# Regenerate after patches to build.conf et al
+autoheader && autoconf && ./gen-make.py --reload
 
 # fix shebang lines, #111498
 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
@@ -127,19 +124,17 @@
 export svn_cv_ruby_sitedir_archsuffix=""
 
 export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
-export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25"
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --with-swig --with-neon=%{_prefix} \
         --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
-        --disable-static --disable-neon-version-check
-# 1.3.0 tarball ships with generated swig sources
-make extraclean-swig-headers
+        --disable-static
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
 %if %{with_java}
-make %{?_smp_mflags} javahl
+# javahl does not parallel-make
+make javahl
 %endif
 
 %install
@@ -229,7 +224,9 @@
 %defattr(-,root,root)
 %doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
 %doc tools subversion/LICENSE mod_authz_svn-INSTALL
-%doc contrib/client-side/svn_load_dirs{.pl,_*,.README}
+%doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README}
+%doc contrib/client-side/svnmerge/*.{README,py}
+%doc contrib/client-side/wcgrep
 %{_bindir}/*
 %{_libdir}/libsvn_*.so.*
 %{_mandir}/man*/*
@@ -278,6 +275,31 @@
 %endif
 
 %changelog
+* Mon Jul  7 2008 Joe Orton <jorton at redhat.com> 1.5.0-9.fc9
+- rebuild for F9
+
+* Thu Jul  3 2008 Joe Orton <jorton at redhat.com> 1.5.0-8
+- require suitable APR
+
+* Thu Jul  3 2008 Joe Orton <jorton at redhat.com> 1.5.0-7
+- add svnmerge and wcgrep to docdir (Edward Rudd, #451932)
+- drop neon version overrides
+
+* Wed Jul  2 2008 Joe Orton <jorton at redhat.com> 1.5.0-6
+- build with OpenJDK
+
+* Wed Jul  2 2008 Joe Orton <jorton at redhat.com> 1.5.0-5
+- fix files list
+
+* Wed Jul  2 2008 Joe Orton <jorton at redhat.com> 1.5.0-4
+- swig-perl test suite fix for Perl 5.10 (upstream r31546)
+
+* Tue Jul  1 2008 Joe Orton <jorton at redhat.com> 1.5.0-3
+- attempt build without java bits
+
+* Thu Jun 26 2008 Joe Orton <jorton at redhat.com> 1.5.0-2
+- update to 1.5.0
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.6-7
 - tests are randomly failing, unrelated to new perl, disabled tests
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-9/upstream,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- upstream	21 Dec 2007 19:51:45 -0000	1.16
+++ upstream	7 Jul 2008 18:59:06 -0000	1.17
@@ -1 +1 @@
-subversion-1.4.6.tar.gz
+subversion-1.5.0.tar.gz


--- subversion-1.0.3-pie.patch DELETED ---


--- subversion-1.4.4-macropen.patch DELETED ---


--- subversion-1.4.4-swig1333.patch DELETED ---


--- subversion-1.4.6-javadir.patch DELETED ---


