Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at 2020-09-09 17:47:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subversion (Old) and /work/SRC/openSUSE:Factory/.subversion.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion" Wed Sep 9 17:47:02 2020 rev:176 rq:833210 version:1.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2020-07-31 15:52:09.780015158 +0200 +++ /work/SRC/openSUSE:Factory/.subversion.new.3399/subversion.changes 2020-09-09 17:47:42.206463693 +0200 @@ -1,0 +2,13 @@ +Wed Sep 9 08:07:30 UTC 2020 - Antonio Larrosa <[email protected]> + +- Fix jira reference to SLE-11901 + +------------------------------------------------------------------- +Fri Sep 4 12:21:59 UTC 2020 - Antonio Larrosa <[email protected]> + +- Add patch to remove dependency on kdelibs4support just to run + kf5-config to find out that headers are in /usr/include and + libraries are in /usr/lib(64) (jsc#SLE-11901): + * remove-kdelibs4support-dependency.patch + +------------------------------------------------------------------- New: ---- remove-kdelibs4support-dependency.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.mW0b7P/_old 2020-09-09 17:47:44.218465328 +0200 +++ /var/tmp/diff_new_pack.mW0b7P/_new 2020-09-09 17:47:44.222465331 +0200 @@ -62,6 +62,8 @@ Patch40: subversion-perl-underlinking.patch Patch42: gcc10-do-not-optimize-get_externals_to_pin.patch Patch45: disable-fs-fs-pack-test.patch +# PATCH-FIX-OPENSUSE SLE-11901 +Patch46: remove-kdelibs4support-dependency.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel >= 2.2.0 BuildRequires: apache2-prefork @@ -118,8 +120,6 @@ BuildRequires: pkgconfig(libsecret-1) %endif %if %{with kde} -# for kf5-config -BuildRequires: kdelibs4support BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5Wallet) @@ -242,6 +242,7 @@ %patch40 -p1 %patch42 -p1 %patch45 -p1 +%patch46 -p1 # do not use 'env python' sed -i -e 's#/usr/bin/env python#/usr/bin/python3#' subversion/tests/cmdline/*.py ++++++ remove-kdelibs4support-dependency.patch ++++++ From: Antonio Larrosa <[email protected]> Subject: Removes requirement for kf5-config (kdelibs4support) With this, we don't need to include kdelibs4support and all its dependencies on SLE Index: subversion-1.14.0/build/ac-macros/kwallet.m4 =================================================================== --- subversion-1.14.0.orig/build/ac-macros/kwallet.m4 +++ subversion-1.14.0/build/ac-macros/kwallet.m4 @@ -59,30 +59,13 @@ AC_DEFUN(SVN_LIB_KWALLET, kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore" fi if test -n "$qt_pkg_config_names"; then - if test "$svn_lib_kwallet" != "yes"; then - AC_MSG_CHECKING([for $kde_config_name]) - KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name" - if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then - AC_MSG_RESULT([yes]) + if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then + kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"] + kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"] else - if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then - AC_MSG_RESULT([unneeded]) - KDE_CONFIG="unneeded" - kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"] - kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"] - else - AC_MSG_RESULT([no]) - KDE_CONFIG="" - fi - fi - else - AC_PATH_PROG(KDE_CONFIG, $kde_config_name) - if test -n "$KDE_CONFIG"; then - kde_incdir="`$KDE_CONFIG --install include`" - kde_libdir="`$KDE_CONFIG --install lib`" + kde_incdir="${includedir}" + kde_libdir="${libdir}" fi - fi - if test -n "$KDE_CONFIG"; then old_CXXFLAGS="$CXXFLAGS" old_LDFLAGS="$LDFLAGS" old_LIBS="$LIBS" @@ -122,9 +105,6 @@ int main() AC_MSG_RESULT([no]) AC_MSG_ERROR([cannot find KWallet]) fi - else - AC_MSG_ERROR([cannot find $kde_config_name]) - fi else AC_MSG_RESULT([no]) AC_MSG_ERROR([cannot find Qt])
