diff --git a/sqlite-amalgamation-3.6.13.tar.bz2 b/sqlite-amalgamation-3.6.13.tar.bz2 new file mode 100644 index 0000000..443c122 --- /dev/null +++ b/sqlite-amalgamation-3.6.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfc36a45ae38a63e4992934997f925e305e9fe8c07a67ba8cfb608dd88338df1 +size 1196862 diff --git a/sqlite-amalgamation-3.6.17.tar.bz2 b/sqlite-amalgamation-3.6.17.tar.bz2 deleted file mode 100644 index 1c3ce19..0000000 --- a/sqlite-amalgamation-3.6.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6401c219496b777b220ecf873d9ebd2003cbfd0da9e78b7ffc4d8b9eae4c9d8b -size 1015309 diff --git a/subversion-1.6.12.tar.bz2 b/subversion-1.6.12.tar.bz2 new file mode 100644 index 0000000..61483cc --- /dev/null +++ b/subversion-1.6.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ebf17fb173ff9c482a72deaaf756c3ca595c99da15fc8f1f8f4310609284c8f +size 5476628 diff --git a/subversion-1.6.9.tar.bz2 b/subversion-1.6.9.tar.bz2 deleted file mode 100644 index ccb8639..0000000 --- a/subversion-1.6.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c -size 5478554 diff --git a/subversion-ctypes-remove_shebang.patch b/subversion-ctypes-remove_shebang.patch index 8643912..e7e2da4 100644 --- a/subversion-ctypes-remove_shebang.patch +++ b/subversion-ctypes-remove_shebang.patch @@ -1,5 +1,5 @@ ---- subversion/bindings/ctypes-python/csvn/core/__init__.py.orig 2009-03-30 15:16:52.000000000 +0200 -+++ subversion/bindings/ctypes-python/csvn/core/__init__.py 2009-03-30 15:17:11.000000000 +0200 +--- 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 - diff --git a/subversion-fix_nonvoid_function_without_return.patch b/subversion-fix_nonvoid_function_without_return.patch index 2b39dd9..220dc14 100644 --- a/subversion-fix_nonvoid_function_without_return.patch +++ b/subversion-fix_nonvoid_function_without_return.patch @@ -1,6 +1,6 @@ ---- subversion/bindings/javahl/native/EnumMapper.cpp.orig 2009-04-30 01:40:36.000000000 +0200 -+++ subversion/bindings/javahl/native/EnumMapper.cpp 2009-04-30 01:40:50.000000000 +0200 -@@ -497,6 +497,7 @@ +--- 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: diff --git a/subversion-no-build-date.patch b/subversion-no-build-date.patch new file mode 100644 index 0000000..19a96d9 --- /dev/null +++ b/subversion-no-build-date.patch @@ -0,0 +1,14 @@ +--- subversion/libsvn_subr/opt.c.orig ++++ subversion/libsvn_subr/opt.c +@@ -965,9 +965,8 @@ svn_opt__print_version_info(const char * + if (quiet) + return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER); + +- SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n" +- " compiled %s, %s\n\n"), pgm_name, +- SVN_VERSION, __DATE__, __TIME__)); ++ SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"), pgm_name, ++ SVN_VERSION)); + SVN_ERR(svn_cmdline_fputs(_("Copyright (C) 2000-2009 CollabNet.\n" + "Subversion is open source software, see" + " http://subversion.tigris.org/\n" diff --git a/subversion-swig-perl-install_vendor.patch b/subversion-swig-perl-install_vendor.patch index ef3f343..ed45e5b 100644 --- a/subversion-swig-perl-install_vendor.patch +++ b/subversion-swig-perl-install_vendor.patch @@ -1,9 +1,9 @@ Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/Makefile.in -+++ b/Makefile.in -@@ -652,7 +652,7 @@ check-swig-pl: swig-pl swig-pl-lib +--- Makefile.in.orig ++++ Makefile.in +@@ -691,7 +691,7 @@ check-swig-pl: swig-pl swig-pl-lib cd $(SWIG_PL_DIR)/native; $(MAKE) test install-swig-pl: swig-pl install-swig-pl-lib diff --git a/subversion.changes b/subversion.changes index 44c385f..cf45deb 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Mon Sep 20 16:22:25 UTC 2010 - cristian.rodriguez@opensuse.org + +- Do not include build date in binaries +- refresh patches + +------------------------------------------------------------------- +Tue Jun 22 21:50:10 UTC 2010 - pascal.bleser@opensuse.org + +- update to 1.6.12: + * further improvements for issue #3242 ("Subversion demands unnecessary access to parent directories of operations") + * allow deletion of uris which need character escaping (issue #3636) + * fix errors with 'svn mkdir --parents' (issue #3649) + * update address to which crash reports are sent (r901304) + * fix handling of peg revision'd copy targets (issue #3651) + * more improvements to 'svn merge --reintegrate' (r935631) + * allow copying of broken symlinks (issue #3303) + * improve rep-sharing performance on high-concurrency repos (issue #3506) + * fixed: added subtrees with mergeinfo break reintegrate (issue #3654) + * fixed: assertion triggered by tree-conflicted externals (issue #3469) + +- rolling back the in-tree sqlite-amalgamation from 3.6.17 to 3.6.13 (which is the version recommended by upstream) + +- added check in spec file to make sure we use the recommended sqlite (-amalgamation) version + +------------------------------------------------------------------- +Sun Apr 18 20:22:23 UTC 2010 - pascal.bleser@opensuse.org + +- update to 1.6.11: + * fix for repositories mounted via NFS + * enable TCP keep-alives in svnserve + * tighten restrictions on revprops for 'svnadmin verify' + * make ra_serf give better out-of-date information + * improve error message upon connection failure with svn+ssh:// + * allow 'svn log' on an uncommitted copy/move destination + * make 'svnadmin hotcopy' copy the fsfs config file + * mergeinfo improvements with non-inheritable mergeinfo + * make mergeinfo queries not require access to the repo root + * update URLs to refer the the new apache.org repository + * update relative externals during a switch + * fix 'merge --reintegrate' with self-referential mergeinfo + * improve wc-ng working copy detection + * improve handling of mergeinfo when using serf + * fixed: 'svnlook plist --revprop' with '-t TXN_NAME' + * fixed: file external from URL cannot overwrite existing item + * fixed: potential memory error in 'svn status' + * fixed: merge records mergeinfo from natural history gaps + * fixed: theoretical possibility of DB corruption + ------------------------------------------------------------------- Sun Jan 24 00:43:33 UTC 2010 - pascal.bleser@opensuse.org diff --git a/subversion.header_wrappers.patch b/subversion.header_wrappers.patch index c79f01f..23ae40f 100644 --- a/subversion.header_wrappers.patch +++ b/subversion.header_wrappers.patch @@ -8,8 +8,8 @@ build/generator/swig/header_wrappers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---- a/build/generator/swig/header_wrappers.py -+++ b/build/generator/swig/header_wrappers.py +--- 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)) diff --git a/subversion.java14.patch b/subversion.java14.patch index 2f4f8a5..bcf34db 100644 --- a/subversion.java14.patch +++ b/subversion.java14.patch @@ -3,9 +3,9 @@ subversion/bindings/javahl/build/build.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---- a/configure.ac -+++ b/configure.ac -@@ -539,7 +539,7 @@ fi +--- 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. @@ -14,8 +14,8 @@ # SVN_CHECK_JDK sets $JAVA_CLASSPATH SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER) ---- a/subversion/bindings/javahl/build/build.xml -+++ b/subversion/bindings/javahl/build/build.xml +--- subversion/bindings/javahl/build/build.xml.orig ++++ subversion/bindings/javahl/build/build.xml @@ -21,7 +21,7 @@ +# Copyright (c) 2009-2010 Pascal Bleser # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,11 +41,11 @@ %endif # suse_version > 1030 Name: subversion -Version: 1.6.9 +Version: 1.6.12 Release: 1 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 -%define sqlite_version 3.6.17 +%define sqlite_version 3.6.13 %if 0%{?suse_version} > 910 BuildRequires: update-alternatives %endif # suse_version > 910 @@ -126,7 +126,7 @@ PreReq: %insserv_prereq %fillup_prereq # Summary: A Concurrent Versioning system similar to but better than CVS BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: Subversion license, http://subversion.tigris.org/license-1.html +License: ASLv2 Group: Development/Tools/Version Control Url: http://subversion.tigris.org Source0: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2 @@ -158,6 +158,7 @@ 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 # %if %with_ruby %if %{!?rb_arch:1}0 @@ -182,7 +183,7 @@ client is svn. %package devel -License: ASLv.. +License: ASLv2 Group: Development/Libraries/C and C++ Summary: Development package for Subversion developers Requires: subversion = %{version} @@ -196,7 +197,7 @@ files for developers interacting with the subversion package. %package tools -License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html +License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Tools for Subversion @@ -224,9 +225,10 @@ http://subversion.tigris.org/tools_contrib.html %package perl License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html 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: perl >= 5.8 +Requires: perl = %{perl_version} %description perl Provides Perl (SWIG) support for Subversion. @@ -236,7 +238,7 @@ Provides Perl (SWIG) support for Subversion. %package python License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html 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} %if 0%{?sles_version} == 9 Requires: python25 @@ -264,7 +266,7 @@ Provides high-level Python support for Subversion, based on ctypes. %package ruby License: Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html 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} %description ruby @@ -275,7 +277,7 @@ Provides Ruby (SWIG) support for Subversion. %endif # with_ruby %package server -License: ASLv.. +License: ASLv2 Group: Development/Tools/Version Control Summary: Apache server module for Subversion server Requires: subversion = %{version} apache2 %{apache_mmn} @@ -334,19 +336,27 @@ popd #./sqlite-amalgamation %patch11 -p0 %patch12 -p0 # -%patch20 -p1 +%patch20 %if 0%{?suse_version} > 930 %patch23 -p0 %endif -%patch31 -p1 -%patch33 -p1 -%patch35 -p1 +%patch31 +%patch33 +%patch35 %patch36 -p0 +%patch37 %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" = "%{sqlite_version}" ] || { + echo "ERROR: recommended sqlite version is $SQLITE_RECOMMENDED_VER, but we're using %{sqlite_version}" >&2; + exit 1; +} + %build # This package failed when testing with -Wl,-as-needed being default. # So we disable it here, if you want to retest, just delete this comment and the line below.