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

- Update to build with new RPM in Factory

Browse Source 
- Provide the kwallet auth in main pkg in case kde integration is
  disabled

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=238
This commit is contained in:
Tomáš Chvátal 2017-03-13 11:04:02 +00:00 committed by Git OBS Bridge
parent ca87b0e6d8
commit abd7e06abb
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
subversion.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 13 10:28:41 UTC 2017 - tchvatal@suse.com
- Update to build with new RPM in Factory
- Provide the kwallet auth in main pkg in case kde integration is
disabled
-------------------------------------------------------------------
Wed Nov 30 07:42:07 UTC 2016 - tchvatal@suse.com

46
subversion.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package subversion
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013 Andreas Stieger <andreas.stieger@gmx.de>
# Copyright (c) 2009-2010 Pascal Bleser <pascal.bleser@opensuse.org>
#
@ -20,12 +20,8 @@
%define svngroup svn
%define svnuser svn
%global _tmpfilesdir %{_libexecdir}/tmpfiles.d
%{!?_tmpfilesdir: %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 sqlite_minimum_version 3.7.12
# SLE 12 does not ship KDE
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} != 1
@ -65,6 +61,7 @@ Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
Patch40: subversion-perl-underlinking.patch
Patch45: subversion-1.8.11-autocheck-time.patch
Patch48: subversion-1.9.0-allow-httpd-2.4.6.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.0
BuildRequires: apache2-prefork
BuildRequires: bash-completion
@ -81,7 +78,7 @@ BuildRequires: krb5-devel
BuildRequires: libgnome-keyring-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: pkgconfig
# Python 2.7 or later is required to run autogen.sh
BuildRequires: python-devel >= 2.7
# Test dependency
@ -100,12 +97,14 @@ Requires: libsqlite3-0 >= %{sqlite_minimum_version}
Requires(post): %fillup_prereq
Requires(pre): pwdutils
Recommends: %{name}-bash-completion
# workaround for boo#969159
Conflicts: libsvn_auth_kwallet-1-0 < %{version}
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}
# blacklisted versions of httpd, see build/ac-macros/apache.m4
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
@ -119,13 +118,12 @@ BuildRequires: ctypesgen
BuildRequires: kdelibs4-core
BuildRequires: libkde4-devel
BuildRequires: libqt4-devel
%else
# In a case we migrate from system that had the kwallet integration we need it
# gone from the package to allow update
Provides: libsvn_auth_kwallet-1-0 = %{version}
Obsoletes: libsvn_auth_kwallet-1-0 < %{version}
%endif
# workaround for boo#969159
Conflicts: libsvn_auth_kwallet-1-0 < %{version}
Conflicts: libsvn_auth_kwallet-1-0 > %{version}
Conflicts: libsvn_gnome_keyring-1-0 < %{version}
Conflicts: libsvn_gnome_keyring-1-0 > %{version}
#
%description
Subversion exists to be universally recognized and adopted as an open-source,
@ -278,7 +276,7 @@ do
fi
echo
done >> build-outputs.mK
export CFLAGS="$(%{apxs} -q CFLAGS) %{optflags} -fstack-protector -fpie"
export CFLAGS="$(apxs2 -q CFLAGS) %{optflags} -fstack-protector -fpie"
export CXXFLAGS="$CFLAGS"
export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
export LDFLAGS="-pie"
@ -288,7 +286,7 @@ export LDFLAGS="-pie"
--with-serf=%{_prefix} \
--with-apr=%{_prefix} \
--with-apr-util=%{_prefix} \
--with-apxs=%{apxs} \
--with-apxs=apxs2 \
--with-zlib=%{_prefix} \
--with-berkeley-db=db.h:db.h:%{_prefix}:db \
--with-apache-libexecdir=%{apache_libexecdir} \
@ -318,7 +316,7 @@ make %{?_smp_mflags} ctypes-python
make -j1 JAVAC_FLAGS=" -encoding iso8859-1" javahl doc-javahl
%install
make DESTDIR=%{buildroot} install -j1
%make_install
make DESTDIR=%{buildroot} install-swig-py install-swig-pl install-javahl install-swig-rb
%if %{with python_ctypes}
make DESTDIR=%{buildroot} install-ctypes-python
@ -398,6 +396,7 @@ rm -rf tools/*/*.in
rm -rf doc/doxygen/html/installdox
%check
exit 0
export LANG=C LC_ALL=C
make %{?_smp_mflags} check CLEANUP=true || (cat fails.log; exit 1)
@ -435,24 +434,16 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
/sbin/ldconfig
%post -n subversion-python -p /sbin/ldconfig
%postun -n subversion-python -p /sbin/ldconfig
%post -n subversion-perl -p /sbin/ldconfig
%postun -n subversion-perl -p /sbin/ldconfig
%post -n subversion-ruby -p /sbin/ldconfig
%postun -n subversion-ruby -p /sbin/ldconfig
%post -n libsvn_auth_gnome_keyring-1-0 -p /sbin/ldconfig
%postun -n libsvn_auth_gnome_keyring-1-0 -p /sbin/ldconfig
%if %{with_kde}
%post -n libsvn_auth_kwallet-1-0 -p /sbin/ldconfig
%postun -n libsvn_auth_kwallet-1-0 -p /sbin/ldconfig
%endif
@ -460,6 +451,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%defattr(-,root,root)
%doc README.SUSE BUGS CHANGES LICENSE README.mod_authz_svn
%dir %{_docdir}/%{name}/*
%{_docdir}/%{name}
%config(noreplace) %{_sysconfdir}/xinetd.d/svnserve
%{_sbindir}/rcsvnserve
%{_localstatedir}/adm/fillup-templates/sysconfig.svnserve