Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at 2012-06-12 07:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subversion (Old) and /work/SRC/openSUSE:Factory/.subversion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2012-06-01 07:24:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes 2012-06-12 07:16:33.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 7 17:08:01 UTC 2012 - [email protected] + +- add subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch from trunk + to fix build with gcc 4.7 +- move checks for schemes handled by ra modules into %check section +- do not run regression tests by default: + * too many failed builds + * doesn't include http tests +- only require iproute2 when running regression tests + +------------------------------------------------------------------- New: ---- subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.palAMe/_old 2012-06-12 07:16:35.000000000 +0200 +++ /var/tmp/diff_new_pack.palAMe/_new 2012-06-12 07:16:35.000000000 +0200 @@ -35,13 +35,8 @@ %bcond_without serf -# do not run regression tests for Factory, unless --with=regression_tests -%if 0%{?suse_version} > 1210 +# run build --with=regression_tests to run test suite %bcond_with regression_tests -%else -# run regression tests for previous releases, unless --without=regression_tests -%bcond_without regression_tests -%endif # suse_version %if 0%{?sles_version} > 10 && 0%{?sles_version} < 12 %define with_bashcomp 0 @@ -109,8 +104,10 @@ BuildRequires: neon-devel BuildRequires: openldap2-devel %endif # suse_version > 1030 -# for %check section, to find a free port: +%if %{with regression_tests} +# for check section, to find a free port: BuildRequires: iproute2 +%endif # with regression_tests # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -165,6 +162,8 @@ Patch38: subversion-neon-systemproxy.patch # PATCH-FIX-UPSTREAM subversion-1.7.4-ruby-1.9-RbConfig.patch [email protected] -- Fixes warning/error in ruby 1.9 "Use RbConfig instead of obsolete and deprecated Config" Patch39: subversion-1.7.4-ruby-1.9-RbConfig.patch +# PATCH-FIX-UPSTREAM subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch [email protected] -- Remove a cast that is both ugly, and apparently illegal in g++ 4.7. +Patch40: subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch # %if %with_ruby %if %{!?rb_arch:1}0 @@ -338,6 +337,7 @@ %patch37 %patch38 %patch39 +%patch40 SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\") #" @@ -530,27 +530,6 @@ find "%{buildroot}%{py_prefix}/lib/python%{py_ver}/site-packages/csvn/" -name "*.pyc" | xargs %__rm -f %__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 -# -# 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 | sort -u) -# reset vim syntax: ' -test "$schemes" = "file -http -https -svn" -# -%if %{with serf} -# -# double check that when building with serf support, ra_serf is actually available and handles http and https schemes -# -serf_schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep -A2 "ra_serf" | %__grep "'" | cut -d\' -f2 ) -# reset vim syntax: ' -test "$serf_schemes" = "http -https" -# -%endif # with serf -# %perl_process_packlist %find_lang %name @@ -602,6 +581,28 @@ %check +# +# 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 | sort -u) +# reset vim syntax: ' +test "$schemes" = "file +http +https +svn" +# +%if %{with serf} +# +# double check that when building with serf support, ra_serf is actually available and handles http and https schemes +# +serf_schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep -A2 "ra_serf" | %__grep "'" | cut -d\' -f2 ) +# reset vim syntax: ' +test "$serf_schemes" = "http +https" +# +%endif # with serf +# + %if %{with regression_tests} ulimit -a ++++++ subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch ++++++ svn diff -c1345740 https://svn.apache.org/repos/asf/subversion/trunk r1345740 | peters | 2012-06-03 19:54:26 +0100 (Sun, 03 Jun 2012) | 7 lines Changed paths: M /subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Remove a cast that is both ugly, and apparently illegal in g++ 4.7. * subversion/libsvn_auth_kwallet/kwallet.cpp (q_argc, q_argv): New. (kwallet_password_get, kwallet_password_set): Use q_argc and q_argv instead of trying to open-code them. Index: subversion/libsvn_auth_kwallet/kwallet.cpp =================================================================== --- subversion/libsvn_auth_kwallet/kwallet.cpp.orig 2010-12-30 20:46:50.000000000 +0000 +++ subversion/libsvn_auth_kwallet/kwallet.cpp 2012-06-07 18:01:02.000000000 +0100 @@ -60,6 +60,9 @@ /* KWallet simple provider, puts passwords in KWallet */ /*-----------------------------------------------------------------------*/ +static int q_argc = 1; +static char q_argv0[] = "svn"; // Build non-const char * from string constant +static char *q_argv[] = { q_argv0 }; static const char * get_application_name(apr_hash_t *parameters, @@ -203,12 +206,11 @@ kwallet_password_get(const char **passwo QCoreApplication *app; if (! qApp) { - int argc = 1; - app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); + int argc = q_argc; + app = new QCoreApplication(argc, q_argv); } - KCmdLineArgs::init(1, - (char *[1]) {(char *) "svn"}, + KCmdLineArgs::init(q_argc, q_argv, get_application_name(parameters, pool), "subversion", ki18n(get_application_name(parameters, pool)), @@ -273,12 +275,11 @@ kwallet_password_set(apr_hash_t *creds, QCoreApplication *app; if (! qApp) { - int argc = 1; - app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); + int argc = q_argc; + app = new QCoreApplication(argc, q_argv); } - KCmdLineArgs::init(1, - (char *[1]) {(char *) "svn"}, + KCmdLineArgs::init(q_argc, q_argv, get_application_name(parameters, pool), "subversion", ki18n(get_application_name(parameters, pool)), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
