dist-git conversion

#2781)

.cvsignore

@@ -1,2 +0,0 @@
-subversion-1.4.3.tar.gz
-subversion-1.4.6.tar.gz

.gitignore

@@ -0,0 +1 @@
+subversion-1.5.1.tar.gz

Makefile

@@ -1,22 +0,0 @@
-# Makefile for source rpm: subversion
-# $Id: Makefile,v 1.3 2004/09/30 10:49:48 jorton Exp $
-NAME := subversion
-SPECFILE = $(firstword $(wildcard *.spec))
-UPSTREAM_CHECKS := asc
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-32786fe2f322982c0567346de18f6460  subversion-1.4.6.tar.gz
+ec3ae55d43ee87c1c1f57e2411009459  subversion-1.5.2.tar.gz

subversion-1.4.4-macropen.patch

@@ -1,184 +0,0 @@
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/uuids-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/uuids-table.c
-@@ -47,7 +47,7 @@
-   BDB_ERR(db_create(&uuids, env, 0));
-   BDB_ERR(uuids->set_re_len(uuids, APR_UUID_FORMATTED_LENGTH));
- 
--  error = uuids->open(SVN_BDB_OPEN_PARAMS(uuids, NULL),
-+  error = (uuids->open)(SVN_BDB_OPEN_PARAMS(uuids, NULL),
-                       "uuids", 0, DB_RECNO,
-                       open_flags, 0666);
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/strings-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/strings-table.c
-@@ -44,10 +44,10 @@
-   BDB_ERR(db_create(&strings, env, 0));
- 
-   /* Enable duplicate keys. This allows the data to be spread out across
--     multiple records. Note: this must occur before ->open().  */
-+     multiple records. Note: this must occur before (->open)().  */
-   BDB_ERR(strings->set_flags(strings, DB_DUP));
- 
--  BDB_ERR(strings->open(SVN_BDB_OPEN_PARAMS(strings, NULL),
-+  BDB_ERR((strings->open)(SVN_BDB_OPEN_PARAMS(strings, NULL),
-                         "strings", 0, DB_BTREE,
-                         open_flags, 0666));
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/changes-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/changes-table.c
-@@ -51,10 +51,10 @@
-   BDB_ERR(db_create(&changes, env, 0));
- 
-   /* Enable duplicate keys. This allows us to store the changes
--     one-per-row.  Note: this must occur before ->open().  */
-+     one-per-row.  Note: this must occur before (->open)().  */
-   BDB_ERR(changes->set_flags(changes, DB_DUP));
- 
--  BDB_ERR(changes->open(SVN_BDB_OPEN_PARAMS(changes, NULL),
-+  BDB_ERR((changes->open)(SVN_BDB_OPEN_PARAMS(changes, NULL),
-                         "changes", 0, DB_BTREE,
-                         open_flags, 0666));
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/lock-tokens-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
-@@ -43,7 +43,7 @@
- 
-   BDB_ERR(svn_fs_bdb__check_version());
-   BDB_ERR(db_create(&lock_tokens, env, 0));
--  error = lock_tokens->open(SVN_BDB_OPEN_PARAMS(lock_tokens, NULL),
-+  error = (lock_tokens->open)(SVN_BDB_OPEN_PARAMS(lock_tokens, NULL),
-                             "lock-tokens", 0, DB_BTREE,
-                             open_flags, 0666);
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/env.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/env.c
-@@ -626,7 +626,7 @@
-   flags |= DB_THREAD;
- #endif
-   SVN_ERR(convert_bdb_error
--          (bdb, bdb->env->open(bdb->env, bdb->path_bdb, flags, mode)));
-+          (bdb, (bdb->env->open)(bdb->env, bdb->path_bdb, flags, mode)));
- 
- #if SVN_BDB_AUTO_COMMIT
-   /* Assert the BDB_AUTO_COMMIT flag on the opened environment. This
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/copies-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/copies-table.c
-@@ -43,7 +43,7 @@
- 
-   BDB_ERR(svn_fs_bdb__check_version());
-   BDB_ERR(db_create(&copies, env, 0));
--  BDB_ERR(copies->open(SVN_BDB_OPEN_PARAMS(copies, NULL),
-+  BDB_ERR((copies->open)(SVN_BDB_OPEN_PARAMS(copies, NULL),
-                        "copies", 0, DB_BTREE,
-                        open_flags, 0666));
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/nodes-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/nodes-table.c
-@@ -50,7 +50,7 @@
- 
-   BDB_ERR(svn_fs_bdb__check_version());
-   BDB_ERR(db_create(&nodes, env, 0));
--  BDB_ERR(nodes->open(SVN_BDB_OPEN_PARAMS(nodes, NULL),
-+  BDB_ERR((nodes->open)(SVN_BDB_OPEN_PARAMS(nodes, NULL),
-                       "nodes", 0, DB_BTREE,
-                       open_flags, 0666));
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/locks-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/locks-table.c
-@@ -44,7 +44,7 @@
- 
-   BDB_ERR(svn_fs_bdb__check_version());
-   BDB_ERR(db_create(&locks, env, 0));
--  error = locks->open(SVN_BDB_OPEN_PARAMS(locks, NULL),
-+  error = (locks->open)(SVN_BDB_OPEN_PARAMS(locks, NULL),
-                       "locks", 0, DB_BTREE,
-                       open_flags, 0666);
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/txn-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/txn-table.c
-@@ -51,7 +51,7 @@
- 
-   BDB_ERR(svn_fs_bdb__check_version());
-   BDB_ERR(db_create(&txns, env, 0));
--  BDB_ERR(txns->open(SVN_BDB_OPEN_PARAMS(txns, NULL),
-+  BDB_ERR((txns->open)(SVN_BDB_OPEN_PARAMS(txns, NULL),
-                      "transactions", 0, DB_BTREE,
-                      open_flags, 0666));
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/reps-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/reps-table.c
-@@ -44,7 +44,7 @@
- 
-   BDB_ERR(svn_fs_bdb__check_version());
-   BDB_ERR(db_create(&reps, env, 0));
--  BDB_ERR(reps->open(SVN_BDB_OPEN_PARAMS(reps, NULL),
-+  BDB_ERR((reps->open)(SVN_BDB_OPEN_PARAMS(reps, NULL),
-                      "representations", 0, DB_BTREE,
-                      open_flags, 0666));
- 
---- subversion-1.4.4/subversion/libsvn_fs_base/bdb/rev-table.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/rev-table.c
-@@ -40,7 +40,7 @@
- 
-   BDB_ERR(svn_fs_bdb__check_version());
-   BDB_ERR(db_create(&revisions, env, 0));
--  BDB_ERR(revisions->open(SVN_BDB_OPEN_PARAMS(revisions, NULL),
-+  BDB_ERR((revisions->open)(SVN_BDB_OPEN_PARAMS(revisions, NULL),
-                           "revisions", 0, DB_RECNO,
-                           open_flags, 0666));
- 
---- subversion-1.4.4/subversion/libsvn_ra/ra_loader.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_ra/ra_loader.c
-@@ -291,8 +291,8 @@
-   session->pool = pool;
- 
-   /* Ask the library to open the session. */
--  SVN_ERR(vtable->open(session, repos_URL, callbacks, callback_baton,
--                       config, pool));
-+  SVN_ERR((vtable->open)(session, repos_URL, callbacks, callback_baton,
-+                         config, pool));
- 
-   *session_p = session;
-   return SVN_NO_ERROR;
---- subversion-1.4.4/subversion/tests/libsvn_ra_local/ra-local-test.c.macropen
-+++ subversion-1.4.4/subversion/tests/libsvn_ra_local/ra-local-test.c
-@@ -95,7 +95,7 @@
-   SVN_ERR(current_directory_url(&url, repos_name, pool));
- 
-   /* Open an RA session into this repository. */
--  SVN_ERR((*plugin)->open(session, url, cbtable, NULL, NULL, pool));
-+  SVN_ERR(((*plugin)->open)(session, url, cbtable, NULL, NULL, pool));
- 
-   return SVN_NO_ERROR;
- }
---- subversion-1.4.4/subversion/libsvn_fs/fs-loader.c.macropen
-+++ subversion-1.4.4/subversion/libsvn_fs/fs-loader.c
-@@ -364,7 +364,7 @@
- 
-   SVN_ERR(fs_library_vtable(&vtable, path, pool));
-   *fs_p = svn_fs_new(fs_config, pool);
--  SVN_ERR(vtable->open(*fs_p, path, pool));
-+  SVN_ERR((vtable->open)(*fs_p, path, pool));
-   return serialized_init(*fs_p, pool);
- }
- 
-@@ -423,7 +423,7 @@
-   fs_library_vtable_t *vtable;
- 
-   SVN_ERR(fs_library_vtable(&vtable, path, fs->pool));
--  SVN_ERR(vtable->open(fs, path, fs->pool));
-+  SVN_ERR((vtable->open)(fs, path, fs->pool));
-   return serialized_init(fs, fs->pool);
- }
- 
---- subversion-1.4.4/build/generator/swig/header_wrappers.py.macropen
-+++ subversion-1.4.4/build/generator/swig/header_wrappers.py
-@@ -103,7 +103,7 @@
-         self.ofile.write(
-           "static svn_error_t *%s_invoke_%s(\n" % (struct[:-2], name) +
-           "  %s *_obj, %s) {\n" % (struct, params) +
--          "  return _obj->%s(%s);\n" % (name, param_names) +
-+          "  return (_obj->%s)(%s);\n" % (name, param_names) +
-           "}\n\n")
- 
-     self.ofile.write("%}\n")

subversion-1.4.4-swig1333.patch

@@ -1,21 +0,0 @@
-
-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-1.4.6-javadir.patch

@@ -1,19 +0,0 @@
-Make it possible for %install to specify %_javadir as destination
-Lubomir Kundrak <lkundrak@redhat.com>
-
-diff -urp subversion-1.4.6.orig/Makefile.in subversion-1.4.6/Makefile.in
---- subversion-1.4.6.orig/Makefile.in	2008-02-21 11:05:31.000000000 +0100
-+++ subversion-1.4.6/Makefile.in	2008-02-21 11:05:15.000000000 +0100
-@@ -71,9 +71,9 @@ swig_pydir_extra = @libdir@/svn-python/s
- swig_pldir = @libdir@/svn-perl
- swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
- 
--javahl_javadir = @libdir@/svn-javahl
--javahl_javahdir = @libdir@/svn-javahl/include
--javahl_libdir = @libdir@
-+javahl_javadir ?= @libdir@/svn-javahl
-+javahl_javahdir ?= @libdir@/svn-javahl/include
-+javahl_libdir ?= @libdir@
- 
- MSGFMT = @MSGFMT@
- MSGFMTFLAGS = @MSGFMTFLAGS@

subversion-1.5.0-perl510.patch

@@ -0,0 +1,15 @@
+
+upstream r31546
+
+--- subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t.perl510
++++ subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t
+@@ -221,8 +221,7 @@ sub add_file {
+ 
+ sub apply_textdelta {
+     my ($self, $baton, $base_checksum, $pool) = @_;
+-    my $data = $baton->{data} = \'';
+-    open my $out_fh, '>', $data
++    open my $out_fh, '>', \$baton->{data}
+         or die "error opening in-memory file to store Subversion update: $!";
+     open my $in_fh, '<', \''
+         or die "error opening in-memory file for delta source: $!";

subversion-1.5.0-pie.patch

@@ -1,52 +1,26 @@
-
-Build subversion executables as PIEs. Requires a slight jig to 
-ensure that executables in the test suite are *not* built using
--pie, since that doesn't work when main() is not itself an
-object built with -pie. 
-
---- subversion-1.4.0/build.conf.pie
-+++ subversion-1.4.0/build.conf
-@@ -416,7 +416,7 @@
+--- subversion-1.5.0/build.conf.pie
++++ subversion-1.5.0/build.conf
+@@ -452,7 +452,7 @@ type = swig_lib
  lang = python
  path = subversion/bindings/swig/python/libsvn_swig_py
- libs = libsvn_client libsvn_subr libsvn_delta libsvn_wc aprutil apriconv apr
+ libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
 -link-cmd = $(LINK) $(SWIG_PY_LIBS)
 +link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
  install = swig-py-lib
  # need special build rule to include -DSWIGPYTHON
  compile-cmd = $(COMPILE_SWIG_PY)
---- subversion-1.4.0/Makefile.in.pie
-+++ subversion-1.4.0/Makefile.in
-@@ -139,9 +139,10 @@
- CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
- LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
- 
--COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
-+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
-+COMPILE = $(BASE_COMPILE) -fpie
- COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
--LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
-+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
- 
- # special compilation for files destined for mod_dav_svn
- COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
-@@ -156,8 +157,11 @@
- COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
- COMPILE_JAVAHL_JAVAH = $(JAVAH)
- 
--LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
--LINK_LIB = $(LINK) -rpath $(libdir)
-+BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK = $(BASE_LINK) -pie
-+LINK_TEST = $(BASE_LINK) -no-install
-+LINK_LIB = $(BASE_LINK) -rpath $(libdir)
-+LINK_TEST_LIB = $(BASE_LINK)
- 
- # special link rule for mod_dav_svn
- LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
---- subversion-1.4.0/build/generator/gen_base.py.pie
-+++ subversion-1.4.0/build/generator/gen_base.py
-@@ -411,6 +411,9 @@
+@@ -475,7 +475,7 @@ type = swig_lib
+ lang = ruby
+ path = subversion/bindings/swig/ruby/libsvn_swig_ruby
+ libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
+-link-cmd = $(LINK) $(SWIG_RB_LIBS)
++link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
+ install = swig-rb-lib
+ # need special build rule to include
+ compile-cmd = $(COMPILE_SWIG_RB)
+--- subversion-1.5.0/build/generator/gen_base.py.pie
++++ subversion-1.5.0/build/generator/gen_base.py
+@@ -411,6 +411,9 @@ class TargetExe(TargetLinked):
      self.manpages = options.get('manpages', '')
      self.testing = options.get('testing')
  
@@ -56,7 +30,7 @@ object built with -pie.
    def add_dependencies(self):
      TargetLinked.add_dependencies(self)
  
-@@ -453,8 +456,11 @@
+@@ -453,8 +456,11 @@ class TargetLib(TargetLinked):
      self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
      self.msvc_export = string.split(options.get('msvc-export', ''))
  
@@ -70,3 +44,41 @@ object built with -pie.
  
  class TargetApacheMod(TargetLib):
  
+--- subversion-1.5.0/Makefile.in.pie
++++ subversion-1.5.0/Makefile.in
+@@ -2,7 +2,7 @@
+ # Makefile.in:  template Makefile for Subversion
+ #
+ # ====================================================================
+-# Copyright (c) 2000-2006 CollabNet.  All rights reserved.
++# Copyright (c) 2000-2006, 2008 CollabNet.  All rights reserved.
+ #
+ # This software is licensed as described in the file COPYING, which
+ # you should have received as part of this distribution.  The terms
+@@ -150,9 +150,10 @@ CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
+ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
+ LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
+ 
+-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
++BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
++COMPILE = $(BASE_COMPILE) -fpie
+ COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
+-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
++LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
+ 
+ # special compilation for files destined for mod_dav_svn
+ COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
+@@ -167,8 +168,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
+ COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
+ COMPILE_JAVAHL_JAVAH = $(JAVAH)
+ 
+-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
+-LINK_LIB = $(LINK) -rpath $(libdir)
++BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
++LINK = $(BASE_LINK) -pie
++LINK_TEST = $(BASE_LINK) -no-install
++LINK_LIB = $(BASE_LINK) -rpath $(libdir)
++LINK_TEST_LIB = $(BASE_LINK)
+ 
+ # special link rule for mod_dav_svn
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)

subversion-1.5.1.tar.gz.asc

@@ -0,0 +1,28 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBIiIutCwOubk4kUXwRAj+hAKCSk6lmt+0+IQ6A+ZxpRvbRZvddhACg45VG
+qge6q+hkaDcL0PK4o70Q5Ic=
+=XMH5
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBIiJ0VokEGqRcG/W4RAgjyAJ9Q7IGDrFlAehXbsHLpWC/q0EX2aQCgytSr
+opScRrQxh8ZGjx/i+fUcjWw=
+=e2B2
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEABECAAYFAkiJAR8ACgkQ+ZiecT68nANoZgCguCqIgQfBsqhhBy1nub0cGB92
+E2wAn220PA2CCaiWXakpVkSt4C9Fpx9i
+=d1Iz
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQBIibGLNR8z5DU+JbwRAl6dAJoDvz3z45EweH77/KbgUApW6iFqagCfbdcb
+OlTj7XF75yHuF5F1syel5Q8=
+=gK0P
+-----END PGP SIGNATURE-----

subversion.spec

@@ -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.2
+Release: 1%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -25,15 +25,13 @@ Source3: filter-requires.sh
 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
-BuildRequires: neon-devel >= 0:0.24.7-1
+BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: svn = %{version}-%{release}
 
@@ -87,7 +85,7 @@ This package includes the Perl bindings to the Subversion libraries.
 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 @@ This package includes the Ruby bindings to the Subversion libraries.
 %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_libsuffix=""
 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 --with-sasl=%{_prefix}
 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
@@ -195,6 +190,15 @@ sed -i "/^dependency_libs/{
      s,%{_libdir}/lib[^sa][^vp][^nr].*.la, ,g;
      }"  $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Create thunk ra_dav library for broken apps which linked against it.
+> ra_dav-thunk.c
+make ra_dav-thunk.lo
+./libtool --mode=link %{__cc} $RPM_OPT_FLAGS \
+          -shared -rpath %{_libdir} -o libsvn_ra_dav-1.la \
+          ./subversion/libsvn_ra_neon/libsvn_ra_neon-1.la
+./libtool --mode=install %{__install} -c libsvn_ra_dav-1.la \
+          $RPM_BUILD_ROOT%{_libdir}/libsvn_ra_dav-1.la
+
 %find_lang %{name}
 
 %if %{make_check}
@@ -229,7 +233,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %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 +284,41 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Sep 30 2008 Joe Orton <jorton@redhat.com> 1.5.2-1.fc9
+- update to 1.5.2
+- enable SASL support
+
+* Mon Jul 28 2008 Joe Orton <jorton@redhat.com> 1.5.1-1.fc9
+- update to 1.5.1
+
+* Thu Jul 24 2008 Joe Orton <jorton@redhat.com> 1.5.0-10.fc9
+- rebuild to add ra_dav library thunk
+
+* Mon Jul  7 2008 Joe Orton <jorton@redhat.com> 1.5.0-9.fc9
+- rebuild for F9
+
+* Thu Jul  3 2008 Joe Orton <jorton@redhat.com> 1.5.0-8
+- require suitable APR
+
+* Thu Jul  3 2008 Joe Orton <jorton@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@redhat.com> 1.5.0-6
+- build with OpenJDK
+
+* Wed Jul  2 2008 Joe Orton <jorton@redhat.com> 1.5.0-5
+- fix files list
+
+* Wed Jul  2 2008 Joe Orton <jorton@redhat.com> 1.5.0-4
+- swig-perl test suite fix for Perl 5.10 (upstream r31546)
+
+* Tue Jul  1 2008 Joe Orton <jorton@redhat.com> 1.5.0-3
+- attempt build without java bits
+
+* Thu Jun 26 2008 Joe Orton <jorton@redhat.com> 1.5.0-2
+- update to 1.5.0
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.4.6-7
 - tests are randomly failing, unrelated to new perl, disabled tests
 

upstream

@@ -1 +1 @@
-subversion-1.4.6.tar.gz
+subversion-1.5.2.tar.gz

upstream-key.gpg

@@ -334,3 +334,44 @@ U1KZwPLFgGg7AJ92A/Q+qOx2dy1wIijzl5bd3Ske9ACgwpmXFJaWmTUEwEZUOjxB
 ulJsLlk=
 =gZPn
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+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
+DsaBdgGvAKCGgo20vieV2HBWLOLVNH7t7CJQ+A==
+=nnAp
+-----END PGP PUBLIC KEY BLOCK-----