Fix debuginfo building and stop building ruby and java subpackages
Resolves: RHEL-52974
This commit is contained in:
parent
ecce52ccc7
commit
f8af96e656
@ -27,14 +27,11 @@
|
|||||||
%bcond_with python2
|
%bcond_with python2
|
||||||
%bcond_without python3
|
%bcond_without python3
|
||||||
%bcond_without pyswig
|
%bcond_without pyswig
|
||||||
%bcond_without ruby
|
%bcond_with ruby
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{java_arches}
|
# do not build java package on RHEL 10
|
||||||
%bcond_without java
|
|
||||||
%else
|
|
||||||
%bcond_with java
|
%bcond_with java
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python2} == %{with python3}
|
%if %{with python2} == %{with python3}
|
||||||
%error Pick exactly one Python version
|
%error Pick exactly one Python version
|
||||||
@ -60,7 +57,7 @@
|
|||||||
Summary: A Modern Concurrent Version Control System
|
Summary: A Modern Concurrent Version Control System
|
||||||
Name: subversion
|
Name: subversion
|
||||||
Version: 1.14.3
|
Version: 1.14.3
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
License: Apache-2.0
|
License: Apache-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
|
||||||
@ -290,6 +287,8 @@ export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
|
|||||||
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
|
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
|
||||||
|
|
||||||
export CFLAGS="%{build_cflags} -Wno-error=incompatible-pointer-types"
|
export CFLAGS="%{build_cflags} -Wno-error=incompatible-pointer-types"
|
||||||
|
# neccessary for libtool compilation of bindings
|
||||||
|
export LT_CFLAGS="$CFLAGS"
|
||||||
|
|
||||||
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
||||||
--disable-debug \
|
--disable-debug \
|
||||||
@ -334,9 +333,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|||||||
%if %{with pyswig}
|
%if %{with pyswig}
|
||||||
make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT
|
make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT
|
||||||
%endif
|
%endif
|
||||||
make install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT
|
|
||||||
|
make install-swig-pl-lib DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
%if %{with ruby}
|
||||||
|
make install-swig-rb DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
%endif
|
||||||
|
|
||||||
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
|
||||||
@ -589,6 +594,10 @@ make check-javahl
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 07 2024 Tomas Korbar <tkorbar@redhat.com> - 1.14.3-6
|
||||||
|
- Fix debuginfo building and stop building ruby and java subpackages
|
||||||
|
- Resolves: RHEL-52974
|
||||||
|
|
||||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.14.3-5
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.14.3-5
|
||||||
- Bump release for June 2024 mass rebuild
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user