Hello community, here is the log from the commit of package z3 for openSUSE:Factory checked in at 2020-07-18 21:02:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/z3 (Old) and /work/SRC/openSUSE:Factory/.z3.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "z3" Sat Jul 18 21:02:43 2020 rev:23 rq:821644 version:4.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/z3/z3.changes 2020-07-16 12:21:22.579142121 +0200 +++ /work/SRC/openSUSE:Factory/.z3.new.3592/z3.changes 2020-07-18 21:03:08.499620428 +0200 @@ -1,0 +2,6 @@ +Fri Jul 17 23:58:58 UTC 2020 - Mark Stopka <[email protected]> + +- Backport pkg-config support from upstream + * add 5a42a000e938a295feb1a7070dd74b192796db4e.patch + +------------------------------------------------------------------- New: ---- 5a42a000e938a295feb1a7070dd74b192796db4e.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ z3.spec ++++++ --- /var/tmp/diff_new_pack.ibCbBQ/_old 2020-07-18 21:03:11.483623635 +0200 +++ /var/tmp/diff_new_pack.ibCbBQ/_new 2020-07-18 21:03:11.487623639 +0200 @@ -26,10 +26,14 @@ URL: https://github.com/Z3Prover/z3/wiki Source0: https://github.com/Z3Prover/z3/archive/z3-%{version}.tar.gz Patch0: remove-timestamp.patch +# Remove after upstream bump, add PKG-CONFIG .pc file +# https://github.com/Z3Prover/z3/pull/4368 +Patch1: 5a42a000e938a295feb1a7070dd74b192796db4e.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gmp-devel BuildRequires: ninja +BuildRequires: pkg-config BuildRequires: python3-devel %description @@ -68,6 +72,7 @@ %prep %setup -q -n %{name}-%{name}-%{version} %patch0 -p1 +%patch1 -p1 %build %define __builder ninja @@ -103,6 +108,7 @@ %files devel %{_includedir}/z3*.h %{_libdir}/libz3.so +%{_libdir}/pkgconfig/z3.pc %dir %{_libdir}/cmake/z3/ %{_libdir}/cmake/z3/Z3Config.cmake %{_libdir}/cmake/z3/Z3ConfigVersion.cmake ++++++ 5a42a000e938a295feb1a7070dd74b192796db4e.patch ++++++ >From 5a42a000e938a295feb1a7070dd74b192796db4e Mon Sep 17 00:00:00 2001 From: Anton Kochkov <[email protected]> Date: Mon, 18 May 2020 12:35:47 +0800 Subject: [PATCH] Add pkg-config file --- CMakeLists.txt | 9 +++++++++ z3.pc.cmake.in | 13 +++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 z3.pc.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index a7aee90bb7..1ae3bce9ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -568,6 +568,9 @@ write_basic_package_version_file("${PROJECT_BINARY_DIR}/Z3ConfigVersion.cmake" COMPATIBILITY SameMajorVersion ) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/z3.pc.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/z3.pc" @ONLY) + ################################################################################ # Create `Z3Config.cmake` and related files for install tree so clients can use # Z3 via CMake. @@ -610,6 +613,12 @@ install( DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}" ) +# Add install rule to install ${PROJECT_BINARY_DIR}/z3.pc +install( + FILES "${PROJECT_BINARY_DIR}/z3.pc" + DESTINATION "${CMAKE_INSTALL_PKGCONFIGDIR}" +) + ################################################################################ # Examples ################################################################################ diff --git a/z3.pc.cmake.in b/z3.pc.cmake.in new file mode 100644 index 0000000000..af19698649 --- /dev/null +++ b/z3.pc.cmake.in @@ -0,0 +1,13 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_LIBDIR@ +sharedlibdir=@CMAKE_INSTALL_LIBDIR@ +includedir=@CMAKE_INSTALL_INCLUDEDIR@ + +Name: z3 +Description: The Z3 Theorem Prover +Version: @VERSION@ + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz3 +Cflags: -I${includedir}
