Hello community, here is the log from the commit of package csync for openSUSE:Factory checked in at 2020-10-27 19:03:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/csync (Old) and /work/SRC/openSUSE:Factory/.csync.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "csync" Tue Oct 27 19:03:20 2020 rev:26 rq:844323 version:0.50.0 Changes: -------- --- /work/SRC/openSUSE:Factory/csync/csync.changes 2019-01-03 18:09:35.703981377 +0100 +++ /work/SRC/openSUSE:Factory/.csync.new.3463/csync.changes 2020-10-27 19:03:33.398944564 +0100 @@ -1,0 +2,6 @@ +Tue Oct 27 10:57:55 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Add csync-libssh.patch: Detect libssh version in libssh_version.h + in case this file exists. + +------------------------------------------------------------------- New: ---- csync-libssh.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csync.spec ++++++ --- /var/tmp/diff_new_pack.OJYaG0/_old 2020-10-27 19:03:34.022945019 +0100 +++ /var/tmp/diff_new_pack.OJYaG0/_new 2020-10-27 19:03:34.026945021 +0100 @@ -1,7 +1,7 @@ # # spec file for package csync # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ Summary: A user level bidirectional client only file synchronizer License: GPL-2.0-or-later Group: Productivity/Networking/Other -Url: http://www.csync.org/ +URL: http://www.csync.org/ Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf # PATCH-FIX-OPENSUSE fix-cmake-on-pre-12.patch @@ -41,6 +41,8 @@ Patch1: csync_log.h.patch # PATCH-FIX-OPENSUSE fix-missing-const.patch Patch2: fix-missing-const.patch +# PATCH-FIX-OPENSUSE csync-libssh.patch -- Detect newer libssh versions; hacked patch +Patch3: csync-libssh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -129,6 +131,9 @@ %endif %patch1 -p1 %patch2 -p1 +if [ -f %{_includedir}/libssh/libssh_version.h ]; then +%patch3 -p1 +fi %build if test ! -e "build"; then @@ -159,14 +164,9 @@ %endif popd -%post -n libcsync0 -/sbin/ldconfig - -%postun -n libcsync0 -/sbin/ldconfig +%post -n libcsync0 -p /sbin/ldconfig -%clean -%__rm -rf %{buildroot} +%postun -n libcsync0 -p /sbin/ldconfig %files %defattr(-,root,root) ++++++ csync-libssh.patch ++++++ Index: csync-0.50.0/cmake/Modules/FindLibSSH.cmake =================================================================== --- csync-0.50.0.orig/cmake/Modules/FindLibSSH.cmake +++ csync-0.50.0/cmake/Modules/FindLibSSH.cmake @@ -20,7 +20,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD find_path(LIBSSH_INCLUDE_DIR NAMES - libssh/libssh.h + libssh/libssh_version.h PATHS /usr/include /usr/local/include @@ -58,15 +58,15 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD ) if (LibSSH_FIND_VERSION) - file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR + file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MAJOR REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+") # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR if (LIBSSH_VERSION_MAJOR) string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR}) - file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR + file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MINOR REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+") string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR}) - file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH + file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_PATCH REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+") string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH}) @@ -75,7 +75,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD include(FindPackageVersionCheck) find_package_version_check(LibSSH DEFAULT_MSG) else (LIBSSH_VERSION_MAJOR) - message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old") + message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h, assuming libssh is too old") set(LIBSSH_FOUND FALSE) endif (LIBSSH_VERSION_MAJOR) endif (LibSSH_FIND_VERSION)
