%bcond_without gnome # GNOME keyring support
%bcond_without db # Subversion Berkeley DB based filesystem library
%bcond_with db6 # allow BDB6 (not tested by upstream, released on AGPL)
+%bcond_without static_libs # static libraries
%if %{with net_client_only}
%undefine with_apache
%define pdir SVN
%define pnam _Core
-%define use_jdk openjdk8
+%{?with_java:%{?use_default_jdk}}
Summary: A Concurrent Versioning system similar to but better than CVS
Summary(pl.UTF-8): System kontroli wersji podobny, ale lepszy, niż CVS
Summary(pt_BR.UTF-8): Sistema de versionamento concorrente
Name: subversion
-Version: 1.14.2
-Release: 2
+Version: 1.14.3
+Release: 1
License: Apache v2.0
Group: Development/Version Control
Source0: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5: 9927b167d1c67d663ca63125907f6f69
+# Source0-md5: 19756a5ceb32a022698a66e48616ef6b
Source1: %{name}-dav_svn.conf
Source2: %{name}-authz_svn.conf
Source3: %{name}-svnserve.init
%if %{with python2}
BuildRequires: python >= 1:2.7
%{?with_csvn:BuildRequires: python-ctypesgen >= 1.0.2}
+%{?with_swigpy:BuildRequires: python-modules >= 1:2.7}
%endif
%if %{with python3}
BuildRequires: python3 >= 1:3.2
%{?with_csvn:BuildRequires: python3-ctypesgen >= 1.0.2}
+%{?with_swigpy:BuildRequires: python3-modules >= 1:3.2}
%endif
BuildRequires: rpm-build >= 4.6
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.752
+BuildRequires: rpmbuild(macros) >= 2.021
BuildRequires: sed >= 4.0
BuildRequires: serf-devel >= 1.3.4
BuildRequires: sqlite3-devel >= 3.8.11.1
BuildRequires: which
BuildRequires: zlib-devel >= 1.2
%if %{with java}
-BuildRequires: openjdk8-jdk-base
+%buildrequires_jdk
BuildRequires: libstdc++-devel >= 6:4.7
%endif
%if %{with perl}
BuildRequires: swig-ruby >= 3.0.9
%endif
Requires: %{name}-libs = %{version}-%{release}
-%requires_ge sqlite3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir %{_libdir}/svn
Requires: apr >= 1:1.4
Requires: apr-util >= 1:1.3
Requires: serf >= 1.3.4
+%requires_ge_to sqlite3-libs sqlite3-devel
Requires: zlib >= 1.2
Obsoletes: libsubversion0 < 1
ac_cv_path_RUBY=none \
--disable-javahl \
--disable-mod-activation \
+ %{__enable_disable static_libs static} \
--without-apxs \
--without-berkeley-db \
%if %{with csvn}
PYTHON=%{__python3} \
--disable-mod-activation \
--disable-runtime-module-search \
+ %{__enable_disable static_libs static} \
--with-apr=%{_bindir}/apr-1-config \
--with-apr-util=%{_bindir}/apu-1-config \
--with-editor=vi \
%if %{with csvn}
%{__make} -C builddir-python2 -j1 install-lib install-fsmod-lib install-ctypes-python \
DESTDIR=$RPM_BUILD_ROOT \
- PY_INSTALLOPTS="--install-purelib=%{py_sitescriptdir}"
+ PY_INSTALLOPTS="--install-purelib=%{py_sitescriptdir}" \
+ pkgconfig_dir=%{_pkgconfigdir}
%endif
%if %{with swigpy}
cp -p tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%if %{with java}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.la
+%{?with_static_libs:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.a}
%endif
%if %{with swig}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.la
+%{?with_static_libs:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.a}
%if %{with ruby}
%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/svn/ext/*.la
%endif
%post -n python-subversion -p /sbin/ldconfig
%postun -n python-subversion -p /sbin/ldconfig
+%post -n python3-subversion -p /sbin/ldconfig
+%postun -n python3-subversion -p /sbin/ldconfig
+
%post -n ruby-subversion -p /sbin/ldconfig
%postun -n ruby-subversion -p /sbin/ldconfig
%{_includedir}/%{name}-1
%{_examplesdir}/%{name}-%{version}
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libsvn_client-1.a
%{_libdir}/libsvn_repos-1.a
%{_libdir}/libsvn_subr-1.a
%{_libdir}/libsvn_wc-1.a
+%endif
%if %{with gnome}
%files -n gnome-keyring-subversion