diff --git a/subversion-1.7.3.tar.bz2 b/subversion-1.7.3.tar.bz2 deleted file mode 100644 index 0579012..0000000 --- a/subversion-1.7.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f68ac8f96047a2d7775085d8c9795457feb24dafa21ac1fdeafa3b39d112fd0e -size 5956842 diff --git a/subversion-1.7.4.tar.bz2 b/subversion-1.7.4.tar.bz2 new file mode 100644 index 0000000..9b4467f --- /dev/null +++ b/subversion-1.7.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f +size 5978020 diff --git a/subversion.changes b/subversion.changes index a00e8f4..309e4fe 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Mar 8 00:00:00 UTC 2012 - andreas.stieger@gmx.de + +- update to upstream 1.7.4 + + User-visible changes: + * fix 'svn log --diff' for moved paths + * fix ra_serf problem with reading directory entries via HTTPv2 + * prepend "sqlite:" to error messages from SQLite + * fix randomly missing "Merged via" notifications in 'svn log -g' + * fix spurious conflict when merging deleted symbolic link (issue #4052) + * fix URL-to-WC copy of externals on Windows (issue #4123) + * improve an FSFS sanity-check error message + * fix regressions with symlinks pointing at externals (issue #4102) + * fix 'svn log --diff' output ordering issue on Windows + + Developer-visible changes: + * don't build mod_dontdothat if not building with httpd + * fix the testsuite to avoid FAILs on APR hash order + +------------------------------------------------------------------- +Sat Mar 3 13:20:33 UTC 2012 - andreas.stieger@gmx.de + +- add bash completion subpackage + ------------------------------------------------------------------- Tue Feb 21 20:00:27 UTC 2012 - coolo@suse.com diff --git a/subversion.spec b/subversion.spec index c68e860..4bf5432 100644 --- a/subversion.spec +++ b/subversion.spec @@ -40,8 +40,14 @@ %bcond_without regression_tests +%if 0%{?sles_version} > 10 && 0%{?sles_version} < 12 +%define with_bashcomp 0 +%else +%define with_bashcomp 1 +%endif + Name: subversion -Version: 1.7.3 +Version: 1.7.4 Release: 0 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 @@ -58,6 +64,9 @@ BuildRequires: python-devel BuildRequires: python-xml BuildRequires: update-alternatives BuildRequires: zlib-devel +%if %with_bashcomp +BuildRequires: bash-completion +%endif #with_bashcomp %if %with_python_ctypes BuildRequires: ctypesgen %endif @@ -284,6 +293,23 @@ client is svn. %endif # with_gnome_keyring +%if %with_bashcomp + +%package bash-completion +Summary: Bash Completion for %{name} +Group: Development/Tools/Version Control +Requires: %{name} = %{version} +Requires: bash-completion +%if %{?suse_version} >= 1130 +BuildArch: noarch +%endif + +%description bash-completion +Bash command line completion support for %{name} - completion of subcommands, +parameters and keywords for the svn command and other tools. + +%endif # with_bashcomp + %prep %if %with_intree_swig %setup -q -n subversion-%{version} -a 4 -b 90 @@ -550,6 +576,10 @@ if [ "$with_jdk" != "" ] ; then fi rm -f %{buildroot}/var/adm/perl-modules/subversion +%if %with_bashcomp +%__install -D -m0644 tools/client-side/bash_completion "%{buildroot}/etc/bash_completion.d/%{name}" +%endif #with_bashcomp + %check %if %{with regression_tests} @@ -754,4 +784,11 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null` %{_libdir}/libsvn_auth_kwallet-1.so.0.* %endif # with_kde4_kwallet +%if %with_bashcomp + +%files bash-completion +%defattr(-,root,root) +%config %{_sysconfdir}/bash_completion.d/%{name} +%endif #with_bashcomp + %changelog