pool/subversion
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 558302 from home:fstrba:branches:devel:tools:scm:svn

Browse Source 
Avoid building with jdk10

OBS-URL: https://build.opensuse.org/request/show/558302
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=260
This commit is contained in:
Martin Pluskal 2017-12-19 08:04:35 +00:00 committed by Git OBS Bridge
parent 917a28130b
commit 371ec376dc
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subversion.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 19 06:59:02 UTC 2017 - fstrba@suse.com
- BuildConflict with jdk10 or higher. The build uses extensively
the javah tool which is removed in jdk10.
-------------------------------------------------------------------
Thu Nov 23 13:45:36 UTC 2017 - rbrown@suse.com

30
subversion.spec
View File

@ -18,11 +18,6 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define svngroup svn
%define svnuser svn
%{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d }
@ -40,6 +35,10 @@
%define with_kde 1
%endif
%endif
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
%bcond_without python_ctypes
%bcond_with all_regression_tests
Name: subversion
@ -89,10 +88,10 @@ BuildRequires: libgnome-keyring-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
# Python 2.7 or later is required to run autogen.sh
BuildRequires: python2-devel >= 2.7
# Test dependency
BuildRequires: python-pysqlite
# Python 2.7 or later is required to run autogen.sh
BuildRequires: python2-devel >= 2.7
BuildRequires: python2-xml
BuildRequires: ruby-devel >= 1.8.2
BuildRequires: sqlite3-devel >= %{sqlite_minimum_version}
@ -103,6 +102,7 @@ BuildRequires: pkgconfig(apr-1) >= 1.3.0
BuildRequires: pkgconfig(apr-util-1) >= 1.3.0
BuildRequires: pkgconfig(serf-1) >= 1.3.4
BuildRequires: pkgconfig(systemd)
BuildConflicts: java-devel >= 10
Requires: libsqlite3-0 >= %{sqlite_minimum_version}
Requires(post): %fillup_prereq
Requires(pre): pwdutils
@ -113,7 +113,6 @@ Conflicts: libsvn_auth_kwallet-1-0 > %{version}
Conflicts: libsvn_gnome_keyring-1-0 < %{version}
Conflicts: libsvn_gnome_keyring-1-0 > %{version}
Provides: subversion-javahl = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
%if %{with all_regression_tests}
# tools required for network based tests
@ -345,7 +344,7 @@ mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/
cp -avL contrib/client-side/emacs/*.el %{buildroot}%{_datadir}/emacs/site-lisp/
rm -f %{buildroot}%{_datadir}/emacs/site-lisp/vc-svn.el
cp -avL contrib/client-side/svn_apply_autoprops.py %{buildroot}%{_prefix}/bin
cp -avL contrib/client-side/svn_apply_autoprops.py %{buildroot}%{_bindir}
mkdir -p %{buildroot}/%{apache_sysconfdir}/conf.d
cp -av %{SOURCE1} %{buildroot}/%{apache_sysconfdir}/conf.d/subversion.conf
@ -363,7 +362,7 @@ rm -rf %{buildroot}%{_bindir}/svn-tools
# replicate svn-bench compatibility link
ln -sf svnbench %{buildroot}%{_bindir}/svn-bench
mkdir -p %{buildroot}%{_prefix}/sbin
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_fillupdir}
install -m 644 -D %{SOURCE10} %{buildroot}%{_fillupdir}/sysconfig.svnserve
install -m 644 -D %{SOURCE12} %{buildroot}/%{_fwdefdir}/svnserve
@ -456,7 +455,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%endif
%files -f files.subversion
%defattr(-,root,root)
%doc README.SUSE BUGS CHANGES LICENSE README.mod_authz_svn
%dir %{_docdir}/%{name}/*
%{_docdir}/%{name}
@ -490,14 +488,12 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%{_datadir}/emacs
%files perl
%defattr(-,root,root)
%{_mandir}/man?/SVN::*
%{_libdir}/libsvn_swig_perl-1.so.*
%{perl_vendorarch}/SVN
%{perl_vendorarch}/auto/SVN
%files python
%defattr(-,root,root)
%dir %{python_sitearch}
%dir %{python_sitearch}/svn
%dir %{python_sitearch}/libsvn
@ -507,7 +503,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%if %{with python_ctypes}
%files python-ctypes
%defattr(-,root,root)
%doc subversion/bindings/ctypes-python/examples
%dir %{python_sitelib}
%{python_sitelib}/csvn
@ -515,14 +510,12 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%endif
%files ruby
%defattr(-,root,root)
%dir %{rb_sitelib}
%{rb_sitelib}/svn
%{rb_sitelib}/*/svn
%{_libdir}/libsvn_swig_ruby-1.so.*
%files devel
%defattr(-,root,root)
%dir %{_includedir}/subversion-1
%{_libdir}/libsvn_*.so
%{_datadir}/pkgconfig/*.pc
@ -530,7 +523,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%doc doc/doxygen/html
%files tools
%defattr(-,root,root)
%{_bindir}/fsfs-access-map
%attr(755,root,root) %{_bindir}/svn_apply_autoprops.py
%{_bindir}/svnauthz
@ -541,7 +533,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%{_bindir}/svnraisetreeconflict
%files server
%defattr(-,root,root)
%dir %{apache_sysconfdir}/conf.d
%config (noreplace) %{apache_sysconfdir}/conf.d/subversion.conf
%dir %{apache_libexecdir}
@ -550,19 +541,16 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%{apache_libexecdir}/mod_dontdothat.*
%files -n libsvn_auth_gnome_keyring-1-0
%defattr(-,root,root)
%{_libdir}/libsvn_auth_gnome_keyring-1.so.0
%{_libdir}/libsvn_auth_gnome_keyring-1.so.0.*
%if %{with_kde}
%files -n libsvn_auth_kwallet-1-0
%defattr(-,root,root)
%{_libdir}/libsvn_auth_kwallet-1.so.0
%{_libdir}/libsvn_auth_kwallet-1.so.0.*
%endif
%files bash-completion
%defattr(-,root,root)
%config %{_sysconfdir}/bash_completion.d/%{name}
%changelog