diff --git a/subversion-neon-systemproxy.patch b/subversion-neon-systemproxy.patch index d775852..c28a7e6 100644 --- a/subversion-neon-systemproxy.patch +++ b/subversion-neon-systemproxy.patch @@ -1,8 +1,8 @@ Index: subversion/libsvn_ra_neon/session.c =================================================================== ---- subversion/libsvn_ra_neon/session.c.orig -+++ subversion/libsvn_ra_neon/session.c -@@ -885,6 +885,17 @@ svn_ra_neon__open(svn_ra_session_t *sess +--- subversion/libsvn_ra_neon/session.c.orig 2011-12-21 17:36:12.000000000 +0000 ++++ subversion/libsvn_ra_neon/session.c 2011-12-21 17:36:17.000000000 +0000 +@@ -910,6 +910,17 @@ svn_ra_neon__open(svn_ra_session_t *sess } #endif } @@ -22,25 +22,13 @@ Index: subversion/libsvn_ra_neon/session.c timeout = DEFAULT_HTTP_TIMEOUT; Index: build/ac-macros/neon.m4 =================================================================== ---- build/ac-macros/neon.m4.orig -+++ build/ac-macros/neon.m4 -@@ -69,6 +69,11 @@ AC_DEFUN(SVN_LIB_NEON, +--- build/ac-macros/neon.m4.orig 2011-12-21 17:36:12.000000000 +0000 ++++ build/ac-macros/neon.m4 2011-12-21 17:38:02.000000000 +0000 +@@ -100,6 +100,11 @@ AC_DEFUN(SVN_NEON_CONFIG, [Define to 1 if you have Neon 0.28 or later.]) fi -+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.29\.'`"] ; then -+ AC_DEFINE_UNQUOTED([SVN_NEON_0_29], [1], -+ [Define to 1 if you have Neon 0.29 or later.]) -+ fi -+ - for svn_allowed_neon in $NEON_ALLOWED_LIST; do - if test -n "`echo "$NEON_VERSION" | grep "^$svn_allowed_neon"`" || - test "$svn_allowed_neon" = "any"; then -@@ -160,6 +165,11 @@ AC_DEFUN(SVN_NEON_CONFIG, - [Define to 1 if you have Neon 0.28 or later.]) - fi - -+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.29\.'`"] ; then ++ if test -n ["`echo "$NEON_VERSION" | $EGREP '^0\.(29|3[0-9])\.'`"] ; then + AC_DEFINE_UNQUOTED([SVN_NEON_0_29], [1], + [Define to 1 if you have Neon 0.29 or later.]) + fi diff --git a/subversion-no-build-date.patch b/subversion-no-build-date.patch index 2280147..b6aa675 100644 --- a/subversion-no-build-date.patch +++ b/subversion-no-build-date.patch @@ -1,6 +1,8 @@ ---- subversion/libsvn_subr/opt.c.orig -+++ subversion/libsvn_subr/opt.c -@@ -1069,9 +1069,8 @@ +Index: subversion/libsvn_subr/opt.c +=================================================================== +--- subversion/libsvn_subr/opt.c.orig 2011-06-24 16:55:09.000000000 +0100 ++++ subversion/libsvn_subr/opt.c 2011-12-21 17:32:39.000000000 +0000 +@@ -1070,9 +1070,8 @@ svn_opt__print_version_info(const char * if (quiet) return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER); diff --git a/subversion-swig-perl-install_vendor.patch b/subversion-swig-perl-install_vendor.patch index ed45e5b..78249f4 100644 --- a/subversion-swig-perl-install_vendor.patch +++ b/subversion-swig-perl-install_vendor.patch @@ -1,9 +1,11 @@ Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- Makefile.in.orig -+++ Makefile.in -@@ -691,7 +691,7 @@ check-swig-pl: swig-pl swig-pl-lib +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2011-12-21 17:32:20.000000000 +0000 ++++ Makefile.in 2011-12-21 17:32:27.000000000 +0000 +@@ -756,7 +756,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 82f2787..6285196 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Dec 21 18:57:10 UTC 2011 - andreas.stieger@gmx.de + +- update license to Apache-2 +- run regression tests for 12.1 again +- allow builds --without regression_tests +- subversion.libtool-verbose.patch + refresh for moved source lines +- subversion-swig-perl-install_vendor.patch + refresh for moved source lines +- subversion.libtool-pie-flags.patch + refresh for moved source lines +- subversion.perl.LD_RUN_PATH.patch + refresh for moved source lines +- subversion-no-build-date.patch + refresh for moved source lines +- subversion-neon-systemproxy.patch + adjust to changed upstream sources, remove one chunk which would + create duplicated lines in patched result + ------------------------------------------------------------------- Tue Dec 6 00:06:20 UTC 2011 - andreas.stieger@gmx.de diff --git a/subversion.libtool-pie-flags.patch b/subversion.libtool-pie-flags.patch index 0d11546..1863cab 100644 --- a/subversion.libtool-pie-flags.patch +++ b/subversion.libtool-pie-flags.patch @@ -1,6 +1,8 @@ ---- Makefile.in.orig 2011-06-16 17:36:40.624000428 +0200 -+++ Makefile.in 2011-06-16 17:49:24.352000431 +0200 -@@ -227,8 +227,8 @@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2011-12-21 17:32:27.000000000 +0000 ++++ Makefile.in 2011-12-21 17:32:31.000000000 +0000 +@@ -231,8 +231,8 @@ libsvn_subr_LDFLAGS = @libsvn_subr_LDFLA libsvn_wc_LDFLAGS = @libsvn_wc_LDFLAGS@ # Compilation of SWIG-generated C source code diff --git a/subversion.libtool-verbose.patch b/subversion.libtool-verbose.patch index 6558507..ad97aba 100644 --- a/subversion.libtool-verbose.patch +++ b/subversion.libtool-verbose.patch @@ -1,6 +1,8 @@ ---- Makefile.in.orig 2011-05-26 10:58:42.000000000 +0200 -+++ Makefile.in 2011-06-16 17:30:00.724000428 +0200 -@@ -111,8 +111,8 @@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2011-07-16 12:50:53.000000000 +0100 ++++ Makefile.in 2011-12-21 17:32:20.000000000 +0000 +@@ -112,8 +112,8 @@ EXEEXT = @EXEEXT@ SHELL = @SHELL@ LIBTOOL = @SVN_LIBTOOL@ diff --git a/subversion.perl.LD_RUN_PATH.patch b/subversion.perl.LD_RUN_PATH.patch index b8bbd9d..15dbcc9 100644 --- a/subversion.perl.LD_RUN_PATH.patch +++ b/subversion.perl.LD_RUN_PATH.patch @@ -6,9 +6,11 @@ ERROR: RPATH "/usr/src/packages/BUILD/subversion-1.5.x/subversion/libsvn_subr/.l Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- Makefile.in.orig 2011-02-24 13:08:55.738946798 +0100 -+++ Makefile.in 2011-02-24 13:16:28.567572756 +0100 -@@ -685,7 +685,7 @@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2011-12-21 17:32:31.000000000 +0000 ++++ Makefile.in 2011-12-21 17:32:35.000000000 +0000 +@@ -736,7 +736,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL diff --git a/subversion.spec b/subversion.spec index 676eb4e..432d033 100644 --- a/subversion.spec +++ b/subversion.spec @@ -38,6 +38,8 @@ %bcond_without subversion_libserf_support %endif +%bcond_without regression_tests + Name: subversion Version: 1.7.2 Release: 1 @@ -101,7 +103,7 @@ PreReq: %insserv_prereq %fillup_prereq # Summary: Subversion version control system BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: ASLv2 +License: Apache-2 Group: Development/Tools/Version Control Url: http://subversion.apache.org Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2 @@ -163,7 +165,7 @@ to large-scale enterprise operations. %package devel -License: ASLv2 +License: Apache-2 Group: Development/Libraries/C and C++ Summary: Development package for Subversion developers Requires: subversion = %{version} @@ -177,7 +179,7 @@ files for developers interacting with the subversion package. %package tools -License: ASLv2 +License: Apache-2 Group: Development/Tools/Version Control Summary: Tools for Subversion @@ -186,7 +188,7 @@ This package contains some tools for subversion server and repository admins. %package perl -License: ASLv2 +License: Apache-2 Group: Development/Tools/Version Control Summary: Allows Perl scripts to directly use Subversion repositories Requires: subversion = %{version} @@ -199,7 +201,7 @@ Provides Perl (SWIG) support for Subversion. %package python -License: ASLv2 +License: Apache-2 Group: Development/Tools/Version Control Summary: Allows Python scripts to directly use Subversion repositories Requires: subversion = %{version} @@ -223,7 +225,7 @@ Provides high-level Python support for Subversion, based on ctypes. %if %with_ruby %package ruby -License: ASLv2 +License: Apache-2 Group: Development/Tools/Version Control Summary: Allows Ruby scripts to directly use Subversion repositories Requires: subversion = %{version} @@ -236,7 +238,7 @@ Provides Ruby (SWIG) support for Subversion. %endif # with_ruby %package server -License: ASLv2 +License: Apache-2 Group: Development/Tools/Version Control Summary: Apache server module for Subversion server Requires: subversion = %{version} apache2 %{apache_mmn} @@ -252,7 +254,7 @@ http://subversion.apache.org %if %with_kde4_kwallet %package -n libsvn_auth_kwallet-1-0 -License: ASLv2 +License: Apache-2 Summary: A Concurrent Versioning system similar to but better than CVS Group: Development/Tools/Version Control @@ -264,7 +266,7 @@ Provides KWallet integration for Subversion. %if %with_gnome_keyring %package -n libsvn_auth_gnome_keyring-1-0 -License: ASLv2 +License: Apache-2 Summary: A Concurrent Versioning system similar to but better than CVS Group: Development/Tools/Version Control @@ -544,7 +546,10 @@ fi rm -f %{buildroot}/var/adm/perl-modules/subversion %check -%if 0%{?suse_version} < 1210 + +%if %{with regression_tests} + +%if 0%{?suse_version} < 1220 ulimit -a # 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. @@ -592,7 +597,10 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null` %if %with_ruby %__make check-swig-rb %endif # with_ruby -%endif + +%endif # suse_version + +%endif # with regression_tests %clean %__rm -rf "%{buildroot}"