rpms/subversion
6
0
Fork 0
Code Issues Pull Requests Releases Activity

update for new Java arches and bump to JDK 17 (#2103909)

Browse Source 
Resolves: rhbz#2103909
This commit is contained in:
Joe Orton 2022-07-05 14:30:11 +01:00
parent 66f78b6f0b
commit 28a8371292
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
subversion.spec
View File

@ -29,10 +29,10 @@
%bcond_without ruby %bcond_without ruby
%endif %endif
%ifarch %{power64} s390x %ifarch %{java_arches}
%global with_java 0 %bcond_without java
%else %else
%global with_java 1 %bcond_with java
%endif %endif
%if %{with python2} == %{with python3} %if %{with python2} == %{with python3}
@ -59,7 +59,7 @@
Summary: A Modern Concurrent Version Control System Summary: A Modern Concurrent Version Control System
Name: subversion Name: subversion
Version: 1.14.2 Version: 1.14.2
Release: 3%{?dist} Release: 4%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: https://subversion.apache.org/ URL: https://subversion.apache.org/
Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
@ -198,11 +198,11 @@ Requires: subversion-libs%{?_isa} = %{version}-%{release}
%description perl %description perl
This package includes the Perl bindings to the Subversion libraries. This package includes the Perl bindings to the Subversion libraries.
%if %{with_java} %if %{with java}
%package javahl %package javahl
Summary: JNI bindings to the Subversion libraries Summary: JNI bindings to the Subversion libraries
Requires: subversion = %{version}-%{release} Requires: subversion = %{version}-%{release}
BuildRequires: java-11-openjdk-devel BuildRequires: java-17-openjdk-devel
# JAR repacking requires both zip and unzip in the buildroot # JAR repacking requires both zip and unzip in the buildroot
BuildRequires: zip, unzip BuildRequires: zip, unzip
# For the tests # For the tests
@ -245,7 +245,7 @@ This package includes supplementary tools for use with Subversion.
: :
: === Building: : === Building:
: === Python3=%{with python3} Python2=%{with python2} PySwig=%{with pyswig} : === 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} : === 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} \ --disable-static --with-sasl=%{_prefix} \
--with-libmagic=%{_prefix} \ --with-libmagic=%{_prefix} \
--with-gnome-keyring \ --with-gnome-keyring \
%if %{with_java} %if %{with java}
--enable-javahl \ --enable-javahl \
--with-junit=%{_prefix}/share/java/junit.jar \ --with-junit=%{_prefix}/share/java/junit.jar \
%endif %endif
@ -315,7 +315,7 @@ make swig-pl swig-pl-lib
%if %{with ruby} %if %{with ruby}
make swig-rb swig-rb-lib make swig-rb swig-rb-lib
%endif %endif
%if %{with_java} %if %{with java}
# javahl-javah does not parallel-make with javahl # javahl-javah does not parallel-make with javahl
#make javahl-java javahl-javah #make javahl-java javahl-javah
make javahl 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 install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT
make pure_vendor_install -C subversion/bindings/swig/perl/native \ make pure_vendor_install -C subversion/bindings/swig/perl/native \
PERL_INSTALL_ROOT=$RPM_BUILD_ROOT 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 make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir} DESTDIR=$RPM_BUILD_ROOT
%endif %endif
@ -467,7 +467,7 @@ if ! make check-swig-py; then
fi fi
%endif %endif
# check-swig-rb omitted: it runs svnserve # check-swig-rb omitted: it runs svnserve
%if %{with_java} %if %{with java}
make check-javahl make check-javahl
%endif %endif
%endif %endif
@ -487,7 +487,7 @@ make check-javahl
%ldconfig_scriptlets ruby %ldconfig_scriptlets ruby
%if %{with_java} %if %{with java}
%ldconfig_scriptlets javahl %ldconfig_scriptlets javahl
%endif %endif
@ -520,7 +520,7 @@ make check-javahl
%{_libdir}/libsvn*.so.* %{_libdir}/libsvn*.so.*
%exclude %{_libdir}/libsvn_swig_perl* %exclude %{_libdir}/libsvn_swig_perl*
%exclude %{_libdir}/libsvn_swig_ruby* %exclude %{_libdir}/libsvn_swig_ruby*
%if %{with_java} %if %{with java}
%{_libdir}/libsvnjavahl-*.so %{_libdir}/libsvnjavahl-*.so
%endif %endif
%if %{with kwallet} %if %{with kwallet}
@ -575,12 +575,15 @@ make check-javahl
%{ruby_vendorarchdir}/svn %{ruby_vendorarchdir}/svn
%endif %endif
%if %{with_java} %if %{with java}
%files javahl %files javahl
%{_javadir}/svn-javahl.jar %{_javadir}/svn-javahl.jar
%endif %endif
%changelog %changelog
* Tue Jul 5 2022 Joe Orton <jorton@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@redhat.com> - 1.14.2-3 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.14.2-3
- Rebuilt for Python 3.11 - Rebuilt for Python 3.11