Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
b4a017361f | ||
|
154f666c30 | ||
|
b405a7c8b3 | ||
|
1a8522367c | ||
|
7281c20fbd | ||
|
d6da06669a | ||
|
ec6137956a | ||
|
4eae9f62fb |
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
22
Makefile
22
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)
|
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
702655defa418bab8f683f6268b4fd30 subversion-1.4.4.tar.gz
|
c40c1ebc1f228d8ea17dd0e7997a60c1 subversion-1.5.0.tar.gz
|
||||||
|
@ -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")
|
|
15
subversion-1.5.0-perl510.patch
Normal file
15
subversion-1.5.0-perl510.patch
Normal file
@ -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: $!";
|
@ -1,52 +1,26 @@
|
|||||||
|
--- subversion-1.5.0/build.conf.pie
|
||||||
Build subversion executables as PIEs. Requires a slight jig to
|
+++ subversion-1.5.0/build.conf
|
||||||
ensure that executables in the test suite are *not* built using
|
@@ -452,7 +452,7 @@ type = swig_lib
|
||||||
-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 @@
|
|
||||||
lang = python
|
lang = python
|
||||||
path = subversion/bindings/swig/python/libsvn_swig_py
|
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) $(SWIG_PY_LIBS)
|
||||||
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
|
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
|
||||||
install = swig-py-lib
|
install = swig-py-lib
|
||||||
# need special build rule to include -DSWIGPYTHON
|
# need special build rule to include -DSWIGPYTHON
|
||||||
compile-cmd = $(COMPILE_SWIG_PY)
|
compile-cmd = $(COMPILE_SWIG_PY)
|
||||||
--- subversion-1.4.0/Makefile.in.pie
|
@@ -475,7 +475,7 @@ type = swig_lib
|
||||||
+++ subversion-1.4.0/Makefile.in
|
lang = ruby
|
||||||
@@ -139,9 +139,10 @@
|
path = subversion/bindings/swig/ruby/libsvn_swig_ruby
|
||||||
CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
|
libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
|
||||||
LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
|
-link-cmd = $(LINK) $(SWIG_RB_LIBS)
|
||||||
|
+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
|
||||||
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
|
install = swig-rb-lib
|
||||||
+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
|
# need special build rule to include
|
||||||
+COMPILE = $(BASE_COMPILE) -fpie
|
compile-cmd = $(COMPILE_SWIG_RB)
|
||||||
COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
|
--- subversion-1.5.0/build/generator/gen_base.py.pie
|
||||||
-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
|
+++ subversion-1.5.0/build/generator/gen_base.py
|
||||||
+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
|
@@ -411,6 +411,9 @@ class TargetExe(TargetLinked):
|
||||||
|
|
||||||
# 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 @@
|
|
||||||
self.manpages = options.get('manpages', '')
|
self.manpages = options.get('manpages', '')
|
||||||
self.testing = options.get('testing')
|
self.testing = options.get('testing')
|
||||||
|
|
||||||
@ -56,7 +30,7 @@ object built with -pie.
|
|||||||
def add_dependencies(self):
|
def add_dependencies(self):
|
||||||
TargetLinked.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_fake = options.get('msvc-fake') == 'yes' # has fake target
|
||||||
self.msvc_export = string.split(options.get('msvc-export', ''))
|
self.msvc_export = string.split(options.get('msvc-export', ''))
|
||||||
|
|
||||||
@ -70,3 +44,41 @@ object built with -pie.
|
|||||||
|
|
||||||
class TargetApacheMod(TargetLib):
|
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)
|
@ -14,8 +14,8 @@
|
|||||||
|
|
||||||
Summary: Modern Version Control System designed to replace CVS
|
Summary: Modern Version Control System designed to replace CVS
|
||||||
Name: subversion
|
Name: subversion
|
||||||
Version: 1.4.4
|
Version: 1.5.0
|
||||||
Release: 7
|
Release: 8.2%{?dist}
|
||||||
License: ASL 1.1
|
License: ASL 1.1
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://subversion.tigris.org/
|
URL: http://subversion.tigris.org/
|
||||||
@ -25,9 +25,9 @@ Source3: filter-requires.sh
|
|||||||
Source4: http://www.xsteve.at/prg/emacs/psvn.el
|
Source4: http://www.xsteve.at/prg/emacs/psvn.el
|
||||||
Patch2: subversion-0.20.1-deplibs.patch
|
Patch2: subversion-0.20.1-deplibs.patch
|
||||||
Patch3: subversion-0.31.0-rpath.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
|
Patch7: subversion-1.1.3-java.patch
|
||||||
Patch8: subversion-1.4.4-macropen.patch
|
Patch8: subversion-1.5.0-perl510.patch
|
||||||
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
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
|
||||||
BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
|
BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
|
||||||
@ -73,7 +73,7 @@ using HTTP, via the Apache httpd server.
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Summary: Perl bindings to the Subversion libraries
|
Summary: Perl bindings to the Subversion libraries
|
||||||
BuildRequires: perl-devel >= 2:5.8.0, perl(ExtUtils::MakeMaker)
|
BuildRequires: perl-devel >= 2:5.8.0, perl(ExtUtils::MakeMaker)
|
||||||
BuildRequires: perl(Test::More)
|
BuildRequires: perl(Test::More), perl(ExtUtils::Embed)
|
||||||
Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
|
Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
|
||||||
Requires: subversion = %{version}-%{release}
|
Requires: subversion = %{version}-%{release}
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ This package includes the Perl bindings to the Subversion libraries.
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Summary: JNI bindings to the Subversion libraries
|
Summary: JNI bindings to the Subversion libraries
|
||||||
Requires: subversion = %{version}-%{release}
|
Requires: subversion = %{version}-%{release}
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel-icedtea
|
||||||
|
|
||||||
%description javahl
|
%description javahl
|
||||||
This package includes the JNI bindings to the Subversion libraries.
|
This package includes the JNI bindings to the Subversion libraries.
|
||||||
@ -109,10 +109,11 @@ This package includes the Ruby bindings to the Subversion libraries.
|
|||||||
%if %{with_java}
|
%if %{with_java}
|
||||||
%patch7 -p1 -b .java
|
%patch7 -p1 -b .java
|
||||||
%endif
|
%endif
|
||||||
%patch8 -p1 -b .macropen
|
%patch8 -p1 -b .perl510
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
# Regenerate after patches to build.conf et al
|
||||||
|
autoheader && autoconf && ./gen-make.py --reload
|
||||||
|
|
||||||
# fix shebang lines, #111498
|
# fix shebang lines, #111498
|
||||||
perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
|
perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
|
||||||
@ -123,19 +124,17 @@ export svn_cv_ruby_sitedir_libsuffix=""
|
|||||||
export svn_cv_ruby_sitedir_archsuffix=""
|
export svn_cv_ruby_sitedir_archsuffix=""
|
||||||
|
|
||||||
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
|
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} \
|
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
||||||
--with-swig --with-neon=%{_prefix} \
|
--with-swig --with-neon=%{_prefix} \
|
||||||
--with-ruby-sitedir=%{ruby_sitearch} \
|
--with-ruby-sitedir=%{ruby_sitearch} \
|
||||||
--with-apxs=%{_sbindir}/apxs --disable-mod-activation \
|
--with-apxs=%{_sbindir}/apxs --disable-mod-activation \
|
||||||
--disable-static --disable-neon-version-check
|
--disable-static
|
||||||
# 1.3.0 tarball ships with generated swig sources
|
|
||||||
make extraclean-swig-headers
|
|
||||||
make %{?_smp_mflags} all
|
make %{?_smp_mflags} all
|
||||||
make swig-py swig-py-lib %{swigdirs}
|
make swig-py swig-py-lib %{swigdirs}
|
||||||
make swig-pl swig-pl-lib swig-rb swig-rb-lib
|
make swig-pl swig-pl-lib swig-rb swig-rb-lib
|
||||||
%if %{with_java}
|
%if %{with_java}
|
||||||
make %{?_smp_mflags} javahl
|
# javahl does not parallel-make
|
||||||
|
make javahl
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -143,7 +142,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
make install install-swig-py install-swig-pl-lib install-swig-rb \
|
make install install-swig-py install-swig-pl-lib install-swig-rb \
|
||||||
DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
|
DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
|
||||||
%if %{with_java}
|
%if %{with_java}
|
||||||
make install-javahl DESTDIR=$RPM_BUILD_ROOT
|
make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir} DESTDIR=$RPM_BUILD_ROOT
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
make pure_vendor_install -C subversion/bindings/swig/perl/native \
|
make pure_vendor_install -C subversion/bindings/swig/perl/native \
|
||||||
@ -225,7 +224,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
|
%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
|
||||||
%doc tools subversion/LICENSE mod_authz_svn-INSTALL
|
%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}/*
|
%{_bindir}/*
|
||||||
%{_libdir}/libsvn_*.so.*
|
%{_libdir}/libsvn_*.so.*
|
||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
@ -270,10 +271,68 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%files javahl
|
%files javahl
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/libsvnjavahl-1.*
|
%{_libdir}/libsvnjavahl-1.*
|
||||||
%{_libdir}/svn-javahl
|
%{_javadir}/svn-javahl.jar
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 17 2008 Joe Orton <jorton@redhat.com> 1.5.0-8.2
|
||||||
|
- rebuild with IcedTea
|
||||||
|
|
||||||
|
* Thu Jul 17 2008 Joe Orton <jorton@redhat.com> 1.5.0-8.1
|
||||||
|
- rebuild for F-8
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Mon Mar 3 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.4.6-6
|
||||||
|
- rebuild for new perl (again)
|
||||||
|
|
||||||
|
* Thu Feb 21 2008 Lubomir Kundrak <lkundrak@redhat.com> 1.4.6-5
|
||||||
|
- Correct install location of java stuff (#433295)
|
||||||
|
|
||||||
|
* Wed Feb 6 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.4.6-4
|
||||||
|
- BR perl(ExtUtils::Embed)
|
||||||
|
|
||||||
|
* Tue Feb 5 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.4.6-3
|
||||||
|
- rebuild for new perl
|
||||||
|
|
||||||
|
* Fri Dec 21 2007 Joe Orton <jorton@redhat.com> 1.4.6-2
|
||||||
|
- update to 1.4.6
|
||||||
|
|
||||||
|
* Mon Dec 10 2007 Warren Togami <wtogami@redhat.com> 1.4.4-11
|
||||||
|
- temporarily disable test suite
|
||||||
|
|
||||||
|
* Thu Dec 6 2007 Joe Orton <jorton@redhat.com> 1.4.4-10
|
||||||
|
- fix build with swig 1.3.33 (patch by Torsten Landschoff)
|
||||||
|
|
||||||
|
* Wed Dec 5 2007 Joe Orton <jorton@redhat.com> 1.4.4-9
|
||||||
|
- rebuild for OpenLDAP soname bump
|
||||||
|
|
||||||
|
* Tue Sep 4 2007 Joe Orton <jorton@redhat.com> 1.4.4-8
|
||||||
|
- update to psvn.el r26383 from upstream
|
||||||
|
|
||||||
* Sun Sep 2 2007 Joe Orton <jorton@redhat.com> 1.4.4-7
|
* Sun Sep 2 2007 Joe Orton <jorton@redhat.com> 1.4.4-7
|
||||||
- rebuild for fixed 32-bit APR
|
- rebuild for fixed 32-bit APR
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user