Hello community,
here is the log from the commit of package subversion for openSUSE:Factory
checked in at 2012-01-05 13:51:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subversion (Old)
and /work/SRC/openSUSE:Factory/.subversion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion", Maintainer is "dmuel...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2011-12-12
17:04:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes
2012-01-05 13:51:54.000000000 +0100
@@ -1,0 +2,20 @@
+Wed Dec 21 18:57:10 UTC 2011 - andreas.stie...@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
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.6SUfEs/_old 2012-01-05 13:51:56.000000000 +0100
+++ /var/tmp/diff_new_pack.6SUfEs/_new 2012-01-05 13:51:56.000000000 +0100
@@ -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 @@
#
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 @@
%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 @@
%package tools
-License: ASLv2
+License: Apache-2
Group: Development/Tools/Version Control
Summary: Tools for Subversion
@@ -186,7 +188,7 @@
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 @@
%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 @@
%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 @@
%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 @@
%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 @@
%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 @@
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 @@
%if %with_ruby
%__make check-swig-rb
%endif # with_ruby
-%endif
+
+%endif # suse_version
+
+%endif # with regression_tests
%clean
%__rm -rf "%{buildroot}"
++++++ subversion-neon-systemproxy.patch ++++++
--- /var/tmp/diff_new_pack.6SUfEs/_old 2012-01-05 13:51:56.000000000 +0100
+++ /var/tmp/diff_new_pack.6SUfEs/_new 2012-01-05 13:51:56.000000000 +0100
@@ -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 @@
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
++++++ subversion-no-build-date.patch ++++++
--- /var/tmp/diff_new_pack.6SUfEs/_old 2012-01-05 13:51:56.000000000 +0100
+++ /var/tmp/diff_new_pack.6SUfEs/_new 2012-01-05 13:51:56.000000000 +0100
@@ -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);
++++++ subversion-swig-perl-install_vendor.patch ++++++
--- /var/tmp/diff_new_pack.6SUfEs/_old 2012-01-05 13:51:56.000000000 +0100
+++ /var/tmp/diff_new_pack.6SUfEs/_new 2012-01-05 13:51:56.000000000 +0100
@@ -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
++++++ subversion.libtool-pie-flags.patch ++++++
--- /var/tmp/diff_new_pack.6SUfEs/_old 2012-01-05 13:51:56.000000000 +0100
+++ /var/tmp/diff_new_pack.6SUfEs/_new 2012-01-05 13:51:56.000000000 +0100
@@ -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
++++++ subversion.libtool-verbose.patch ++++++
--- /var/tmp/diff_new_pack.6SUfEs/_old 2012-01-05 13:51:56.000000000 +0100
+++ /var/tmp/diff_new_pack.6SUfEs/_new 2012-01-05 13:51:56.000000000 +0100
@@ -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@
++++++ subversion.perl.LD_RUN_PATH.patch ++++++
--- /var/tmp/diff_new_pack.6SUfEs/_old 2012-01-05 13:51:56.000000000 +0100
+++ /var/tmp/diff_new_pack.6SUfEs/_new 2012-01-05 13:51:56.000000000 +0100
@@ -6,9 +6,11 @@
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
