pool/subversion
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 90217 from devel:tools:scm:svn

Browse Source 
- update to 1.7.1
  * Based on many fixes by stsp.elego.de, many thanks!
  * License changed to Apache License, version 2
  * Detecting MIME types with libmagic 
  * Optimizations of diff, merge and blame
  * See http://subversion.apache.org/docs/release-notes/1.7
    for details

- merge in fixes from stsp.elego.de:
 * Simplify tools install and ship a smaller amount of tools. 
   Should fix rpmlint complaining about .libs/ directories
   and various other illegal files ending up in the package.
   Users are better off downloading the scripts previously shipped
   in this package directly from the upstream svn repository.

- merge in package description fixes from stsp.elego.de, thanks!

- reenable gnome-keyring/kde4-keyring support for older distros
  (bnc#713919) 

- pass the serf configure option to subversion's configure script,
  not to swig's configure script

- add bconditional for libserf support

- fix swig bindings building (bnc#710878)

- run regression tests again, but only for fsfs, as bdb
  is slow and often runs out of memory

OBS-URL: https://build.opensuse.org/request/show/90217
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=79
This commit is contained in:
Stephan Kulow 2011-11-08 08:35:13 +00:00 committed by Git OBS Bridge
commit d583ec6ad6
15 changed files with 210 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib-1187941.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f316a8e662f1730ee6f8ac3da5ea375b9cc4923e9022066880d38eb75dd267f5
size 294963

3
sqlite-amalgamation-3.6.13.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfc36a45ae38a63e4992934997f925e305e9fe8c07a67ba8cfb608dd88338df1
size 1196862

3
sqlite-autoconf-3070603.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22cf70872a5bad5f8aad338b6373af6ad001a08a4dd70f4315d86acaa44cafe1
size 1280774

3
subversion-1.6.17.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
size 5504298

3
subversion-1.7.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d34bde626fac1aa553f5c9aeedf961999a77cc31540ace18da5aeacdd03d6608
size 5973480

8
subversion-ctypes-remove_shebang.patch
View File

@ -1,8 +0,0 @@
--- subversion/bindings/ctypes-python/csvn/core/__init__.py.orig
+++ subversion/bindings/ctypes-python/csvn/core/__init__.py
@@ -1,5 +1,3 @@
-#!/home/djames/bin/python
-
from ctypes import *
import functions
from functions import *

10
subversion-fix_nonvoid_function_without_return.patch
View File

@ -1,10 +0,0 @@
--- subversion/bindings/javahl/native/EnumMapper.cpp.orig
+++ subversion/bindings/javahl/native/EnumMapper.cpp
@@ -497,6 +497,7 @@ jint EnumMapper::mapOperation(svn_wc_ope
switch (operation)
{
case svn_wc_operation_none:
+ default:
return org_tigris_subversion_javahl_Operation_none;
case svn_wc_operation_update:
return org_tigris_subversion_javahl_Operation_update;

8
subversion-no-build-date.patch
View File

@ -1,6 +1,6 @@
--- subversion/libsvn_subr/opt.c.orig --- subversion/libsvn_subr/opt.c.orig
+++ subversion/libsvn_subr/opt.c +++ subversion/libsvn_subr/opt.c
@@ -965,9 +965,8 @@ svn_opt__print_version_info(const char * @@ -1069,9 +1069,8 @@
if (quiet) if (quiet)
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER); return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
@ -9,6 +9,6 @@
- SVN_VERSION, __DATE__, __TIME__)); - SVN_VERSION, __DATE__, __TIME__));
+ SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"), pgm_name, + SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"), pgm_name,
+ SVN_VERSION)); + SVN_VERSION));
SVN_ERR(svn_cmdline_fputs(_("Copyright (C) 2000-2009 CollabNet.\n" SVN_ERR(svn_cmdline_fputs(
"Subversion is open source software, see" _("Copyright (C) 2011 The Apache Software Foundation.\n"
" http://subversion.apache.org/\n" "This software consists of contributions made by many "

80
subversion.changes
View File

@ -1,3 +1,75 @@
-------------------------------------------------------------------
Sun Oct 23 17:34:20 CEST 2011 - dmueller@suse.de
- update to 1.7.1
* Based on many fixes by stsp.elego.de, many thanks!
* License changed to Apache License, version 2
* Detecting MIME types with libmagic
* Optimizations of diff, merge and blame
* See http://subversion.apache.org/docs/release-notes/1.7
for details
-------------------------------------------------------------------
Fri Oct 21 18:01:34 CEST 2011 - dmueller@suse.de
- merge in fixes from stsp.elego.de:
* Simplify tools install and ship a smaller amount of tools.
Should fix rpmlint complaining about .libs/ directories
and various other illegal files ending up in the package.
Users are better off downloading the scripts previously shipped
in this package directly from the upstream svn repository.
-------------------------------------------------------------------
Fri Oct 21 17:56:21 CEST 2011 - dmueller@suse.de
- merge in package description fixes from stsp.elego.de, thanks!
-------------------------------------------------------------------
Fri Oct 21 17:46:18 CEST 2011 - dmueller@suse.de
- reenable gnome-keyring/kde4-keyring support for older distros
(bnc#713919)
-------------------------------------------------------------------
Thu Sep 29 09:44:52 UTC 2011 - stsp@elego.de
- pass the serf configure option to subversion's configure script,
not to swig's configure script
-------------------------------------------------------------------
Wed Aug 24 00:34:35 CEST 2011 - dmueller@suse.de
- add bconditional for libserf support
-------------------------------------------------------------------
Fri Aug 19 17:39:29 CEST 2011 - dmueller@suse.de
- fix swig bindings building (bnc#710878)
-------------------------------------------------------------------
Sat Aug 13 00:44:04 CEST 2011 - dmueller@suse.de
- run regression tests again, but only for fsfs, as bdb
is slow and often runs out of memory
-------------------------------------------------------------------
Tue Aug 2 18:05:00 CEST 2011 - dmueller@suse.de
- add versioned runtime dependency on sqlite3 libraries
- make init script executable
-------------------------------------------------------------------
Sat Jul 30 08:45:05 CEST 2011 - dmueller@suse.de
- annotate changelog with bugs and CVE's fixed via individual backports
on the maintained code streams
-------------------------------------------------------------------
Wed Jul 27 16:15:24 CEST 2011 - dmueller@suse.de
- remove intree copies of sqlite and swig if version is new enough
- disable kwallet/gnome-keyring support for SLE11 (to be package list compatible)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 30 14:07:41 UTC 2011 - stsp@elego.de Mon May 30 14:07:41 UTC 2011 - stsp@elego.de
@ -46,7 +118,8 @@ Thu Apr 21 15:57:51 CEST 2011 - pth@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 24 11:24:33 UTC 2011 - stsp@elego.de Thu Feb 24 11:24:33 UTC 2011 - stsp@elego.de
- update to 1.6.16 (bnc#676949): - update to 1.6.16 (bnc#676949, bnc#662030):
includes security fixes [CVE-2010-4539, CVE-2010-4644, CVE-2011-0715]
User-visible changes: User-visible changes:
* more improvement to the 'blame -g' memory leak from 1.6.15 (r1041438) * more improvement to the 'blame -g' memory leak from 1.6.15 (r1041438)
* avoid a crash in mod_dav_svn when using locks (r1071239, -307) * avoid a crash in mod_dav_svn when using locks (r1071239, -307)
@ -98,7 +171,8 @@ Mon Dec 6 11:21:06 CET 2010 - dmueller@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 24 18:33:47 CET 2010 - stsp@elego.de Wed Nov 24 18:33:47 CET 2010 - stsp@elego.de
- update to 1.6.15: - update to 1.6.15 (bnc#649861):
includes security fixes [CVE-2010-3315]
User-visible changes: User-visible changes:
* hide unreadable dirs in mod_dav_svn's GET response (r996884) * hide unreadable dirs in mod_dav_svn's GET response (r996884)
@ -326,7 +400,7 @@ Sat Aug 8 12:54:35 CEST 2009 - pascal.bleser@opensuse.org
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 7 20:03:24 CEST 2009 - stsp@elego.de Fri Aug 7 20:03:24 CEST 2009 - stsp@elego.de
- update to 1.6.4. - update to 1.6.4 (bnc#528714):
* Security fix [CVE-2009-2411] * Security fix [CVE-2009-2411]
------------------------------------------------------------------- -------------------------------------------------------------------

29
subversion.header_wrappers.patch
View File

@ -1,29 +0,0 @@
/usr/bin/python /usr/src/packages/BUILD/subversion-1.3.x/build/generator/swig/header_wrappers.py /usr/src/packages/BUILD/subversion-1.3.x/build.conf /usr/bin/swig /usr/src/packages/BUILD/subversion-1.3.x/subversion/include/svn_auth.h
/usr/src/packages/BUILD/subversion-1.3.x/subversion/bindings/swig/core.i:613: Error: Unable to find 'svn_auth_h.swg'
/usr/bin/swig -I/usr/src/packages/BUILD/subversion-1.3.x/subversion/bindings/swig -I/usr/src/packages/BUILD/subversion-1.3.x/subversion/bindings/swig/include -I/usr/src/packages/BUILD/subversion-1.3.x/subversion/bindings/swig/proxy -I/usr/src/packages/BUILD/subversion-1.3.x/subversion/bindings/swig/proxy -I/usr/src/packages/BUILD/subversion-1.3.x/subversion/include -I/usr/include -I/usr/include/apr-1 -python -classic -w451 -w305 -o subversion/bindings/swig/python/core.c /usr/src/packages/BUILD/subversion-1.3.x/subversion/bindings/swig/core.i
build/generator/swig/header_wrappers.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- build/generator/swig/header_wrappers.py.orig
+++ build/generator/swig/header_wrappers.py
@@ -239,7 +239,7 @@ class Generator(generator.swig.Generator
self.proxy_filename(base_fname))
# Open the output file
- self.ofile = open(output_fname, 'w')
+ self.ofile = open(output_fname + "~", 'w')
self.ofile.write('/* Proxy classes for %s\n' % base_fname)
self.ofile.write(' * DO NOT EDIT -- AUTOMATICALLY GENERATED */\n')
@@ -264,6 +264,7 @@ class Generator(generator.swig.Generator
# Close our output file
self.ofile.close()
+ os.rename(output_fname + "~", output_fname)
def process_header_file(self, fname):
"""Generate a wrapper around a header file"""

36
subversion.java14.patch
View File

@ -1,36 +0,0 @@
---
configure.ac | 2 +-
subversion/bindings/javahl/build/build.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- configure.ac.orig
+++ configure.ac
@@ -781,7 +781,7 @@ fi
AC_PATH_PROGS(PYTHON, "$PYTHON", none)
# The minimum version for the JVM runtime for our Java bytecode.
-JAVA_OLDEST_WORKING_VER='1.2'
+JAVA_OLDEST_WORKING_VER='1.4'
# SVN_CHECK_JDK sets $JAVA_CLASSPATH
SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
--- subversion/bindings/javahl/build/build.xml.orig
+++ subversion/bindings/javahl/build/build.xml
@@ -21,7 +21,7 @@
<target name="compile" unless="junit.path"
description="Compile the Java binding source files">
- <javac compiler="modern" destdir="classes">
+ <javac source="1.4" target="1.4" destdir="classes">
<src path="src"/>
<exclude name="org/tigris/subversion/javahl/tests/**"/>
</javac>
@@ -29,7 +29,7 @@
<target name="compile-tests" if="junit.path"
description="Compile the Java test source files">
- <javac compiler="modern" destdir="classes">
+ <javac source="1.4" target="1.4" destdir="classes">
<src path="src"/>
<classpath path="${junit.path}"/>
</javac>

68
subversion.libtool-pie-flags.patch
View File

@ -1,63 +1,13 @@
--- Makefile.in.orig --- Makefile.in.orig 2011-06-16 17:36:40.624000428 +0200
+++ Makefile.in +++ Makefile.in 2011-06-16 17:49:24.352000431 +0200
@@ -163,42 +163,45 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) @@ -227,8 +227,8 @@
LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) libsvn_wc_LDFLAGS = @libsvn_wc_LDFLAGS@
SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
+NOPIECFLAGS = -fno-pie -fno-PIE
+PIECFLAGS = -fpie -fPIE
+PIELDFLAGS = -pie
COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
-LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX)
+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(NOPIECFLAGS)
+LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(NOPIECFLAGS)
# Execute a command that loads libraries from the build dir
LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in $(abs_builddir)/subversion/*/*.la; do echo -dlopen $$f; done`
# special compilation for files destined for mod_dav_svn
-COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
+COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(NOPIECFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
# special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c)
-COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
-COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
-COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
+COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(NOPIECFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
+COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(NOPIECFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
+COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(NOPIECFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
# special compilation for files destined for javahl (i.e. C++)
-COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(JAVAHL_INCLUDES) -o $@ -c
+COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(NOPIECFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
COMPILE_JAVAHL_JAVAH = $(JAVAH)
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIELDFLAGS) -rpath $(libdir)
+LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(PIELDFLAGS) -rpath $(libdir)
# 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)
+LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIELDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
# Compilation of SWIG-generated C source code # Compilation of SWIG-generated C source code
-COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@ -COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
-COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@ -COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@
+COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(PIECFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@ +COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -fpie -fPIE -prefer-pic -c -o $@
+COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(PIECFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@ +COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -fpie -fPIE -prefer-pic -c -o $@
# these commands link the wrapper objects into an extension library/module # these commands link the wrapper objects into an extension library/module
-LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module
-LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module
+LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(PIELDFLAGS) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module
+LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(PIELDFLAGS) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module
-LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir)
+LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) $(PIELDFLAGS) -rpath $(libdir)
INSTALL = @INSTALL@
INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)

10
subversion.libtool-verbose.patch
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig --- Makefile.in.orig 2011-05-26 10:58:42.000000000 +0200
+++ Makefile.in +++ Makefile.in 2011-06-16 17:30:00.724000428 +0200
@@ -103,8 +103,8 @@ EXEEXT = @EXEEXT@ @@ -111,8 +111,8 @@
SHELL = @SHELL@ SHELL = @SHELL@
LIBTOOL = @SVN_LIBTOOL@ LIBTOOL = @SVN_LIBTOOL@
@ -8,6 +8,6 @@
-LTCXXFLAGS = --tag=CXX --silent -LTCXXFLAGS = --tag=CXX --silent
+LTFLAGS = --tag=CC +LTFLAGS = --tag=CC
+LTCXXFLAGS = --tag=CXX +LTCXXFLAGS = --tag=CXX
LT_CFLAGS = @LT_CFLAGS@
LT_LDFLAGS = @LT_LDFLAGS@ LT_LDFLAGS = @LT_LDFLAGS@
LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ LT_SO_VERSION = @SVN_LT_SOVERSION@
LT_CXX_LIBADD = @LT_CXX_LIBADD@

2
subversion.rcsvnserve
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# Copyright (c) 1995-20011 SuSE Linux AG, Nuernberg, Germany. # Copyright (c) 1995-2011 SuSE Linux AG, Nuernberg, Germany.
# All rights reserved. # All rights reserved.
# #
# /etc/init.d/svnserve # /etc/init.d/svnserve

312
subversion.spec
View File

@ -18,47 +18,41 @@
# norootforbuild # norootforbuild
%if 0%{?sles_version} == 9 %define with_ruby 0%{?suse_version} > 1110
%define __python %{_usr}/bin/python2.5 %define with_intree_swig 0%{?suse_version} != 1110
%endif %if 0%{?always_use_intree_sqlite:1}
%if 0%{?sles_version} == 9
%define with_ruby 0
%define with_python_ctypes 0
%else
%define with_ruby 1
%define with_python_ctypes 0
%endif
%define with_intree_sqlite 1 %define with_intree_sqlite 1
%if 0%{?suse_version} > 1010 %define with_python_ctypes 0%{?suse_version} > 1110
%define with_gnome_keyring 1
%else %else
%define with_gnome_keyring 0 %define with_intree_sqlite 0%{?suse_version} < 1110
%endif # suse_version > 1010 %define with_python_ctypes 0
%if 0%{?suse_version} > 1030 %endif
%define with_kde4_kwallet 1 %if %suse_version >= 1210
%define with_python_ctypes 0
%endif
%define with_kde4_kwallet 0%{?suse_version} > 1100
%define with_gnome_keyring 0%{?suse_version} > 1100
%if %suse_version >= 1210
%bcond_with subversion_libserf_support
%else %else
%define with_kde4_kwallet 0 %bcond_without subversion_libserf_support
%endif # suse_version > 1030 %endif
Name: subversion Name: subversion
Version: 1.6.17 Version: 1.7.1
Release: 1 Release: 1
# in-tree SWIG version to use for the build: # in-tree SWIG version to use for the build:
%define swig_version 1.3.36 %define swig_version 1.3.36
%define sqlite_version 3.6.13 %define sqlite_version 3.7.6.3
%if 0%{?suse_version} > 910 %define sqlite_pkg_version 3070603
BuildRequires: update-alternatives BuildRequires: apache2-devel db-devel file-devel gcc-c++ libstdc++-devel zlib-devel
%endif # suse_version > 910
BuildRequires: apache2-devel db-devel gcc gcc-c++ glibc-devel libstdc++-devel zlib-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if 0%{?sles_version} == 9
BuildRequires: python-xml python25 python25-devel
%else
BuildRequires: python-devel python-xml BuildRequires: python-devel python-xml
%endif BuildRequires: update-alternatives
%if %with_python_ctypes %if %with_python_ctypes
BuildRequires: ctypesgen BuildRequires: ctypesgen
%endif # with_python_ctypes %endif
%if %with_ruby %if %with_ruby
BuildRequires: ruby-devel BuildRequires: ruby-devel
%endif # with_ruby %endif # with_ruby
@ -73,37 +67,19 @@ BuildRequires: libgnome-keyring-devel
BuildRequires: gnome-keyring-devel BuildRequires: gnome-keyring-devel
%endif %endif
%endif # with_gnome_keyring %endif # with_gnome_keyring
%if %{with subversion_libserf_support}
BuildRequires: libserf-devel
%endif
%if %with_kde4_kwallet %if %with_kde4_kwallet
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel kdelibs4-core libkde4-devel libqt4-devel
BuildRequires: kdelibs4-core libkde4-devel libqt4-devel
%endif # with_kde4_kwallet %endif # with_kde4_kwallet
%ifarch ppc ppc64 %if 0%{?suse_version} >= 1130
# no JDK on ppc
%define with_java 0
%else
%if 0%{?sles_version}
# no JDK on SLE either
%define with_java 0
%else
%if 0%{?suse_version} >= 1100
# OpenJDK is available by default on openSUSE >= 11.0
%define with_java 1 %define with_java 1
BuildRequires: java-1_6_0-openjdk-devel BuildRequires: java-devel >= 1.6.0
%else
%if 0%{?suse_version} == 1030
BuildRequires: java-1_6_0-sun-devel
%define with_java 1
%else
# Older OpenSUSE version might still have a 1.5 JDK around
BuildRequires: java-1_5_0-sun-devel
%define with_java 1
%endif # suse_version == 1030
%endif # suse_version >= 1100
%endif # sles_version
%endif # ifarch
%if %with_java
BuildRequires: junit BuildRequires: junit
%endif #with_java %else
%define with_java 0
%endif
%if 0%{?suse_version} > 1030 %if 0%{?suse_version} > 1030
BuildRequires: libneon-devel BuildRequires: libneon-devel
%else %else
@ -124,40 +100,42 @@ BuildRequires: iproute2
# #
PreReq: %insserv_prereq %fillup_prereq PreReq: %insserv_prereq %fillup_prereq
# #
Summary: A Concurrent Versioning system similar to but better than CVS Summary: Subversion version control system
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
License: ASLv2 License: ASLv2
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Url: http://subversion.apache.org Url: http://subversion.apache.org
Source0: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2 Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
Source1: subversion.conf Source1: subversion.conf
Source2: subversion.README.SuSE Source2: subversion.README.SuSE
Source3: svnmerge.py Source3: svnmerge.py
Source4: contrib-1187941.tar.bz2
Source9: subversion.rcsvnserve Source9: subversion.rcsvnserve
Source10: subversion.sysconfig.svnserve Source10: subversion.sysconfig.svnserve
Source12: subversion.sysconfig.svnserve.remoteaccess Source12: subversion.sysconfig.svnserve.remoteaccess
Source13: subversion.xinetd.svnserve Source13: subversion.xinetd.svnserve
Source42: subversion.svngrep.sh Source42: subversion.svngrep.sh
Source43: subversion.svndiff.sh Source43: subversion.svndiff.sh
%if %with_intree_swig
# http://ovh.dl.sourceforge.net/project/swig/swig/swig-%{swig_version}/swig-%{swig_version}.tar.gz # http://ovh.dl.sourceforge.net/project/swig/swig/swig-%{swig_version}/swig-%{swig_version}.tar.gz
Source90: swig-%{swig_version}.tar.bz2 Source90: swig-%{swig_version}.tar.bz2
%else
BuildRequires: swig
%endif
%if %with_intree_sqlite %if %with_intree_sqlite
# http://www.sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz # http://www.sqlite.org/sqlite-amalgamation-%{sqlite_version}.tar.gz
Source91: sqlite-amalgamation-%{sqlite_version}.tar.bz2 Source91: sqlite-autoconf-%{sqlite_pkg_version}.tar.bz2
%else %else
BuildRequires: sqlite-devel >= %{sqlite_version} BuildRequires: sqlite3-devel >= %{sqlite_version}
%requires_ge libsqlite3-0
%endif # with_intree_sqlite %endif # with_intree_sqlite
Source92: %{name}.rpmlintrc Source92: %{name}.rpmlintrc
# #
Patch11: subversion.libtool-verbose.patch Patch11: subversion.libtool-verbose.patch
Patch12: subversion-fix_nonvoid_function_without_return.patch
# build fixes # build fixes
Patch20: subversion-swig-perl-install_vendor.patch Patch20: subversion-swig-perl-install_vendor.patch
Patch23: subversion.libtool-pie-flags.patch Patch23: subversion.libtool-pie-flags.patch
Patch31: subversion.perl.LD_RUN_PATH.patch Patch31: subversion.perl.LD_RUN_PATH.patch
Patch33: subversion.header_wrappers.patch
Patch35: subversion.java14.patch
Patch36: subversion-ctypes-remove_shebang.patch
Patch37: subversion-no-build-date.patch Patch37: subversion-no-build-date.patch
# PATCH-FEATURE-UPSTREAM subversion-neon-systemproxy.patch dimstar@opensuse.org -- Use system proxy offered by neon, if no specific config is used (Thus, actually using libproxy in the background to use 'the right proxy' as configured in the system). # PATCH-FEATURE-UPSTREAM subversion-neon-systemproxy.patch dimstar@opensuse.org -- Use system proxy offered by neon, if no specific config is used (Thus, actually using libproxy in the background to use 'the right proxy' as configured in the system).
Patch38: subversion-neon-systemproxy.patch Patch38: subversion-neon-systemproxy.patch
@ -178,10 +156,11 @@ Provides: subversion-javahl = %{version}-%{release}
%endif # with_java %endif # with_java
%description %description
Subversion does the same thing cvs (CVS (Concurrent Versioning System)) Subversion exists to be universally recognized and adopted as an open-source,
but has major enhancements compared to CVS. The name of the cmdline centralized version control system characterized by its reliability as a safe
client is svn. haven for valuable data; the simplicity of its model and usage; and its ability
to support the needs of a wide variety of users and projects, from individuals
to large-scale enterprise operations.
%package devel %package devel
@ -199,33 +178,16 @@ files for developers interacting with the subversion package.
%package tools %package tools
License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html License: ASLv2
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Summary: Tools for Subversion Summary: Tools for Subversion
%description tools %description tools
This package contains a lot of tools for subversion server and This package contains some tools for subversion server and
repository admins: * hot-backup makes a backup of a svn repo repository admins.
without stopping
* various scripts for client (bash_completion, showchange.pl,
svn-graph.pl, ...) and server (svn-backup-dumps.py, ...) site
* po file translation scripts
* hook scripts
* xslt example
* some scripts and code examples
An overview of the scripts can be found at:
http://subversion.tigris.org/tools_contrib.html
%package perl %package perl
License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html License: ASLv2
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Summary: Allows Perl scripts to directly use Subversion repositories Summary: Allows Perl scripts to directly use Subversion repositories
Requires: subversion = %{version} Requires: subversion = %{version}
@ -238,13 +200,10 @@ Provides Perl (SWIG) support for Subversion.
%package python %package python
License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html License: ASLv2
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Summary: Allows Python scripts to directly use Subversion repositories Summary: Allows Python scripts to directly use Subversion repositories
Requires: subversion = %{version} Requires: subversion = %{version}
%if 0%{?sles_version} == 9
Requires: python25
%endif
%description python %description python
Provides Python (SWIG) support for Subversion. Provides Python (SWIG) support for Subversion.
@ -255,7 +214,6 @@ Provides Python (SWIG) support for Subversion.
%package python-ctypes %package python-ctypes
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Summary: High-Level Python Bindings for Subversion Summary: High-Level Python Bindings for Subversion
Requires: subversion = %{version} Requires: subversion = %{version}
@ -266,7 +224,7 @@ Provides high-level Python support for Subversion, based on ctypes.
%if %with_ruby %if %with_ruby
%package ruby %package ruby
License: Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html License: ASLv2
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Summary: Allows Ruby scripts to directly use Subversion repositories Summary: Allows Ruby scripts to directly use Subversion repositories
Requires: subversion = %{version} Requires: subversion = %{version}
@ -288,29 +246,26 @@ Requires: subversion = %{version} apache2 %{apache_mmn}
The subversion-server package adds the Subversion server Apache module The subversion-server package adds the Subversion server Apache module
to the Apache directories and configuration. to the Apache directories and configuration.
http://subversion.tigris.org http://subversion.apache.org
%if %with_kde4_kwallet %if %with_kde4_kwallet
%package -n libsvn_auth_kwallet-1-0 %package -n libsvn_auth_kwallet-1-0
License: Subversion license, http://subversion.tigris.org/license-1.html License: ASLv2
Summary: A Concurrent Versioning system similar to but better than CVS Summary: A Concurrent Versioning system similar to but better than CVS
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
%description -n libsvn_auth_kwallet-1-0 %description -n libsvn_auth_kwallet-1-0
Subversion does the same thing cvs (CVS (Concurrent Versioning System)) Provides KWallet integration for Subversion.
but has major enhancements compared to CVS. The name of the cmdline
client is svn.
%endif # with_kde4_kwallet %endif # with_kde4_kwallet
%if %with_gnome_keyring %if %with_gnome_keyring
%package -n libsvn_auth_gnome_keyring-1-0 %package -n libsvn_auth_gnome_keyring-1-0
License: Subversion license, http://subversion.tigris.org/license-1.html License: ASLv2
Summary: A Concurrent Versioning system similar to but better than CVS Summary: A Concurrent Versioning system similar to but better than CVS
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
@ -324,34 +279,27 @@ client is svn.
%endif # with_gnome_keyring %endif # with_gnome_keyring
%prep %prep
%setup -q -n subversion-%{version} -b 90 %if %with_intree_swig
%setup -q -n subversion-%{version} -a 4 -b 90
%else
%setup -q -n subversion-%{version} -a 4
%endif
# #
%if %with_intree_sqlite %if %with_intree_sqlite
%__install -d ./sqlite-amalgamation %__install -d ./sqlite-amalgamation
pushd ./sqlite-amalgamation pushd ./sqlite-amalgamation
%__bzip2 -d -c "%{SOURCE91}" | %__tar xf - "sqlite-%{sqlite_version}/sqlite3.c" %__bzip2 -d -c "%{SOURCE91}" | %__tar xf - "sqlite-autoconf-%{sqlite_pkg_version}/sqlite3.c"
%__mv "sqlite-%{sqlite_version}/sqlite3.c" . %__mv "sqlite-autoconf-%{sqlite_pkg_version}/sqlite3.c" .
%__rm -rf "sqlite-%{sqlite_version}" %__rm -rf "sqlite-autoconf-%{sqlite_pkg_version}"
popd #./sqlite-amalgamation popd #./sqlite-amalgamation
%endif # with_intree_sqlite %endif # with_intree_sqlite
# #
%patch11 -p0 %patch11 -p0
%patch12 -p0
#
%patch20 %patch20
%if 0%{?suse_version} > 930
%patch23 -p0 %patch23 -p0
%endif
%patch31 %patch31
%patch33
%patch35
%patch36 -p0
%patch37 %patch37
%patch38 %patch38
%if 0%{?sles_version} == 9
%__grep -rwl '/usr/bin/python' . | xargs %__sed -i 's|/usr/bin/python|%{_usr}/bin/python2.5|g'
%__grep -rwl '/usr/bin/env python' . | xargs %__sed -i 's|/usr/bin/env python|%{_usr}/bin/python2.5|g'
%endif
SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\") SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\")
#" #"
@ -372,6 +320,7 @@ mkdir BUILDPATH
export PATH="$PWD/BUILDPATH:$PATH" export PATH="$PWD/BUILDPATH:$PATH"
export PYTHON="%{_usr}/bin/python2.5" export PYTHON="%{_usr}/bin/python2.5"
%endif %endif
%if %with_intree_swig
SWIG_ROOT=`cd ..; pwd`/intree-swig SWIG_ROOT=`cd ..; pwd`/intree-swig
pushd "../swig-%{swig_version}" pushd "../swig-%{swig_version}"
CFLAGS="%{optflags}" \ CFLAGS="%{optflags}" \
@ -392,11 +341,12 @@ CXXFLAGS="%{optflags}" \
--without-allegrocl \ --without-allegrocl \
--without-clisp \ --without-clisp \
--without-r \ --without-r \
--with-swiglibdir="$SWIG_ROOT/share/swig" \ --with-swiglibdir="$SWIG_ROOT/share/swig"
--disable-neon-version-check
%__make %{?jobs:-j%{jobs}} %__make %{?jobs:-j%{jobs}}
%__make install %__make install
popd #swig popd #swig
%endif
with_jdk=none with_jdk=none
%if %with_java %if %with_java
for i in \ for i in \
@ -465,19 +415,14 @@ do
fi fi
echo echo
done >> build-outputs.mK done >> build-outputs.mK
export CFLAGS="$(%{apxs} -q CFLAGS) -Wall -g" export CFLAGS="$(%{apxs} -q CFLAGS) %{optflags} -fpie -fstack-protector"
%if 0%{?suse_version} > 930
CFLAGS="$CFLAGS -fpie"
export LDFLAGS=-pie
%endif # suse_version > 930
%if 0%{?suse_version} > 1000
CFLAGS="$CFLAGS -fstack-protector"
%endif # suse_version > 1000
export CXXFLAGS="$CFLAGS" export CXXFLAGS="$CFLAGS"
export LDFLAGS=-pie
export PATH="${SWIG_ROOT}/bin:${PATH}" export PATH="${SWIG_ROOT}/bin:${PATH}"
%configure \ %configure \
--with-editor="vim -c 'set tw=72 et' " \ --with-editor="vim -c 'set tw=72 et' " \
--with-neon=%{_prefix} \ --with-neon=%{_prefix} \
%{?_with_subversion_libserf_support} \
--with-apr=%{_prefix} \ --with-apr=%{_prefix} \
--with-apr-util=%{_prefix} \ --with-apr-util=%{_prefix} \
--with-apxs=%{apxs} \ --with-apxs=%{apxs} \
@ -488,7 +433,9 @@ export PATH="${SWIG_ROOT}/bin:${PATH}"
--with-junit="%{_usr}/share/java/junit.jar" \ --with-junit="%{_usr}/share/java/junit.jar" \
%endif %endif
--with-jikes=no \ --with-jikes=no \
%if %with_intree_swig
--with-swig="$SWIG_ROOT" \ --with-swig="$SWIG_ROOT" \
%endif
%if %with_intree_sqlite %if %with_intree_sqlite
--with-sqlite="./sqlite-amalgamation/sqlite3.c" \ --with-sqlite="./sqlite-amalgamation/sqlite3.c" \
%else %else
@ -501,10 +448,8 @@ export PATH="${SWIG_ROOT}/bin:${PATH}"
--with-kwallet \ --with-kwallet \
%endif %endif
--disable-mod-activation \ --disable-mod-activation \
--with-libmagic \
--disable-static --disable-static
%if 0%{?suse_version} == 910
sed --in-place=~ "s,\/usr\/lib ,%{_libdir} ,g" Makefile
%endif
%__make %{?jobs:-j%jobs} SWIG_LDFLAGS= %__make %{?jobs:-j%jobs} SWIG_LDFLAGS=
# #
if [ "$with_jdk" != "" ] ; then if [ "$with_jdk" != "" ] ; then
@ -520,31 +465,10 @@ python_ctypes_target=ctypes-python
%else %else
python_ctypes_target= python_ctypes_target=
%endif # with_python_ctypes %endif # with_python_ctypes
%__make extraclean-swig
%__make swig-py $python_ctypes_target swig-pl $ruby_target SWIG_LDFLAGS= $with_jdk %__make swig-py $python_ctypes_target swig-pl $ruby_target SWIG_LDFLAGS= $with_jdk
#
# build additional tools
TOOLS_LIBS=""
for d in subversion/libsvn_*/.libs; do
TOOLS_LIBS="$TOOLS_LIBS -L${PWD}/$d"
done
TOOLS_LIBS="$TOOLS_LIBS $(pkg-config --libs apr-1 apr-util-1)"
TOOLS_LIBS="$TOOLS_LIBS -lsvn_subr-1 -lsvn_fs-1 -lsvn_repos-1"
TOOLS_CFLAGS=$(pkg-config --cflags apr-1 apr-util-1)
TOOLS_CFLAGS="$TOOLS_CFLAGS -I$PWD/subversion/include"
pushd tools/server-side
for f in svn-populate-node-origins-index svnauthz-validate; do
%__cc %{optflags} ${TOOLS_CFLAGS} ${TOOLS_LIBS} -o "${f}" "${f}.c"
done
%if 0%{?sles_version} == 9
%__sed -i 's|^#![[:space:]]*/usr/bin/env[[:space:]]*python[[:space:]]|#!/usr/bin/python2.5|' *.py
%endif
popd #tools/server-side
%install %install
%if 0%{?sles_version} == 9
export PATH="$PWD/BUILDPATH:$PATH"
export PYTHON="%{_usr}/bin/python2.5"
%endif
if [ -f with_jdk ] ; then if [ -f with_jdk ] ; then
with_jdk=install-javahl with_jdk=install-javahl
else else
@ -563,18 +487,18 @@ python_ctypes_target=
%__make DESTDIR="$RPM_BUILD_ROOT" install install-swig-pl install-swig-py $python_ctypes_target $ruby_target $with_jdk %__make DESTDIR="$RPM_BUILD_ROOT" install install-swig-pl install-swig-py $python_ctypes_target $ruby_target $with_jdk
%if %with_python_ctypes %if %with_python_ctypes
# remove csvn .pyc files and recompile them because they contain the $RPM_BUILD_ROOT path: # remove csvn .pyc files and recompile them because they contain the $RPM_BUILD_ROOT path:
find "%{buildroot}%{py_sitedir}/csvn/" -name "*.pyc" | xargs %__rm -f find "%{buildroot}%{py_prefix}/lib/python%{py_ver}/site-packages/csvn/" -name "*.pyc" | xargs %__rm -f
%__python "%{py_libdir}/compileall.py" -f -d "%{py_sitedir}/csvn" "%{buildroot}/%{py_sitedir}/csvn" %__python "%{py_libdir}/compileall.py" -f -d "%{py_prefix}/lib/python%{py_ver}/site-packages/csvn" "%{buildroot}/%{py_prefix}/lib/python%{py_ver}/csvn"
%endif # with_python_ctypes %endif # with_python_ctypes
# #
# double check that the essential repository access schemes have been compiled in # double check that the essential repository access schemes have been compiled in
# #
schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep "'" | cut -d\' -f2) schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep "'" | cut -d\' -f2 | sort -u)
# reset vim syntax: ' # reset vim syntax: '
test "$schemes" = "http test "$schemes" = "file
http
https https
svn svn"
file"
# #
%perl_process_packlist %perl_process_packlist
%find_lang %name %find_lang %name
@ -586,7 +510,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
cp -avL contrib/client-side/emacs/*.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ cp -avL contrib/client-side/emacs/*.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
rm -f $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/vc-svn.el rm -f $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/vc-svn.el
# #
cp -avL %{SOURCE3} $RPM_BUILD_ROOT/usr/bin install -m 755 contrib/client-side/svnmerge/svnmerge.py $RPM_BUILD_ROOT/usr/bin/svnmerge.py
cp -avL contrib/client-side/svn_apply_autoprops.py $RPM_BUILD_ROOT/usr/bin cp -avL contrib/client-side/svn_apply_autoprops.py $RPM_BUILD_ROOT/usr/bin
# #
mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
@ -598,46 +522,22 @@ cat %name.lang > files.subversion
cat with_jdk.files >> files.subversion cat with_jdk.files >> files.subversion
# #
# tools # tools
mkdir -p $RPM_BUILD_ROOT/usr/share/subversion/ %__make DESTDIR="$RPM_BUILD_ROOT" install-tools
cp -a tools $RPM_BUILD_ROOT/usr/share/subversion/ %__mv $RPM_BUILD_ROOT%{_bindir}/svn-tools/{svn-populate-node-origins-index,svn-rep-sharing-stats,svnauthz-validate,svnmucc} $RPM_BUILD_ROOT%{_bindir}
#m -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/cvs2svn # discard all other tools
mkdir $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs %__rm -rf $RPM_BUILD_ROOT%{_bindir}/svn-tools
cp -aL contrib/client-side/svn_load_dirs/svn_load_dirs.README $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/README
cp -aL contrib/client-side/svn_load_dirs/svn_load_dirs_property_table.example $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/
sed 's:@SVN_BINDIR@:/usr/bin:' contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in > $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl
chmod 755 $RPM_BUILD_ROOT/usr/share/subversion/tools/svn_load_dirs/svn_load_dirs.pl
find $RPM_BUILD_ROOT \( -name .svn -o -name CVS -o -name tests \) -type d -print0 | xargs -0 rm -rfv
find $RPM_BUILD_ROOT \( -name "*.a" -o -name "*.c" \) -type f -print0 | xargs -0 rm -rfv
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/buildbot
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/diff
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/dist
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/hook-scripts/verify-po.py
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/po
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/server-side/*svn_dav_log_parse*
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/test-scripts
# #
# #
# #
mkdir -p $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/usr/sbin
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
cp -aL %{S:13} $RPM_BUILD_ROOT/etc/xinetd.d/svnserve install -m 644 -D %{S:13} $RPM_BUILD_ROOT/etc/xinetd.d/svnserve
cp -aL %{S:9} $RPM_BUILD_ROOT/etc/init.d/svnserve install -m 755 -D %{S:9} $RPM_BUILD_ROOT/etc/init.d/svnserve
ln -sv /etc/init.d/svnserve $RPM_BUILD_ROOT/usr/sbin/rcsvnserve ln -sv /etc/init.d/svnserve $RPM_BUILD_ROOT/usr/sbin/rcsvnserve
cp -aL %{S:10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.svnserve install -m 644 -D %{S:10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.svnserve
mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} install -m 644 -D %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve
install -m 644 %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve
#useless libtool stuff #useless libtool stuff
rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.la
pushd tools/server-side
%__install -m0755 \
svn-populate-node-origins-index \
svnauthz-validate \
"%{buildroot}%{_bindir}/"
# delete or the binaries will also be installed under /usr/share
%__rm "%{buildroot}%{_datadir}/subversion/tools/server-side"/{svn-populate-node-origins-index,svnauthz-validate}
popd #tools/server-side
if [ "$with_jdk" != "" ] ; then if [ "$with_jdk" != "" ] ; then
install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/java install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/java
ln -sv %{_libdir}/svn-javahl/svn-javahl.jar $RPM_BUILD_ROOT/%{_datadir}/java/svn-javahl.jar ln -sv %{_libdir}/svn-javahl/svn-javahl.jar $RPM_BUILD_ROOT/%{_datadir}/java/svn-javahl.jar
@ -645,19 +545,15 @@ fi
rm -f %{buildroot}/var/adm/perl-modules/subversion rm -f %{buildroot}/var/adm/perl-modules/subversion
%check %check
# Don't run regression tests on Factory, they take too long to complete. %if 0%{?suse_version} < 1210
# This check needs to be bumped with every release: ulimit -a
%if 0%{?suse_version} <= 1110
%if 0%{?sles_version} == 9
export PATH="$PWD/BUILDPATH:$PATH"
%endif # sles_version == 9
# During "make check", auth-test loads DSOs at runtime and can't find # During "make check", auth-test loads DSOs at runtime and can't find
# them if we don't set up LD_LIBRARY_PATH as below. # them if we don't set up LD_LIBRARY_PATH as below.
export LD_LIBRARY_PATH="$PWD/subversion/libsvn_auth_kwallet/.libs:$PWD/subversion/libsvn_auth_gnome_keyring/.libs:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$PWD/subversion/libsvn_auth_kwallet/.libs:$PWD/subversion/libsvn_auth_gnome_keyring/.libs:$LD_LIBRARY_PATH"
# run test over ra_local (file://) # run test over ra_local (file://)
for fstype in fsfs bdb; do CHECK_FS_TYPE=fsfs
%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$fstype" %__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$CHECK_FS_TYPE"
done
SVNSERVE_PIDFILE="$PWD/svnserve.pid" SVNSERVE_PIDFILE="$PWD/svnserve.pid"
# hook up cleanup routine # hook up cleanup routine
function on_exit { function on_exit {
@ -683,20 +579,21 @@ if [ -z "$free_port" ]; then
fi fi
# run tests over ra_svn (svn://) # run tests over ra_svn (svn://)
"$PWD/subversion/svnserve/svnserve" --listen-host 127.0.0.1 --listen-port "$free_port" --pid-file "$SVNSERVE_PIDFILE" -d -r "$PWD/subversion/tests/cmdline" "$PWD/subversion/svnserve/svnserve" --listen-host 127.0.0.1 --listen-port "$free_port" --pid-file "$SVNSERVE_PIDFILE" -d -r "$PWD/subversion/tests/cmdline"
for fstype in fsfs bdb; do %__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" BASE_URL="svn://127.0.0.1:$free_port" || cat $RPM_SOURCE_DIR/%name*/tests.log
%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$fstype" BASE_URL="svn://127.0.0.1:$free_port"
done
kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null` kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null`
%__rm "$SVNSERVE_PIDFILE" %__rm "$SVNSERVE_PIDFILE"
%if %with_java %if %with_java
%__make check-javahl %__make check-javahl
%endif # with_java %endif # with_java
%__make check-swig-pl %__make check-swig-pl
%if 0%{?suse_version} > 1140
# python bindings fail testsuite on 11.4
%__make check-swig-py %__make check-swig-py
%endif
%if %with_ruby %if %with_ruby
%__make check-swig-rb %__make check-swig-rb
%endif # with_ruby %endif # with_ruby
%endif # suse_version <= 1110 %endif
%clean %clean
%__rm -rf "%{buildroot}" %__rm -rf "%{buildroot}"
@ -741,7 +638,7 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null`
%files -f files.subversion %files -f files.subversion
%defattr(-,root,root) %defattr(-,root,root)
%doc README.SuSE BUGS CHANGES COPYING subversion/LICENSE README.mod_authz_svn %doc README.SuSE BUGS CHANGES LICENSE README.mod_authz_svn
# #
%config(noreplace) /etc/xinetd.d/svnserve %config(noreplace) /etc/xinetd.d/svnserve
%attr(754,root,root) /etc/init.d/svnserve %attr(754,root,root) /etc/init.d/svnserve
@ -758,6 +655,7 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null`
%attr(755,root,root) /usr/bin/svndiff %attr(755,root,root) /usr/bin/svndiff
%attr(755,root,root) /usr/bin/svngrep %attr(755,root,root) /usr/bin/svngrep
%attr(755,root,root) /usr/bin/svnsync %attr(755,root,root) /usr/bin/svnsync
%attr(755,root,root) /usr/bin/svnrdump
%{_libdir}/libsvn_client*.so.* %{_libdir}/libsvn_client*.so.*
%{_libdir}/libsvn_delta*.so.* %{_libdir}/libsvn_delta*.so.*
%{_libdir}/libsvn_diff*.so.* %{_libdir}/libsvn_diff*.so.*
@ -814,12 +712,12 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null`
%files tools %files tools
%defattr(-,root,root) %defattr(-,root,root)
%dir /usr/share/subversion
/usr/share/subversion/tools
%attr(755,root,root) %{_bindir}/svnmerge.py %attr(755,root,root) %{_bindir}/svnmerge.py
%attr(755,root,root) %{_bindir}/svn_apply_autoprops.py %attr(755,root,root) %{_bindir}/svn_apply_autoprops.py
%{_bindir}/svn-populate-node-origins-index %{_bindir}/svn-populate-node-origins-index
%{_bindir}/svnauthz-validate %{_bindir}/svnauthz-validate
%{_bindir}/svn-rep-sharing-stats
%{_bindir}/svnmucc
%files server %files server
%defattr(-,root,root) %defattr(-,root,root)