Hello community,
here is the log from the commit of package subversion for openSUSE:Factory
checked in at 2014-11-04 17:29:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-09-30
19:41:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes
2014-11-04 17:29:18.000000000 +0100
@@ -1,0 +2,8 @@
+Sat Nov 1 22:56:00 UTC 2014 - andreas.stie...@gmx.de
+
+- Add a versioned runtime requirement for sqlite and pass it to
+ configure via --enable-sqlite-compatibility-version to allow
+ running with sqlite older than at build time but compatible.
+- make build with KDE / WKallet optional to fix build with SLE 12
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.SSTYR0/_old 2014-11-04 17:29:19.000000000 +0100
+++ /var/tmp/diff_new_pack.SSTYR0/_new 2014-11-04 17:29:19.000000000 +0100
@@ -26,6 +26,8 @@
%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
+%define with_kde 0%{?suse_version} != 1315
%if 0%{?suse_version} > 1140
%define with_systemd 1
BuildRequires: pkgconfig(systemd)
@@ -33,7 +35,6 @@
%endif
%bcond_without python_ctypes
%bcond_with all_regression_tests
-
Name: subversion
Version: 1.8.10
Release: 0
@@ -76,11 +77,8 @@
BuildRequires: glib2-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: junit
-BuildRequires: kdelibs4-core
BuildRequires: krb5-devel
BuildRequires: libgnome-keyring-devel
-BuildRequires: libkde4-devel
-BuildRequires: libqt4-devel
BuildRequires: libserf-devel >= 1.2.1
BuildRequires: libstdc++-devel
BuildRequires: libtool
@@ -88,10 +86,11 @@
BuildRequires: python-devel
BuildRequires: python-xml
BuildRequires: ruby-devel >= 1.8.2
-BuildRequires: sqlite3-devel >= 3.7.12
+BuildRequires: sqlite3-devel >= %{sqlite_minimum_version}
BuildRequires: swig
BuildRequires: update-alternatives
BuildRequires: zlib-devel
+Requires: libsqlite3-0 >= %{sqlite_minimum_version}
Requires(post): %fillup_prereq
Requires(pre): pwdutils
Provides: subversion-javahl = %{version}-%{release}
@@ -113,6 +112,11 @@
%if %{with python_ctypes}
BuildRequires: ctypesgen
%endif
+%if %{with_kde}
+BuildRequires: kdelibs4-core
+BuildRequires: libkde4-devel
+BuildRequires: libqt4-devel
+%endif
%description
Subversion exists to be universally recognized and adopted as an open-source,
@@ -187,12 +191,14 @@
The subversion-server package adds the Subversion server Apache module
to the Apache directories and configuration.
+%if %{with_kde}
%package -n libsvn_auth_kwallet-1-0
Summary: A Concurrent Versioning system similar to but better than CVS
Group: Development/Tools/Version Control
%description -n libsvn_auth_kwallet-1-0
Provides KWallet integration for Subversion version control system.
+%endif
%package -n libsvn_auth_gnome_keyring-1-0
Summary: A Concurrent Versioning system similar to but better than CVS
@@ -279,8 +285,11 @@
--with-junit="%{_datadir}/java/junit.jar" \
--with-jikes=no \
--with-sqlite="%{_prefix}" \
+ --enable-sqlite-compatibility-version=%{sqlite_minimum_version} \
--with-gnome-keyring \
+%if %{with_kde}
--with-kwallet \
+%endif
--disable-mod-activation \
--with-libmagic \
--disable-static
@@ -460,9 +469,11 @@
%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
%files -f files.subversion
%defattr(-,root,root)
@@ -563,10 +574,12 @@
%{_libdir}/libsvn_auth_gnome_keyring-1.so.0
%{_libdir}/libsvn_auth_gnome_keyring-1.so.0.*
+%if %{with_kde}
%files -n libsvn_auth_kwallet-1-0
%defattr(-,root,root)
%{_libdir}/libsvn_auth_kwallet-1.so.0
%{_libdir}/libsvn_auth_kwallet-1.so.0.*
+%endif
%if 0%{?suse_version} > 1130
%files bash-completion
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
