Hello community,
here is the log from the commit of package subversion for openSUSE:Factory
checked in at 2015-08-27 08:57:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subversion (Old)
and /work/SRC/openSUSE:Factory/.subversion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion"
Changes:
--------
--- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2015-08-21
07:41:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes
2015-08-27 08:57:09.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Aug 24 11:08:08 UTC 2015 - tchva...@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 - tchva...@suse.com
+
+- Use suggests instead of recommends to avoid 180+ new pkgs on
+ minimal setup due subversion-password-store bnc#942819
+
+-------------------------------------------------------------------
Old:
----
subversion.rcsvnserve
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.rBc0mN/_old 2015-08-27 08:57:10.000000000 +0200
+++ /var/tmp/diff_new_pack.rBc0mN/_new 2015-08-27 08:57:10.000000000 +0200
@@ -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 @@
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 @@
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: 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
%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: libkde4-devel
BuildRequires: libqt4-devel
%endif
-%if 0%{?suse_version}
-Recommends: %{name}-bash-completion
-Recommends: %{name}-password-store
-%endif
%description
Subversion exists to be universally recognized and adopted as an open-source,
@@ -222,7 +201,8 @@
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 @@
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 @@
%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 -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 %{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 @@
-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 @@
%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 @@
%{_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 @@
%{_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
