Hello community,
here is the log from the commit of package subversion for openSUSE:Factory
checked in at 2017-03-16 09:42:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subversion (Old)
and /work/SRC/openSUSE:Factory/.subversion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion"
Thu Mar 16 09:42:12 2017 rev:144 rq:479130 version:1.9.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2016-12-02
16:42:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes
2017-03-16 09:51:01.242162189 +0100
@@ -1,0 +2,8 @@
+Mon Mar 13 10:28:41 UTC 2017 - tchva...@suse.com
+
+- Update to build with new RPM in Factory
+- Provide the kwallet auth in main pkg in case kde integration is
+ disabled
+- Use apache2-rpm-macros to get the apache variables
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.eQz16s/_old 2017-03-16 09:51:02.262017759 +0100
+++ /var/tmp/diff_new_pack.eQz16s/_new 2017-03-16 09:51:02.262017759 +0100
@@ -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.stie...@gmx.de>
# Copyright (c) 2009-2010 Pascal Bleser <pascal.ble...@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 @@
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: 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(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: 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,
@@ -136,8 +134,8 @@
%package devel
Summary: Development package for Subversion developers
-# this pulls in libapr1-devel and libexpat-devel
Group: Development/Libraries/C and C++
+# this pulls in libapr1-devel and libexpat-devel
Requires: libapr-util1-devel
Requires: subversion = %{version}
@@ -278,7 +276,7 @@
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 @@
--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 -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
@@ -435,24 +433,16 @@
/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 +450,7 @@
%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
