|
@@ -1,3 +1,5 @@
|
|
|
+%bcond_with systemd
|
|
|
+
|
|
|
%define neon_version 0.30.2
|
|
|
%define swig_version 3.0.0
|
|
|
%define apache_version 2.4
|
|
@@ -5,28 +7,28 @@
|
|
|
|
|
|
%define swigdirs swig_pydir=%{python3_sitearch}/libsvn swig_pydir_extra=%{python3_sitearch}/svn
|
|
|
|
|
|
-# set to zero to avoid running test suite
|
|
|
-%define make_check 0
|
|
|
-
|
|
|
Summary: Modern Version Control System
|
|
|
Summary(ja): モダンなバージョン管理システム
|
|
|
Name: subversion
|
|
|
-Version: 1.13.0
|
|
|
-Release: 1%{?_dist_release}
|
|
|
-License: ASL 2.0
|
|
|
-Group: Development/Tools
|
|
|
-URL: https://subversion.apache.org/
|
|
|
-
|
|
|
+Version: 1.14.1
|
|
|
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
+Group: programming
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
Packager: iwaim, daisuke
|
|
|
|
|
|
-SOURCE0: http://ftp.jaist.ac.jp/pub/apache/subversion/subversion-%{version}.tar.bz2
|
|
|
-SOURCE1: subversion.conf
|
|
|
-SOURCE2: httpd.davcheck.conf
|
|
|
-SOURCE3: filter-requires.sh
|
|
|
+License: ASL 2.0
|
|
|
+URL: https://subversion.apache.org/
|
|
|
+Source0: http://ftp.jaist.ac.jp/pub/apache/subversion/subversion-%{version}.tar.bz2
|
|
|
+Source1: subversion.conf
|
|
|
+Source2: httpd.davcheck.conf
|
|
|
+Source3: filter-requires.sh
|
|
|
+Source6: svnserve.service
|
|
|
+Source7: svnserve.tmpfiles
|
|
|
+Source8: svnserve.sysconf
|
|
|
Patch1: subversion-1.12.0-linking.patch
|
|
|
-Patch2: subversion-1.12.2-py3tests.patch
|
|
|
+Patch2: subversion-1.14.0-testwarn.patch
|
|
|
+Patch3: subversion-1.14.0-soversion.patch
|
|
|
Patch4: subversion-1.8.0-rubybind.patch
|
|
|
Patch5: subversion-1.8.5-swigplWall.patch
|
|
|
|
|
@@ -54,10 +56,11 @@ BuildRequires: keyutils-libs-devel
|
|
|
BuildRequires: dbus-devel
|
|
|
BuildRequires: libsecret-devel
|
|
|
BuildRequires: libserf-devel
|
|
|
-BuildRequires: libxcrypt-devel
|
|
|
-BuildRequires: libnsl2-devel
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
-
|
|
|
+%if %{with systemd}
|
|
|
+BuildRequires: systemd
|
|
|
+%{?systemd_requires}
|
|
|
+%endif
|
|
|
%define __perllib_requires %{SOURCE3}
|
|
|
|
|
|
%description
|
|
@@ -69,26 +72,30 @@ instead of every complete file. Subversion is intended to be a
|
|
|
compelling replacement for CVS.
|
|
|
|
|
|
%package devel
|
|
|
-Group: Development/Libraries
|
|
|
Summary: Development package for Subversion developers.
|
|
|
+Group: programming
|
|
|
Requires: subversion = %{version}-%{release}
|
|
|
Requires: apr-devel, apr-util-devel
|
|
|
+
|
|
|
%description devel
|
|
|
The subversion-devel package includes the static libraries and include files
|
|
|
for developers interacting with the subversion package.
|
|
|
|
|
|
+
|
|
|
%package mod_dav_svn
|
|
|
-Group: System Environment/Daemons
|
|
|
Summary: Apache server module for Subversion server.
|
|
|
+Group: servers
|
|
|
Requires: apache2 >= %{apache_version}
|
|
|
Requires: subversion = %{version}-%{release}
|
|
|
+
|
|
|
%description mod_dav_svn
|
|
|
The subversion-mod_dav_svn package adds the Subversion server Apache module to
|
|
|
the Apache directories and configuration.
|
|
|
|
|
|
+
|
|
|
%package tools
|
|
|
-Group: Development/Tools
|
|
|
Summary: Tools for Subversion
|
|
|
+Group: programming
|
|
|
BuildRequires: perl >= 5.8.0
|
|
|
Requires: perl >= 5.8.0
|
|
|
Requires: subversion = %{version}-%{release}
|
|
@@ -97,8 +104,8 @@ Requires: subversion = %{version}-%{release}
|
|
|
Tools for Subversion.
|
|
|
|
|
|
%package perl
|
|
|
-Group: Development/Libraries
|
|
|
Summary: Perl bindings to the Subversion libraries
|
|
|
+Group: programming
|
|
|
Requires: subversion = %{version}-%{release}
|
|
|
Requires: perl >= 5.8.0
|
|
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
|
@@ -106,36 +113,43 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
|
|
%description perl
|
|
|
This package includes the Perl bindings to the Subversion libraries.
|
|
|
|
|
|
+
|
|
|
%package ruby
|
|
|
-Group: Development/Libraries
|
|
|
Summary: Ruby bindings to the Subversion libraries
|
|
|
+Group: programming
|
|
|
Requires: subversion = %{version}-%{release}
|
|
|
Requires: ruby >= 2.0
|
|
|
|
|
|
%description ruby
|
|
|
This package includes the Ruby bindings to the Subversion libraries.
|
|
|
|
|
|
+
|
|
|
%package -n python3-subversion
|
|
|
-Group: Development/Libraries
|
|
|
Summary: Python bindings to the Subversion libraries
|
|
|
+Group: programming
|
|
|
BuildRequires: python3
|
|
|
BuildRequires: python3-devel
|
|
|
-BuildRequires: python3-rpm-macros
|
|
|
+BuildRequires: py3c-devel
|
|
|
Requires: subversion = %{version}-%{release}, python3
|
|
|
|
|
|
%description -n python3-subversion
|
|
|
This package includes the Python bindings to the Subversion libraries.
|
|
|
|
|
|
+
|
|
|
+%debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch1 -p1 -b .link
|
|
|
-%patch2 -p1 -b .python3
|
|
|
+%patch1 -p1 -b .linking
|
|
|
+%patch2 -p1 -b .testwarn
|
|
|
+%patch3 -p1 -b .soversion
|
|
|
%patch4 -p1 -b .rubybind
|
|
|
%patch5 -p1 -b .swigplWall
|
|
|
|
|
|
+
|
|
|
%build
|
|
|
export LANG=ja_JP.UTF-8
|
|
|
-
|
|
|
# Regenerate the buildsystem, so that:
|
|
|
# 1) patches applied to configure.in take effect
|
|
|
# 2) the swig bindings are regenerated using the system swig
|
|
@@ -145,6 +159,12 @@ export LANG=ja_JP.UTF-8
|
|
|
mv build-outputs.mk build-outputs.mk.old
|
|
|
export PYTHON=%{__python3}
|
|
|
|
|
|
+### Force regeneration of swig bindings with the buildroot's SWIG.
|
|
|
+# Generated files depend on the build/generator/swig/*.py which
|
|
|
+# generates them, so when autogen-standalone.mk's autogen-swig target
|
|
|
+# is run by autogen.sh it will regenerate them:
|
|
|
+touch build/generator/swig/*.py
|
|
|
+
|
|
|
PATH=/usr/bin:$PATH ./autogen.sh --release
|
|
|
|
|
|
# fix shebang lines, #111498
|
|
@@ -157,6 +177,10 @@ perl -pi -e 's|/usr/bin/env python.*|%{svn_python}|' subversion/tests/cmdline/sv
|
|
|
export svn_cv_ruby_link="%{__cc} -shared"
|
|
|
export svn_cv_ruby_sitedir_libsuffix=""
|
|
|
export svn_cv_ruby_sitedir_archsuffix=""
|
|
|
+%if 0
|
|
|
+# Fix include path for ruby2.7
|
|
|
+export svn_cv_ruby_includes="-I%{_includedir}"
|
|
|
+%endif
|
|
|
|
|
|
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
|
|
|
export LIBTOOL=/usr/bin/libtool
|
|
@@ -173,11 +197,11 @@ export LIBTOOL=/usr/bin/libtool
|
|
|
|
|
|
make %{?_smp_mflags} all tools
|
|
|
make swig-py swig-py-lib %{swigdirs}
|
|
|
-make swig-pl swig-pl-lib swig-rb swig-rb-lib
|
|
|
+make swig-pl swig-pl-lib
|
|
|
+make swig-rb swig-rb-lib
|
|
|
|
|
|
|
|
|
%install
|
|
|
-echo %{rarchdir}
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
make install \
|
|
|
install-swig-py \
|
|
@@ -249,28 +273,23 @@ done | tee tools.files | sed 's/^/%%exclude /' > exclude.tools.files
|
|
|
|
|
|
cat %{name}.lang exclude.tools.files >> %{name}.files
|
|
|
|
|
|
-%clean
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
-
|
|
|
-%post -p /sbin/ldconfig
|
|
|
+%if %{with systemd}
|
|
|
+install -D -p -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/svnserve.service
|
|
|
+install -D -p -m 644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/svnserve.conf
|
|
|
+install -D -p -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/svnserve
|
|
|
+%endif
|
|
|
|
|
|
-%postun -p /sbin/ldconfig
|
|
|
|
|
|
-%post perl -p /sbin/ldconfig
|
|
|
+%if %{with systemd}
|
|
|
+%post
|
|
|
+%systemd_post svnserve.service
|
|
|
|
|
|
-%postun perl -p /sbin/ldconfig
|
|
|
+%preun
|
|
|
+%systemd_preun svnserve.service
|
|
|
|
|
|
-%post ruby -p /sbin/ldconfig
|
|
|
-
|
|
|
-%postun ruby -p /sbin/ldconfig
|
|
|
-
|
|
|
-%post -n python3-subversion -p /sbin/ldconfig
|
|
|
-
|
|
|
-%postun -n python3-subversion -p /sbin/ldconfig
|
|
|
-
|
|
|
-%post tools -p /sbin/ldconfig
|
|
|
-
|
|
|
-%postun tools -p /sbin/ldconfig
|
|
|
+%postun
|
|
|
+%systemd_postun_with_restart svnserve.service
|
|
|
+%endif
|
|
|
|
|
|
|
|
|
%files
|
|
@@ -287,6 +306,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%exclude %{_libdir}/libsvn_swig_perl*.so.*
|
|
|
%exclude %{_libdir}/libsvn_swig_py*.so.*
|
|
|
%exclude %{_libdir}/libsvn_swig_ruby*.so.*
|
|
|
+%if %{with systemd}
|
|
|
+%{_unitdir}/svnserve.service
|
|
|
+%{_tmpfilesdir}/svnserve.conf
|
|
|
+%config(noreplace) %{_sysconfdir}/sysconfig/svnserve
|
|
|
+%endif
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root)
|
|
@@ -324,6 +348,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Mar 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.1-1
|
|
|
+- new upstream release.
|
|
|
+- re-imported patches from rawhide.
|
|
|
+
|
|
|
* Mon Mar 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.13.0-1
|
|
|
- new upstream release.
|
|
|
|