rpms
/
subversion
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'unstable'

This commit is contained in:
Joe Orton 2020-06-01 16:09:57 +01:00
parent 9feed5d046 8ee227cefc
commit 775848c5c0
4 changed files with 45 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clog2markdown
View File

@ -8,10 +8,10 @@ echo
curl --silent -n "http://svn.apache.org/repos/asf/subversion/tags/$1/CHANGES" | \
sed -n "
/^#/d;
/^Version $1/,/^Version /{
/^Version ${1/-rc*/}/,/^Version /{
/, from \/branches/d;
/repos\/asf\/subversion\/tags/d;
s,#\([0-9]*\),[issue \1](https://issues.apache.org/jira/browse/SVN-\1),;
s,#\([0-9]*\),[SVN-\1](https://issues.apache.org/jira/browse/SVN-\1),;
s/(r[0-9, retal]+)\*//g;
s/^ *//;
s/ +/ /g;

2
sources
View File

@ -1 +1 @@
SHA512 (subversion-1.12.2.tar.bz2) = b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136
SHA512 (subversion-1.14.0-rc2.tar.bz2) = 149e961939bf12aafa8b545b3bd1713dfee95d05134b500a8e4279cd1719528f13ff4fdda7ed77ce74630dbd2390f9c7cfcd0a0595f92d95c4ba914f8bd3a76c

44
subversion-1.12.2-py3tests.patch
View File

@ -1,44 +0,0 @@
Fix tests for Python 3.
--- subversion-1.12.2/subversion/tests/cmdline/svnadmin_tests.py.py3tests
+++ subversion-1.12.2/subversion/tests/cmdline/svnadmin_tests.py
@@ -3859,7 +3859,7 @@
sbox.repo_url)
dump_lines = svntest.actions.run_and_verify_dump(sbox.repo_dir)
- assert propval + '\n' in dump_lines
+ assert bytes(propval, 'utf-8') + b'\n' in dump_lines
def check_recover_prunes_rep_cache(sbox, enable_rep_sharing):
"""Check 'recover' prunes the rep-cache while enable-rep-sharing is
--- subversion-1.12.2/subversion/tests/cmdline/svntest/verify.py.py3tests
+++ subversion-1.12.2/subversion/tests/cmdline/svntest/verify.py
@@ -135,11 +135,17 @@
actual = [actual]
if self.match_all:
+ if len(expected) and len(actual) \
+ and type(actual[0]) is bytes and type(expected[0]) is str:
+ actual = [a.decode('utf-8') for a in actual]
return expected == actual
i_expected = 0
for actual_line in actual:
- if expected[i_expected] == actual_line:
+ expected_line = expected[i_expected]
+ if type(actual_line) is bytes and type(expected_line) is str:
+ actual_line == actual_line.decode('utf-8')
+ if expected_line == actual_line:
i_expected += 1
if i_expected == len(expected):
return True
@@ -475,6 +481,8 @@
if actual is not None:
logger.warn('ACTUAL %s:', actual_label)
for x in actual:
+ if type(x) == bytes:
+ x = x.decode("utf-8")
logger.warn('| ' + x.rstrip())
def compare_and_display_lines(message, label, expected, actual,

59
subversion.spec
View File

@ -1,9 +1,14 @@
# set to zero to avoid running test suite
%bcond_without kwallet
%bcond_without bdb
%bcond_without tests
%if 0%{?fedora} > 32 || 0%{?rhel} > 8
%bcond_with bdb
%else
%bcond_without bdb
%endif
# Python 2 for F<32, Python 3 for F>=32
%if 0%{?fedora} < 32
%bcond_without python2
@ -44,12 +49,12 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.12.2
Release: 8%{?dist}
Version: 1.14.0~rc2
Release: 2%{?dist}
License: ASL 2.0
URL: https://subversion.apache.org/
Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
Source0: https://downloads.apache.org/dist/subversion/subversion-1.14.0-rc2.tar.bz2
Source1: subversion.conf
Source3: filter-requires.sh
Source4: http://www.xsteve.at/prg/emacs/psvn.el
@ -58,7 +63,6 @@ Source6: svnserve.service
Source7: svnserve.tmpfiles
Source8: svnserve.sysconf
Patch1: subversion-1.12.0-linking.patch
Patch2: subversion-1.12.2-py3tests.patch
Patch4: subversion-1.8.0-rubybind.patch
Patch5: subversion-1.8.5-swigplWall.patch
Patch6: subversion-1.12.2-r1865987+.patch
@ -124,7 +128,7 @@ Subversion libraries.
%package -n python3-subversion
%{?python_provide:%python_provide python3-subversion}
Summary: Python bindings for Subversion Version Control system
BuildRequires: python3-devel
BuildRequires: python3-devel py3c-devel
%description -n python3-subversion
The python3-subversion package includes the Python 3.x bindings to the
@ -133,7 +137,7 @@ Subversion libraries.
%package devel
Summary: Development package for the Subversion libraries
Requires: subversion%{?_isa} = %{version}-%{release}
Requires: subversion-libs%{?_isa} = %{version}-%{release}
Requires: apr-devel%{?_isa}, apr-util-devel%{?_isa}
%description devel
@ -142,7 +146,7 @@ for developers interacting with the subversion package.
%package gnome
Summary: GNOME Keyring support for Subversion
Requires: subversion%{?_isa} = %{version}-%{release}
Requires: subversion-libs%{?_isa} = %{version}-%{release}
BuildRequires: dbus-devel, libsecret-devel
%description gnome
@ -152,7 +156,7 @@ passwords in the GNOME Keyring.
%if %{with kwallet}
%package kde
Summary: KDE Wallet support for Subversion
Requires: subversion%{?_isa} = %{version}-%{release}
Requires: subversion-libs%{?_isa} = %{version}-%{release}
BuildRequires: qt5-qtbase-devel >= 5.0.0, kf5-kwallet-devel, kf5-ki18n-devel
BuildRequires: kf5-kcoreaddons-devel
@ -176,7 +180,7 @@ Summary: Perl bindings to the Subversion libraries
BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More), perl(ExtUtils::Embed)
Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
Requires: subversion%{?_isa} = %{version}-%{release}
Requires: subversion-libs%{?_isa} = %{version}-%{release}
%description perl
This package includes the Perl bindings to the Subversion libraries.
@ -185,7 +189,7 @@ This package includes the Perl bindings to the Subversion libraries.
%package javahl
Summary: JNI bindings to the Subversion libraries
Requires: subversion = %{version}-%{release}
BuildRequires: java-openjdk-devel
BuildRequires: java-11-openjdk-devel
# JAR repacking requires both zip and unzip in the buildroot
BuildRequires: zip, unzip
# For the tests
@ -200,7 +204,7 @@ This package includes the JNI bindings to the Subversion libraries.
Summary: Ruby bindings to the Subversion libraries
BuildRequires: ruby-devel >= 1.9.1, ruby >= 1.9.1
BuildRequires: rubygem(test-unit)
Requires: subversion%{?_isa} = %{version}-%{release}
Requires: subversion-libs%{?_isa} = %{version}-%{release}
Conflicts: ruby-libs%{?_isa} < 1.8.2
%description ruby
@ -208,17 +212,14 @@ This package includes the Ruby bindings to the Subversion libraries.
%package tools
Summary: Supplementary tools for Subversion
Requires: subversion%{?_isa} = %{version}-%{release}
Requires: subversion-libs%{?_isa} = %{version}-%{release}
%description tools
This package includes supplementary tools for use with Subversion.
%prep
%setup -q
%setup -q -n subversion-1.14.0-rc2
%patch1 -p1 -b .linking
%if %{with python3}
%patch2 -p1 -b .py3tests
%endif
%patch4 -p1 -b .rubybind
%patch5 -p1 -b .swigplWall
%patch6 -p1 -b .r1865987+
@ -544,6 +545,30 @@ make check-javahl
%endif
%changelog
* Tue May 19 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-2
- switch subpackages to lock-step requires on -libs rather than subversion
- fixed the build-requires (Jitka Plesnikova)
* Thu Apr 30 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-1
- drop Berkeley DB support for Fedora > 32
- BR java-11-openjdk-devel
* Thu Apr 23 2020 Joe Orton <jorton@redhat.com> - 1.14.0~rc2-0
- update to 1.14.0-rc2
* Wed Feb 12 2020 Joe Orton <jorton@redhat.com> - 1.13.0-4
- fix FTBFS on 32-bit arches
* Mon Jan 6 2020 Joe Orton <jorton@redhat.com> - 1.13.0-3
- F-32: fix include path for ruby 2.7 (Mamoru TASAKA)
* Mon Jan 6 2020 Joe Orton <jorton@redhat.com> - 1.13.0-2
- update for KDE 5 (Phil O, #1768693)
- conditionally package bdb tools in -tools
* Wed Oct 30 2019 Joe Orton <jorton@redhat.com> - 1.13.0-1
- update to 1.13.0
* Tue Apr 28 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.12.2-8
- fixed the build-requires