Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at 2017-11-16 14:42:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdebase4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-runtime" Thu Nov 16 14:42:38 2017 rev:237 rq:541964 version:17.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-runtime/kdebase4-runtime.changes 2017-10-23 16:29:29.367529714 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kdebase4-runtime.changes 2017-11-16 14:42:40.907040637 +0100 @@ -1,0 +2,16 @@ +Tue Nov 14 12:03:53 UTC 2017 - [email protected] + +- Add use-tirpc-for-nfs.patch. + Build kio_nfs using TIRPC instead of SunRPC. + +------------------------------------------------------------------- +Thu Nov 09 23:11:16 CET 2017 - [email protected] + +- Update to 17.08.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.08.3.php +- Changes since 17.08.2: + * None + +------------------------------------------------------------------- Old: ---- kde-runtime-17.08.2.tar.xz New: ---- kde-runtime-17.08.3.tar.xz use-tirpc-for-nfs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.0F9Uzt/_old 2017-11-16 14:42:41.867005799 +0100 +++ /var/tmp/diff_new_pack.0F9Uzt/_new 2017-11-16 14:42:41.871005653 +0100 @@ -18,7 +18,7 @@ %define debug_package_requires %{name} = %{version}-%{release} kdelibs4-debuginfo Name: kdebase4-runtime -Version: 17.08.2 +Version: 17.08.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) @@ -33,6 +33,8 @@ Source3: kde-settings.directory Source4: KDE-Sys-Log-Out.ogg Patch1: kdesu-remember-keep-password.diff +# PATCH-FIX-OPENSUSE use-tirpc-for-nfs.patch -- Replace SunRPC with TI-RPC +Patch2: use-tirpc-for-nfs.patch Patch4: ksuseinstall.diff Patch5: kdesu-symbol-lookup-workaround.diff # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- bnc#852256 @@ -59,6 +61,7 @@ BuildRequires: libqca2-devel BuildRequires: libsmbclient-devel BuildRequires: libssh-devel >= 0.6.0 +BuildRequires: libtirpc-devel BuildRequires: lzma-devel BuildRequires: openexr-devel BuildRequires: openslp-devel @@ -113,6 +116,7 @@ %setup -q -n kde-runtime-%{version} cp %{SOURCE4} $RPM_BUILD_DIR/kde-runtime-%{version}/knotify/sounds/ %patch1 -p1 +%patch2 -p1 %patch4 -p1 %patch5 -p1 %patch7 -p1 ++++++ kde-runtime-17.08.2.tar.xz -> kde-runtime-17.08.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-runtime/kde-runtime-17.08.2.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kde-runtime-17.08.3.tar.xz differ: char 27, line 1 ++++++ use-tirpc-for-nfs.patch ++++++ diff --git a/cmake/modules/FindTIRPC.cmake b/cmake/modules/FindTIRPC.cmake new file mode 100644 index 0000000..20e78f9 --- /dev/null +++ b/cmake/modules/FindTIRPC.cmake @@ -0,0 +1,60 @@ +# - Try to find TI-RPC +# +# The following variables will be available once found : +# +# TIRPC_INCLUDE_DIRS - The TI-RPC headers location +# TIRPC_LIBRARIES - Link these to use TI-RPC +# TIRPC_VERSION - The TIRPC version +# +#============================================================================= +# Copyright (c) 2017 Christophe Giboudeaux <[email protected]> +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +find_package(PkgConfig QUIET) +pkg_check_modules(PC_TIRPC libtirpc) + +find_path(TIRPC_INCLUDE_DIRS + NAMES netconfig.h + PATH_SUFFIXES tirpc + HINTS ${PC_TIRPC_INCLUDE_DIRS} +) + +find_library(TIRPC_LIBRARIES + NAMES tirpc + HINTS ${PC_TIRPC_LIBRARY_DIRS} +) + +set(TIRPC_VERSION ${PC_TIRPC_VERSION}) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(TIRPC + REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS + VERSION_VAR TIRPC_VERSION +) + +mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES) diff --git a/kioslave/nfs/CMakeLists.txt b/kioslave/nfs/CMakeLists.txt index 0d62d7b..9a9dec5 100644 --- a/kioslave/nfs/CMakeLists.txt +++ b/kioslave/nfs/CMakeLists.txt @@ -1,3 +1,12 @@ +find_package(TIRPC) + +set_package_properties(TIRPC PROPERTIES + TYPE REQUIRED + PURPOSE "TIRPC provides a replacement for SunRPC" +) + +include_directories(BEFORE ${TIRPC_INCLUDE_DIRS}) + ## Check for XDR functions include(CheckFunctionExists) @@ -31,7 +40,7 @@ set(kio_nfs_PART_SRCS kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nf kde4_add_plugin(kio_nfs ${kio_nfs_PART_SRCS}) -target_link_libraries(kio_nfs ${KDE4_KIO_LIBS}) +target_link_libraries(kio_nfs ${TIRPC_LIBRARIES} ${KDE4_KIO_LIBS}) install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR} )
