The package rpms/subversion.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/subversion.git/commit/?id=28a8371....
Change:
+%ifarch %{java_arches}
Thanks.
Full change:
============
commit 3ef9dd2eb3c8730d9e3108b94136d77a8fea3a7d
Author: Joe Orton <jorton(a)redhat.com>
Date: Tue Jul 5 16:08:19 2022 +0100
disable libmagic during test runs
diff --git a/subversion-1.14.1-testnoautoprops.patch
b/subversion-1.14.1-testnomagic.patch
similarity index 94%
rename from subversion-1.14.1-testnoautoprops.patch
rename to subversion-1.14.1-testnomagic.patch
index 96dd59d..ff13e1a 100644
--- a/subversion-1.14.1-testnoautoprops.patch
+++ b/subversion-1.14.1-testnomagic.patch
@@ -8,7 +8,7 @@ the output is different.
[miscellany]
interactive-conflicts = false
-+enable-auto-props = no
++enable-magic-file = no
"""
if exclusive_wc_locks:
config_contents += """
diff --git a/subversion.spec b/subversion.spec
index 9e98ddd..f72c2ed 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -59,7 +59,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.14.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: ASL 2.0
URL:
https://subversion.apache.org/
Source0:
https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
@@ -75,7 +75,7 @@ Patch2: subversion-1.14.0-testwarn.patch
Patch3: subversion-1.14.0-soversion.patch
Patch4: subversion-1.8.0-rubybind.patch
Patch5: subversion-1.8.5-swigplWall.patch
-Patch6: subversion-1.14.1-testnoautoprops.patch
+Patch6: subversion-1.14.1-testnomagic.patch
Patch8: subversion-1.14.1-python-3.11-build.patch
BuildRequires: make
@@ -239,7 +239,7 @@ This package includes supplementary tools for use with Subversion.
%patch3 -p1 -b .soversion
%patch4 -p1 -b .rubybind
%patch5 -p1 -b .swigplWall
-%patch6 -p1 -b .testnoautoprops
+%patch6 -p1 -b .testnomagic
%patch8 -p1 -b .pythonbuild
:
@@ -581,6 +581,9 @@ make check-javahl
%endif
%changelog
+* Tue Jul 5 2022 Joe Orton <jorton(a)redhat.com> - 1.14.2-5
+- disable libmagic during test runs
+
* Tue Jul 5 2022 Joe Orton <jorton(a)redhat.com> - 1.14.2-4
- update for new Java arches and bump to JDK 17 (#2103909)
commit 28a837129261f24545a78c9a01056b30fb36ae98
Author: Joe Orton <jorton(a)redhat.com>
Date: Tue Jul 5 14:30:11 2022 +0100
update for new Java arches and bump to JDK 17 (#2103909)
Resolves: rhbz#2103909
diff --git a/subversion.spec b/subversion.spec
index f3f9556..9e98ddd 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -29,10 +29,10 @@
%bcond_without ruby
%endif
-%ifarch %{power64} s390x
-%global with_java 0
+%ifarch %{java_arches}
+%bcond_without java
%else
-%global with_java 1
+%bcond_with java
%endif
%if %{with python2} == %{with python3}
@@ -59,7 +59,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.14.2
-Release: 3%{?dist}
+Release: 4%{?dist}
License: ASL 2.0
URL:
https://subversion.apache.org/
Source0:
https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
@@ -198,11 +198,11 @@ Requires: subversion-libs%{?_isa} = %{version}-%{release}
%description perl
This package includes the Perl bindings to the Subversion libraries.
-%if %{with_java}
+%if %{with java}
%package javahl
Summary: JNI bindings to the Subversion libraries
Requires: subversion = %{version}-%{release}
-BuildRequires: java-11-openjdk-devel
+BuildRequires: java-17-openjdk-devel
# JAR repacking requires both zip and unzip in the buildroot
BuildRequires: zip, unzip
# For the tests
@@ -245,7 +245,7 @@ This package includes supplementary tools for use with Subversion.
:
: === Building:
: === Python3=%{with python3} Python2=%{with python2} PySwig=%{with pyswig}
-: === Java=%{with_java} Ruby=%{with ruby}
+: === Java=%{with java} Ruby=%{with ruby}
: === BDB=%{with bdb} Tests=%{with tests} KWallet=%{with kwallet}
:
@@ -294,7 +294,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
--disable-static --with-sasl=%{_prefix} \
--with-libmagic=%{_prefix} \
--with-gnome-keyring \
-%if %{with_java}
+%if %{with java}
--enable-javahl \
--with-junit=%{_prefix}/share/java/junit.jar \
%endif
@@ -315,7 +315,7 @@ make swig-pl swig-pl-lib
%if %{with ruby}
make swig-rb swig-rb-lib
%endif
-%if %{with_java}
+%if %{with java}
# javahl-javah does not parallel-make with javahl
#make javahl-java javahl-javah
make javahl
@@ -329,7 +329,7 @@ make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT
make install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT
make pure_vendor_install -C subversion/bindings/swig/perl/native \
PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%if %{with_java}
+%if %{with java}
make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir}
DESTDIR=$RPM_BUILD_ROOT
%endif
@@ -467,7 +467,7 @@ if ! make check-swig-py; then
fi
%endif
# check-swig-rb omitted: it runs svnserve
-%if %{with_java}
+%if %{with java}
make check-javahl
%endif
%endif
@@ -487,7 +487,7 @@ make check-javahl
%ldconfig_scriptlets ruby
-%if %{with_java}
+%if %{with java}
%ldconfig_scriptlets javahl
%endif
@@ -520,7 +520,7 @@ make check-javahl
%{_libdir}/libsvn*.so.*
%exclude %{_libdir}/libsvn_swig_perl*
%exclude %{_libdir}/libsvn_swig_ruby*
-%if %{with_java}
+%if %{with java}
%{_libdir}/libsvnjavahl-*.so
%endif
%if %{with kwallet}
@@ -575,12 +575,15 @@ make check-javahl
%{ruby_vendorarchdir}/svn
%endif
-%if %{with_java}
+%if %{with java}
%files javahl
%{_javadir}/svn-javahl.jar
%endif
%changelog
+* Tue Jul 5 2022 Joe Orton <jorton(a)redhat.com> - 1.14.2-4
+- update for new Java arches and bump to JDK 17 (#2103909)
+
* Mon Jun 13 2022 Python Maint <python-maint(a)redhat.com> - 1.14.2-3
- Rebuilt for Python 3.11
commit 66f78b6f0b9f8ff4de970918b64a2690e31af527
Author: Python Maint <python-maint(a)redhat.com>
Date: Mon Jun 13 15:27:35 2022 +0200
Rebuilt for Python 3.11
diff --git a/subversion.spec b/subversion.spec
index 7fd6631..f3f9556 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -59,7 +59,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.14.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: ASL 2.0
URL:
https://subversion.apache.org/
Source0:
https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
@@ -581,6 +581,9 @@ make check-javahl
%endif
%changelog
+* Mon Jun 13 2022 Python Maint <python-maint(a)redhat.com> - 1.14.2-3
+- Rebuilt for Python 3.11
+
* Tue May 31 2022 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.14.2-2
- Perl 5.36 rebuild
commit dfc31038aee879266966ba4d3efcde25fb3effb3
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Tue May 31 22:09:00 2022 +0200
Perl 5.36 rebuild
diff --git a/subversion.spec b/subversion.spec
index 37b0616..7fd6631 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -59,7 +59,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.14.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0
URL:
https://subversion.apache.org/
Source0:
https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
@@ -581,6 +581,9 @@ make check-javahl
%endif
%changelog
+* Tue May 31 2022 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.14.2-2
+- Perl 5.36 rebuild
+
* Wed May 4 2022 Joe Orton <jorton(a)redhat.com> - 1.14.2-1
- update to 1.14.2 (#2073852, CVE-2021-28544, CVE-2022-24070)