Compare commits
7 Commits
Author | SHA1 | Date |
---|---|---|
Joe Orton | a85be98e66 | |
Joe Orton | 1ee3e0966b | |
Joe Orton | aa569f7927 | |
Joe Orton | c3655448e6 | |
Joe Orton | 9b7327e752 | |
Joe Orton | a3a9239627 | |
Ville Skyttä | c949dc0f96 |
|
@ -1,5 +1,5 @@
|
||||||
# set to zero to avoid running test suite
|
# set to zero to avoid running test suite
|
||||||
%define make_check 0
|
%define make_check 1
|
||||||
|
|
||||||
%define with_java 1
|
%define with_java 1
|
||||||
%define with_kwallet 1
|
%define with_kwallet 1
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
Summary: A Modern Concurrent Version Control System
|
Summary: A Modern Concurrent Version Control System
|
||||||
Name: subversion
|
Name: subversion
|
||||||
Version: 1.8.13
|
Version: 1.8.13
|
||||||
Release: 2%{?dist}
|
Release: 7%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://subversion.apache.org/
|
URL: http://subversion.apache.org/
|
||||||
|
@ -42,13 +42,16 @@ Patch10: subversion-1.8.13-swigpython.patch
|
||||||
Patch11: subversion-1.8.11-ruby22-fixes.rb
|
Patch11: subversion-1.8.11-ruby22-fixes.rb
|
||||||
Patch12: subversion-1.8-sqlite-r1672295.patch
|
Patch12: subversion-1.8-sqlite-r1672295.patch
|
||||||
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
|
||||||
BuildRequires: libdb-devel >= 4.1.25, swig >= 1.3.24, gettext
|
BuildRequires: libdb-devel >= 4.1.25, swig >= 3.0.6, gettext
|
||||||
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
|
||||||
BuildRequires: libserf-devel >= 1.3.0, cyrus-sasl-devel
|
BuildRequires: libserf-devel >= 1.3.0, cyrus-sasl-devel
|
||||||
BuildRequires: sqlite-devel >= 3.4.0, file-devel, systemd-units
|
BuildRequires: sqlite-devel >= 3.4.0, file-devel, systemd-units
|
||||||
# Any apr-util crypto backend needed
|
# Any apr-util crypto backend needed
|
||||||
BuildRequires: apr-util-openssl
|
BuildRequires: apr-util-openssl
|
||||||
|
# For systemctl scriptlets
|
||||||
|
Requires(post): systemd
|
||||||
|
Requires(preun): systemd
|
||||||
|
Requires(postun): systemd
|
||||||
Provides: svn = %{version}-%{release}
|
Provides: svn = %{version}-%{release}
|
||||||
Requires: subversion-libs%{?_isa} = %{version}-%{release}
|
Requires: subversion-libs%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
@ -333,8 +336,17 @@ install -p -m 644 $RPM_SOURCE_DIR/svnserve.sysconf \
|
||||||
make install-tools DESTDIR=$RPM_BUILD_ROOT toolsdir=%{_bindir}
|
make install-tools DESTDIR=$RPM_BUILD_ROOT toolsdir=%{_bindir}
|
||||||
rm -f $RPM_BUILD_ROOT%{_bindir}/diff*
|
rm -f $RPM_BUILD_ROOT%{_bindir}/diff*
|
||||||
|
|
||||||
for f in svn-populate-node-origins-index svn-rep-sharing-stats svnauthz-validate svnmucc svnraisetreeconflict svn-bench fsfs-reorg fsfs-access-map fsfs-stats; do
|
# Make svnauthz-validate a symlink
|
||||||
|
rm $RPM_BUILD_ROOT%{_bindir}/svnauthz-validate
|
||||||
|
ln -s svnauthz $RPM_BUILD_ROOT%{_bindir}/svnauthz-validate
|
||||||
|
|
||||||
|
for f in svn-populate-node-origins-index svn-rep-sharing-stats \
|
||||||
|
svnauthz svnauthz-validate svnmucc svnraisetreeconflict svn-bench \
|
||||||
|
fsfs-reorg fsfs-access-map fsfs-stats; do
|
||||||
echo %{_bindir}/$f
|
echo %{_bindir}/$f
|
||||||
|
if test -f %{_mandir}/man?/${f}.*; then
|
||||||
|
echo %{_mandir}/man?/${f}.*
|
||||||
|
fi
|
||||||
done | tee tools.files | sed 's/^/%%exclude /' > exclude.tools.files
|
done | tee tools.files | sed 's/^/%%exclude /' > exclude.tools.files
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
@ -395,7 +407,7 @@ make check-javahl
|
||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
%{_datadir}/emacs/site-lisp/*.el
|
%{_datadir}/emacs/site-lisp/*.el
|
||||||
%{_datadir}/xemacs/site-packages/lisp/*.el
|
%{_datadir}/xemacs/site-packages/lisp/*.el
|
||||||
%{_datadir}/bash-completion/completions/*
|
%{_datadir}/bash-completion/
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/svnserve
|
%config(noreplace) %{_sysconfdir}/sysconfig/svnserve
|
||||||
%dir %{_sysconfdir}/subversion
|
%dir %{_sysconfdir}/subversion
|
||||||
%exclude %{_mandir}/man*/*::*
|
%exclude %{_mandir}/man*/*::*
|
||||||
|
@ -461,6 +473,20 @@ make check-javahl
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 14 2015 Joe Orton <jorton@redhat.com> - 1.8.13-7
|
||||||
|
- move svnauthz to -tools; make svnauthz-validate a symlink
|
||||||
|
- move svnmucc man page to -tools
|
||||||
|
- restore dep on systemd (#1183873)
|
||||||
|
|
||||||
|
* Tue Jul 14 2015 Joe Orton <jorton@redhat.com> - 1.8.13-6
|
||||||
|
- rebuild with tests enabled
|
||||||
|
|
||||||
|
* Tue Jul 14 2015 Joe Orton <jorton@redhat.com> - 1.8.13-5
|
||||||
|
- rebuild with SWIG 3.0.6 (#1216264)
|
||||||
|
|
||||||
|
* Mon Jun 15 2015 Ville Skyttä <ville.skytta@iki.fi> - 1.8.13-4
|
||||||
|
- Own bash-completion dirs not owned by anything in dep chain
|
||||||
|
|
||||||
* Tue Apr 21 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.8.13-2
|
* Tue Apr 21 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.8.13-2
|
||||||
- Disable tests to fix swig test issues
|
- Disable tests to fix swig test issues
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue