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

- update to 1.7.1

Browse Source 
* 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

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=77
This commit is contained in:
Dirk Mueller 2011-10-23 19:17:14 +00:00 committed by Git OBS Bridge
parent 7bd112da30
commit eff6c3577a
15 changed files with 66 additions and 200 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

11
fix-swig-building.diff
View File

@ -1,11 +0,0 @@
--- subversion/bindings/swig/perl/native/Makefile.PL.in
+++ subversion/bindings/swig/perl/native/Makefile.PL.in
@@ -43,7 +43,7 @@
my %config = (
ABSTRACT => 'Perl bindings for Subversion',
DEFINE => $cppflags,
- CCFLAGS => $cflags,
+ CCFLAGS => join(' ', $cflags, $Config{ccflags}),
INC => join(' ',$apr_cflags, $apu_cflags,
" -I$swig_srcdir/perl/libsvn_swig_perl",
" -I$svnlib_srcdir/include",

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 "

11
subversion.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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 Fri Oct 21 18:01:34 CEST 2011 - dmueller@suse.de

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@

60
subversion.spec
View File

@ -33,11 +33,12 @@
%bcond_with subversion_libserf_support %bcond_with subversion_libserf_support
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
%define sqlite_pkg_version 3070603
BuildRequires: apache2-devel db-devel file-devel gcc-c++ libstdc++-devel zlib-devel BuildRequires: apache2-devel db-devel file-devel gcc-c++ libstdc++-devel zlib-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python-devel python-xml BuildRequires: python-devel python-xml
@ -101,6 +102,7 @@ Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.
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
@ -115,7 +117,7 @@ BuildRequires: swig
%endif %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: sqlite3-devel >= %{sqlite_version} BuildRequires: sqlite3-devel >= %{sqlite_version}
%requires_ge libsqlite3-0 %requires_ge libsqlite3-0
@ -123,18 +125,13 @@ BuildRequires: sqlite3-devel >= %{sqlite_version}
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
Patch39: fix-swig-building.diff
# #
%if %with_ruby %if %with_ruby
%if %{!?rb_arch:1}0 %if %{!?rb_arch:1}0
@ -174,7 +171,7 @@ 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
@ -183,7 +180,7 @@ This package contains some tools for subversion server and
repository admins. repository admins.
%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}
@ -196,7 +193,7 @@ 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}
@ -220,7 +217,7 @@ Provides high-level Python support for Subversion, based on ctypes.
%if %with_ruby %if %with_ruby
%package ruby %package ruby
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 Ruby scripts to directly use Subversion repositories Summary: Allows Ruby scripts to directly use Subversion repositories
Requires: subversion = %{version} Requires: subversion = %{version}
@ -233,7 +230,7 @@ Provides Ruby (SWIG) support for Subversion.
%endif # with_ruby %endif # with_ruby
%package server %package server
License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html License: ASLv2
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Summary: Apache server module for Subversion server Summary: Apache server module for Subversion server
Requires: subversion = %{version} apache2 %{apache_mmn} Requires: subversion = %{version} apache2 %{apache_mmn}
@ -242,14 +239,14 @@ 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: ASLv2 ; 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
@ -261,7 +258,7 @@ Provides KWallet integration for Subversion.
%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: ASLv2 ; 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
@ -276,31 +273,26 @@ client is svn.
%prep %prep
%if %with_intree_swig %if %with_intree_swig
%setup -q -n subversion-%{version} -b 90 %setup -q -n subversion-%{version} -a 4 -b 90
%else %else
%setup -q -n subversion-%{version} %setup -q -n subversion-%{version} -a 4
%endif %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
%patch23 -p0 %patch23 -p0
%patch31 %patch31
%patch33
%patch35
%patch36 -p0
%patch37 %patch37
%patch38 %patch38
%patch39 -p0
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\")
#" #"
@ -449,6 +441,7 @@ export PATH="${SWIG_ROOT}/bin:${PATH}"
--with-kwallet \ --with-kwallet \
%endif %endif
--disable-mod-activation \ --disable-mod-activation \
--with-libmagic \
--disable-static --disable-static
%__make %{?jobs:-j%jobs} SWIG_LDFLAGS= %__make %{?jobs:-j%jobs} SWIG_LDFLAGS=
# #
@ -465,6 +458,7 @@ 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
%install %install
@ -509,7 +503,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
@ -522,8 +516,7 @@ cat with_jdk.files >> files.subversion
# #
# tools # tools
%__make DESTDIR="$RPM_BUILD_ROOT" install-tools %__make DESTDIR="$RPM_BUILD_ROOT" install-tools
# add svn-rep-sharing-stats,svnmucc,svnauthz-validate for subversion 1.7! %__mv $RPM_BUILD_ROOT%{_bindir}/svn-tools/{svn-populate-node-origins-index,svn-rep-sharing-stats,svnauthz-validate,svnmucc} $RPM_BUILD_ROOT%{_bindir}
# %__mv $RPM_BUILD_ROOT%{_bindir}/svn-tools/{svn-populate-node-origins-index} $RPM_BUILD_ROOT%{_bindir}
# discard all other tools # discard all other tools
%__rm -rf $RPM_BUILD_ROOT%{_bindir}/svn-tools %__rm -rf $RPM_BUILD_ROOT%{_bindir}/svn-tools
# #
@ -638,7 +631,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
@ -655,6 +648,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.*
@ -713,8 +707,10 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null`
%defattr(-,root,root) %defattr(-,root,root)
%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)