[packages/subversion/SUBVERSION_1_6] up to 1.6.21

[glen]

commit ff84a840b4f9fe6c2f55ecc37899536cdcc8808c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Apr 26 12:05:56 2013 +0300

    up to 1.6.21

 subversion-1.6.19-alt-g++4.7-fix.patch | 49 ----------------------------------
 subversion.spec                        |  8 +++---
 2 files changed, 3 insertions(+), 54 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index 64845d4..38a2c89 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -61,12 +61,12 @@ Summary:	A Concurrent Versioning system similar to but better than CVS
 Summary(pl.UTF-8):	System kontroli wersji podobny, ale lepszy, niż CVS
 Summary(pt_BR.UTF-8):	Sistema de versionamento concorrente
 Name:		subversion
-Version:	1.6.19
+Version:	1.6.21
 Release:	1
 License:	Apache/BSD-like
 Group:		Development/Version Control
-Source0:	http://archive.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5:	47b3734ee456fa81df5775c3aeef3f82
+Source0:	http://subversion.tigris.org/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5:	6fcf48982f3a3a53a45ea610d1a11470
 Source1:	%{name}-dav_svn.conf
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
@@ -79,7 +79,6 @@ Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-DESTDIR.patch
 Patch2:		%{name}-ruby-datadir-path.patch
 Patch3:		%{name}-tests.patch
-Patch4:		%{name}-1.6.19-alt-g++4.7-fix.patch
 URL:		http://subversion.apache.org/
 %{?with_apache:BuildRequires:	apache-devel < 2.4}
 %{?with_apache:BuildRequires:	apache-devel >= 2.2.0-8}
@@ -436,7 +435,6 @@ uwierzytelniać się przy użyciu Portfela KDE.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
-%patch4 -p1
 
 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4
 
diff --git a/subversion-1.6.19-alt-g++4.7-fix.patch b/subversion-1.6.19-alt-g++4.7-fix.patch
deleted file mode 100644
index dd1c975..0000000
--- a/subversion-1.6.19-alt-g++4.7-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
- subversion/libsvn_auth_kwallet/kwallet.cpp | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp
-index 6e5c1f0..ca19806 100644
---- a/subversion/libsvn_auth_kwallet/kwallet.cpp
-+++ b/subversion/libsvn_auth_kwallet/kwallet.cpp
-@@ -51,6 +51,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,
-@@ -175,12 +178,11 @@ kwallet_password_get(const char **password,
-   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)),
-@@ -245,12 +247,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)),
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/subversion.git/commitdiff/ff84a840b4f9fe6c2f55ecc37899536cdcc8808c