Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rnp for openSUSE:Factory checked in at 2023-06-16 16:53:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rnp (Old) and /work/SRC/openSUSE:Factory/.rnp.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rnp" Fri Jun 16 16:53:31 2023 rev:10 rq:1093176 version:0.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rnp/rnp.changes 2023-06-14 16:30:35.894932488 +0200 +++ /work/SRC/openSUSE:Factory/.rnp.new.15902/rnp.changes 2023-06-16 16:54:25.413556382 +0200 @@ -1,0 +2,12 @@ +Wed Jun 14 21:01:38 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de> + +- build with system sexp library + (add rnp-v0.17.0-system-sexp.patch) +- drop rnp-v0.17.0-gcc13.patch no longer needed + +------------------------------------------------------------------- +Wed Jun 14 20:57:32 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de> + +- fix build on Leap (json-c) + +------------------------------------------------------------------- Old: ---- rnp-v0.17.0-gcc13.patch New: ---- rnp-v0.17.0-system-sexp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rnp.spec ++++++ --- /var/tmp/diff_new_pack.wTATMX/_old 2023-06-16 16:54:25.909559332 +0200 +++ /var/tmp/diff_new_pack.wTATMX/_new 2023-06-16 16:54:25.913559356 +0200 @@ -28,15 +28,16 @@ Source2: https://github.com/rnpgp/rnp/releases/download/v%{version}/%{name}-v%{version}.tar.gz.asc Source3: https://www.rnpgp.org/openpgp_keys/31AF5A24D861EFCB7CB79A1924900CE0AEFB5417-50DA59D5B9134FA2DB1EB20CFB829AB5D0FE017F.asc#/%{name}.keyring Patch0: rnp-v0.17.0-disable-static.patch -Patch1: rnp-v0.17.0-gcc13.patch +Patch2: rnp-v0.17.0-system-sexp.patch BuildRequires: cmake >= 3.18 BuildRequires: gcc-c++ BuildRequires: gpg2 >= 2.2 BuildRequires: gtest BuildRequires: pkgconfig -BuildRequires: cmake(json-c) >= 0.11 BuildRequires: pkgconfig(botan-2) >= 2.14.0 BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(json-c) >= 0.11 +BuildRequires: pkgconfig(sexp) >= 0.8.2 BuildRequires: pkgconfig(zlib) BuildRequires: rubygem(asciidoctor) @@ -44,9 +45,7 @@ RNP is a set of OpenPGP (RFC4880) tools, an alternative to GnuPG. %package -n librnp%{soname} -%global libsexp_version 0.8.2 Summary: OpenPGP implementation as a C++ library fully compliant with RFC 4880 -Provides: bundled(libsexp) = %{libsexp_version} %description -n librnp%{soname} RNP is a set of OpenPGP (RFC4880) tools, an alternative to GnuPG. @@ -63,15 +62,12 @@ %prep %autosetup -p1 -n %{name}-v%{version} -pushd src/libsexp -cp LICENSE.md ../../LICENSE-libsexp.md -grep -q %{libsexp_version} version.txt -popd +rm -rf src/libsexp %build %cmake \ - -DDOWNLOAD_GTEST=off \ - -DBUILD_TESTING=on \ + -DDOWNLOAD_GTEST:BOOL=OFF \ + -DBUILD_TESTING:BOOL=ON \ %{nil} %cmake_build ++++++ rnp-v0.17.0-system-sexp.patch ++++++ Index: rnp-v0.17.0/CMakeLists.txt =================================================================== --- rnp-v0.17.0.orig/CMakeLists.txt +++ rnp-v0.17.0/CMakeLists.txt @@ -176,10 +176,8 @@ if (ENABLE_FUZZERS) endif() add_subdirectory(src/common) -set(WITH_SEXP_CLI OFF) -set(WITH_SEXP_TESTS OFF) -set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development) -add_subdirectory(src/libsexp EXCLUDE_FROM_ALL) +find_package(PkgConfig REQUIRED) +pkg_check_modules(SEXP REQUIRED sexp) add_subdirectory(src/lib) add_subdirectory(src/rnp)
