Accepting request 325800 from home:scarabeus_iv:branches:devel:tools:scm:svn
- Remove support for SLE11 from the spec file - Use supplements instead of suggests on the other side for the password store - Fix kde integration conditional to work nicely on openSUSE Leap OBS-URL: https://build.opensuse.org/request/show/325800 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=218
This commit is contained in:
Git OBS Bridge
@@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 24 11:08:08 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Remove support for SLE11 from the spec file
|
||||
- Use supplements instead of suggests on the other side for the
|
||||
password store
|
||||
- Fix kde integration conditional to work nicely on openSUSE Leap
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 24 10:56:02 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
|
||||
@@ -1,177 +0,0 @@
|
||||
#! /bin/sh
|
||||
# Copyright (c) 1995-2011 SuSE Linux AG, Nuernberg, Germany.
|
||||
# All rights reserved.
|
||||
#
|
||||
# /etc/init.d/svnserve
|
||||
# and its symbolic link
|
||||
# /usr/sbin/rcsvnserve
|
||||
#
|
||||
# LSB compatible service control script; see http://www.linuxbase.org/spec/
|
||||
#
|
||||
# Note: This script uses functions rc_XXX defined in /etc/rc.status on
|
||||
# UnitedLinux (UL) based Linux distributions. If you want to base your
|
||||
# script on this template and ensure that it works on non UL based LSB
|
||||
# compliant Linux distributions, you either have to provide the rc.status
|
||||
# functions from UL or change the script to work without them.
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: svnserve
|
||||
# Required-Start:
|
||||
# Should-Start: $time ypbind sendmail $syslog $remote_fs
|
||||
# Required-Stop: $syslog $remote_fs
|
||||
# Should-Stop: $time ypbind sendmail
|
||||
# Default-Start: 3 5
|
||||
# Default-Stop: 0 1 2 6
|
||||
# Short-Description: svnserve
|
||||
# Description: readonly access to a subversion repository
|
||||
### END INIT INFO
|
||||
|
||||
|
||||
# Note on runlevels:
|
||||
# 0 - halt/poweroff 6 - reboot
|
||||
# 1 - single user 2 - multiuser without network exported
|
||||
# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm)
|
||||
#
|
||||
# Note on script names:
|
||||
# http://www.linuxbase.org/spec/refspecs/LSB_1.2.0/gLSB/scrptnames.html
|
||||
# A registry has been set up to manage the init script namespace.
|
||||
# http://www.lanana.org/
|
||||
# Please use the names already registered or register one or use a
|
||||
# vendor prefix.
|
||||
|
||||
|
||||
# Check for missing binaries (stale symlinks should not happen)
|
||||
SVNSERVE_BIN=/usr/bin/svnserve
|
||||
test -x $SVNSERVE_BIN || exit 5
|
||||
|
||||
# Check for existence of needed config file and read it
|
||||
SVNSERVE_CONFIG=/etc/sysconfig/svnserve
|
||||
test -r $SVNSERVE_CONFIG || exit 6
|
||||
. $SVNSERVE_CONFIG
|
||||
|
||||
# Source LSB init functions
|
||||
# providing start_daemon, killproc, pidofproc,
|
||||
# log_success_msg, log_failure_msg and log_warning_msg.
|
||||
# This is currently not used by UnitedLinux based distributions and
|
||||
# not needed for init scripts for UnitedLinux only. If it is used,
|
||||
# the functions from rc.status should not be sourced or used.
|
||||
#. /lib/lsb/init-functions
|
||||
|
||||
# Shell functions sourced from /etc/rc.status:
|
||||
# rc_check check and set local and overall rc status
|
||||
# rc_status check and set local and overall rc status
|
||||
# rc_status -v be verbose in local rc status and clear it afterwards
|
||||
# rc_status -v -r ditto and clear both the local and overall rc status
|
||||
# rc_status -s display "skipped" and exit with status 3
|
||||
# rc_status -u display "unused" and exit with status 3
|
||||
# rc_failed set local and overall rc status to failed
|
||||
# rc_failed <num> set local and overall rc status to <num>
|
||||
# rc_reset clear both the local and overall rc status
|
||||
# rc_exit exit appropriate to overall rc status
|
||||
# rc_active checks whether a service is activated by symlinks
|
||||
# rc_splash arg sets the boot splash screen to arg (if active)
|
||||
. /etc/rc.status
|
||||
|
||||
# Reset status of this service
|
||||
rc_reset
|
||||
|
||||
# Return values acc. to LSB for all commands but status:
|
||||
# 0 - success
|
||||
# 1 - generic or unspecified error
|
||||
# 2 - invalid or excess argument(s)
|
||||
# 3 - unimplemented feature (e.g. "reload")
|
||||
# 4 - user had insufficient privileges
|
||||
# 5 - program is not installed
|
||||
# 6 - program is not configured
|
||||
# 7 - program is not running
|
||||
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
|
||||
#
|
||||
# Note that starting an already running service, stopping
|
||||
# or restarting a not-running service as well as the restart
|
||||
# with force-reload (in case signaling is not supported) are
|
||||
# considered a success.
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting svnserve "
|
||||
## Start daemon with startproc(8). If this fails
|
||||
## the return value is set appropriately by startproc.
|
||||
UID_ENT="$(/usr/bin/getent passwd $SVNSERVE_USERID)"
|
||||
GID_ENT="$(/usr/bin/getent group $SVNSERVE_GROUPID)"
|
||||
|
||||
if test -z "$SVNSERVE_USERID" -o -z "$UID_ENT"
|
||||
then
|
||||
echo
|
||||
echo "User $SVNSERVE_USERID does not exist."
|
||||
echo "Please check $SVNSERVE_CONFIG before starting this service."
|
||||
rc_failed
|
||||
elif test -z "$SVNSERVE_GROUPID" -o -z "$GID_ENT"
|
||||
then
|
||||
echo
|
||||
echo "Group $SVNSERVE_GROUPID does not exist."
|
||||
echo "Please check $SVNSERVE_CONFIG before starting this service."
|
||||
rc_failed
|
||||
else
|
||||
startproc -u "$SVNSERVE_USERID" -g "$SVNSERVE_GROUPID" -e $SVNSERVE_BIN $SVNSERVE_OPTIONS
|
||||
fi
|
||||
# Remember status and be verbose
|
||||
rc_status -v
|
||||
;;
|
||||
stop)
|
||||
echo -n "Shutting down svnserve "
|
||||
## Stop daemon with killproc(8) and if this fails
|
||||
## killproc sets the return value according to LSB.
|
||||
|
||||
killproc -TERM $SVNSERVE_BIN
|
||||
|
||||
# Remember status and be verbose
|
||||
rc_status -v
|
||||
;;
|
||||
try-restart)
|
||||
## Do a restart only if the service was active before.
|
||||
## Note: try-restart is not (yet) part of LSB (as of 1.2)
|
||||
$0 status >/dev/null && $0 restart
|
||||
|
||||
# Remember status and be quiet
|
||||
rc_status
|
||||
;;
|
||||
restart)
|
||||
## Stop the service and regardless of whether it was
|
||||
## running or not, start it again.
|
||||
$0 stop
|
||||
$0 start
|
||||
|
||||
# Remember status and be quiet
|
||||
rc_status
|
||||
;;
|
||||
force-reload)
|
||||
|
||||
echo -n "Reload service svnserve "
|
||||
$0 stop && $0 start
|
||||
#rc_status
|
||||
;;
|
||||
status)
|
||||
echo -n "Checking for service svnserve "
|
||||
## Check status with checkproc(8), if process is running
|
||||
## checkproc will return with exit status 0.
|
||||
|
||||
# Return value is slightly different for the status command:
|
||||
# 0 - service up and running
|
||||
# 1 - service dead, but /var/run/ pid file exists
|
||||
# 2 - service dead, but /var/lock/ lock file exists
|
||||
# 3 - service not running (unused)
|
||||
# 4 - service status unknown :-(
|
||||
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
|
||||
|
||||
# NOTE: checkproc returns LSB compliant status values.
|
||||
checkproc $SVNSERVE_BIN
|
||||
# NOTE: rc_status knows that we called this init script with
|
||||
# "status" option and adapts its messages accordingly.
|
||||
rc_status -v
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
rc_exit
|
||||
100
subversion.spec
100
subversion.spec
@@ -23,16 +23,15 @@
|
||||
%global _tmpfilesdir %{_libexecdir}/tmpfiles.d
|
||||
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||
%define apxs %{_sbindir}/apxs2
|
||||
%define apache_libexecdir %(%{apxs} -q LIBEXECDIR)
|
||||
%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR)
|
||||
%define apache_mmn %(MMN="$(%{apxs} -q LIBEXECDIR)_MMN"; test -x "$MMN" && "$MMN")
|
||||
%define apache_libexecdir %(%apxs -q LIBEXECDIR)
|
||||
%define apache_sysconfdir %(%apxs -q SYSCONFDIR)
|
||||
%define apache_mmn %(MMN="$(%apxs -q LIBEXECDIR)_MMN"; test -x "$MMN" && "$MMN")
|
||||
%define sqlite_minimum_version 3.7.12
|
||||
# SLE 12 does not ship KDE
|
||||
%define with_kde 0%{?suse_version} != 1315
|
||||
%if 0%{?suse_version} > 1140
|
||||
%define with_systemd 1
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
%{?systemd_requires}
|
||||
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} != 1
|
||||
%define with_kde 0
|
||||
%else
|
||||
%define with_kde 1
|
||||
%endif
|
||||
%bcond_without python_ctypes
|
||||
%bcond_with all_regression_tests
|
||||
@@ -47,7 +46,6 @@ Source0: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz
|
||||
Source1: subversion.conf
|
||||
Source2: subversion.README.SUSE
|
||||
Source4: contrib-1485350.tar.bz2
|
||||
Source9: subversion.rcsvnserve
|
||||
Source10: subversion.sysconfig.svnserve
|
||||
Source12: subversion.sysconfig.svnserve.remoteaccess
|
||||
Source13: subversion.xinetd.svnserve
|
||||
@@ -71,6 +69,7 @@ Patch46: subversion-1.8.14-httpd-version-number-detection.patch
|
||||
Patch48: subversion-1.9.0-allow-httpd-2.4.6.patch
|
||||
BuildRequires: apache2-devel >= 2.2.0
|
||||
BuildRequires: apache2-prefork
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: dbus-1-devel
|
||||
@@ -87,49 +86,33 @@ BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
# Python 2.7 or later is required to run autogen.sh
|
||||
BuildRequires: python-devel >= 2.7
|
||||
# Test dependency
|
||||
BuildRequires: python-pysqlite
|
||||
BuildRequires: python-xml
|
||||
BuildRequires: ruby-devel >= 1.8.2
|
||||
BuildRequires: sqlite3-devel >= %{sqlite_minimum_version}
|
||||
BuildRequires: swig
|
||||
BuildRequires: update-alternatives
|
||||
BuildRequires: zlib-devel
|
||||
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)
|
||||
Requires: libsqlite3-0 >= %{sqlite_minimum_version}
|
||||
Requires(post): %fillup_prereq
|
||||
Requires(pre): pwdutils
|
||||
Recommends: %{name}-bash-completion
|
||||
Provides: subversion-javahl = %{version}-%{release}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
# blacklisted versions of httpd, see build/ac-macros/apache.m4
|
||||
BuildConflicts: apache2-devel = 2.2.25
|
||||
BuildConflicts: apache2-devel = 2.4.5
|
||||
# allow patched 2.4.6 in openSUSE:13.1:Update bnc#864308
|
||||
# BuildConflicts: apache2-devel = 2.4.6
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: pkgconfig(apr-1) >= 1.3.0
|
||||
BuildRequires: pkgconfig(apr-util-1) >= 1.3.0
|
||||
%else
|
||||
BuildRequires: libapr-util1-devel >= 1.3.0
|
||||
BuildRequires: libapr1-devel >= 1.3.0
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: pkgconfig(serf-1) >= 1.3.4
|
||||
%else
|
||||
BuildRequires: libserf-devel >= 1.3.4
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(post): %insserv_prereq
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1130
|
||||
BuildRequires: bash-completion
|
||||
# Test dependency
|
||||
BuildRequires: python-pysqlite
|
||||
%endif
|
||||
BuildConflicts: apache2-devel = 2.2.25
|
||||
BuildConflicts: apache2-devel = 2.4.5
|
||||
%if %{with all_regression_tests}
|
||||
# tools required for network based tests
|
||||
BuildRequires: net-tools
|
||||
BuildRequires: wget
|
||||
%if %{?suse_version} >= 1310
|
||||
BuildRequires: time
|
||||
%endif
|
||||
BuildRequires: wget
|
||||
%endif
|
||||
%if %{with python_ctypes}
|
||||
BuildRequires: ctypesgen
|
||||
@@ -139,10 +122,6 @@ BuildRequires: kdelibs4-core
|
||||
BuildRequires: libkde4-devel
|
||||
BuildRequires: libqt4-devel
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
Recommends: %{name}-bash-completion
|
||||
Suggests: %{name}-password-store
|
||||
%endif
|
||||
|
||||
%description
|
||||
Subversion exists to be universally recognized and adopted as an open-source,
|
||||
@@ -222,7 +201,8 @@ to the Apache directories and configuration.
|
||||
Summary: KWallet support for Subversion
|
||||
Group: Development/Tools/Version Control
|
||||
Requires: %{name} = %{version}
|
||||
Provides: subversion-password-store = %{version}
|
||||
Supplements: packageand(subversion:kdebase4-workspace)
|
||||
Supplements: packageand(subversion:plasma5-workspace)
|
||||
|
||||
%description -n libsvn_auth_kwallet-1-0
|
||||
Provides KWallet integration for Subversion
|
||||
@@ -232,12 +212,11 @@ Provides KWallet integration for Subversion
|
||||
Summary: GNOME keyring sypport for Subversion
|
||||
Group: Development/Tools/Version Control
|
||||
Requires: %{name} = %{version}
|
||||
Provides: subversion-password-store = %{version}
|
||||
Supplements: packageand(libreoffice:gnome-session)
|
||||
|
||||
%description -n libsvn_auth_gnome_keyring-1-0
|
||||
Provides GNOME keyring support for Subversion
|
||||
|
||||
%if 0%{?suse_version} > 1130
|
||||
%package bash-completion
|
||||
Summary: Bash Completion for %{name}
|
||||
Group: Development/Tools/Version Control
|
||||
@@ -248,7 +227,6 @@ BuildArch: noarch
|
||||
%description bash-completion
|
||||
Bash command line completion support for %{name} - completion of subcommands,
|
||||
parameters and keywords for the svn command and other tools.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -a 4
|
||||
@@ -338,9 +316,6 @@ make %{?_smp_mflags} ctypes-python
|
||||
make -j1 JAVAC_FLAGS=" -encoding iso8859-1" javahl doc-javahl
|
||||
|
||||
%install
|
||||
%if 0%{?suse_version} == 1110
|
||||
export NO_BRP_CHECK_BYTECODE_VERSION=true
|
||||
%endif
|
||||
make DESTDIR=%{buildroot} install -j1
|
||||
make DESTDIR=%{buildroot} install-swig-py install-swig-pl install-javahl install-swig-rb
|
||||
%if %{with python_ctypes}
|
||||
@@ -385,15 +360,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
install -m 644 -D %{SOURCE12} %{buildroot}/%{_fwdefdir}/svnserve
|
||||
install -d -m 0755 %{buildroot}/srv/svn
|
||||
|
||||
%if 0%{?with_systemd}
|
||||
install -m 644 -D %{SOURCE14} %{buildroot}/%{_unitdir}/svnserve.service
|
||||
ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rcsvnserve
|
||||
ln -sv service %{buildroot}%{_sbindir}/rcsvnserve
|
||||
install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
|
||||
install -m 0644 %{SOURCE15} %{buildroot}/%{_tmpfilesdir}/svnserve.conf
|
||||
%else
|
||||
install -m 755 -D %{SOURCE9} %{buildroot}%{_initddir}/svnserve
|
||||
ln -sv %{_initddir}/svnserve %{buildroot}%{_sbindir}/rcsvnserve
|
||||
%endif
|
||||
|
||||
#useless libtool stuff
|
||||
rm -rf %{buildroot}%{python_sitearch}/*/*.{a,la}
|
||||
@@ -407,18 +377,14 @@ find %{buildroot} -type f \
|
||||
-print0 | xargs -0 rm -f
|
||||
|
||||
# make Perl modules writable so they get stripped
|
||||
%if 0%{?suse_version} > 1130
|
||||
find %{buildroot}%{_libexecdir}/perl5 -type f -perm 555 -print0 |
|
||||
xargs -0 chmod 755
|
||||
%endif
|
||||
|
||||
install -d -m 0755 %{buildroot}/%{_datadir}/java
|
||||
ln -sv %{_libdir}/svn-javahl/svn-javahl.jar %{buildroot}/%{_datadir}/java/svn-javahl.jar
|
||||
rm -f %{buildroot}%{_localstatedir}/adm/perl-modules/subversion
|
||||
|
||||
%if 0%{?suse_version} > 1130
|
||||
install -D -m0644 tools/client-side/bash_completion "%{buildroot}%{_sysconfdir}/bash_completion.d/%{name}"
|
||||
%endif
|
||||
|
||||
# examples
|
||||
mkdir -p %{buildroot}%{_docdir}/%{name}
|
||||
@@ -450,33 +416,19 @@ make %{?_smp_mflags} davautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; ex
|
||||
%pre
|
||||
getent group %{svngroup} >/dev/null || groupadd -r %{svngroup}
|
||||
getent passwd %{svnuser} >/dev/null || useradd -r -g %{svngroup} -d /srv/svn -s /sbin/nologin -c "user for Apache Subversion svnserve" %{svnuser}
|
||||
%if 0%{?with_systemd}
|
||||
%service_add_pre svnserve.service
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%if 0%{?with_systemd}
|
||||
%service_del_preun svnserve.service
|
||||
%else
|
||||
%stop_on_removal svnserve
|
||||
%endif
|
||||
|
||||
%post
|
||||
%{fillup_only -n svnserve svnserve}
|
||||
%if 0%{?with_systemd}
|
||||
%service_add_post svnserve.service
|
||||
systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
|
||||
%else
|
||||
%{fillup_and_insserv -n svnserve svnserve}
|
||||
%endif
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
%if 0%{?with_systemd}
|
||||
%service_del_postun svnserve.service
|
||||
%else
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
/sbin/ldconfig
|
||||
|
||||
%post -n subversion-python -p /sbin/ldconfig
|
||||
@@ -510,12 +462,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.svnserve
|
||||
%dir %attr(755,%{svnuser},%{svngroup}) /srv/svn
|
||||
%config %{_fwdefdir}/*
|
||||
%if 0%{?with_systemd}
|
||||
%{_unitdir}/svnserve.service
|
||||
%{_tmpfilesdir}/svnserve.conf
|
||||
%else
|
||||
%{_initddir}/svnserve
|
||||
%endif
|
||||
%attr(755,root,root) %{_bindir}/svn
|
||||
%attr(755,root,root) %{_bindir}/svnadmin
|
||||
%attr(755,root,root) %{_bindir}/svndiff
|
||||
@@ -611,10 +559,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
|
||||
%{_libdir}/libsvn_auth_kwallet-1.so.0.*
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1130
|
||||
%files bash-completion
|
||||
%defattr(-,root,root)
|
||||
%config %{_sysconfdir}/bash_completion.d/%{name}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user