Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libxlsxwriter for openSUSE:Factory checked in at 2024-02-23 16:45:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxlsxwriter (Old) and /work/SRC/openSUSE:Factory/.libxlsxwriter.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxlsxwriter" Fri Feb 23 16:45:50 2024 rev:2 rq:1149676 version:1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/libxlsxwriter/libxlsxwriter.changes 2023-07-17 19:23:15.433727280 +0200 +++ /work/SRC/openSUSE:Factory/.libxlsxwriter.new.1770/libxlsxwriter.changes 2024-02-23 16:46:59.866966447 +0100 @@ -1,0 +2,7 @@ +Fri Feb 23 01:52:43 UTC 2024 - Joshua Smith <jsmith...@gmail.com> + +- Add find_minizip.patch -- upstream patches to fix usage of system + libraries. +- Switch to cmake, fixing 32bit builds. + +------------------------------------------------------------------- New: ---- find_minizip.patch BETA DEBUG BEGIN: New: - Add find_minizip.patch -- upstream patches to fix usage of system libraries. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxlsxwriter.spec ++++++ --- /var/tmp/diff_new_pack.On7JhD/_old 2024-02-23 16:47:01.171013736 +0100 +++ /var/tmp/diff_new_pack.On7JhD/_new 2024-02-23 16:47:01.175013881 +0100 @@ -1,7 +1,7 @@ # # spec file for package libxlsxwriter # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define libname libxlsxwriter5 Name: libxlsxwriter @@ -25,9 +26,14 @@ Group: Development/Libraries/C and C++ URL: https://github.com/jmcnamara/libxlsxwriter Source: https://github.com/jmcnamara/libxlsxwriter/archive/refs/tags/RELEASE_%{version}.tar.gz +# PATCH-FIX-UPSTREAM findminizip.patch -- Upstream patches around to fix detection of minizip +Patch0: find_minizip.patch +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: make +BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(zlib) +# Tests +BuildRequires: python3-pytest %description A C library for creating Excel XLSX files. @@ -52,15 +58,19 @@ This package holds the development files. %prep -%autosetup -p1 -n libxlsxwriter-RELEASE_%{version} +%autosetup -p1 -n %{name}-RELEASE_%{version} %build -%make_build +%cmake -DUSE_SYSTEM_MINIZIP=ON -DBUILD_TESTS=ON +%cmake_build %install -sed -i 's/PREFIX)\/lib/PREFIX)\/lib64/' Makefile -%make_install PREFIX="%{_prefix}" -rm %{buildroot}%{_libdir}/libxlsxwriter.a +%cmake_install + +%check +%ifnarch s390x +%ctest +%endif %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig ++++++ find_minizip.patch ++++++ >From 4aaca54c4188aaedca7d01a28f0c9d11f99d4cb2 Mon Sep 17 00:00:00 2001 From: John McNamara <jmcnam...@cpan.org> Date: Thu, 3 Aug 2023 01:07:49 +0100 Subject: [PATCH] Fix cmake minizip version check. Fix Cmake minizip version check that had an incorrect regex and resulted in the package not being found. Issue #405 --- cmake/FindMINIZIP.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/FindMINIZIP.cmake b/cmake/FindMINIZIP.cmake index ed19782e..bef784f5 100644 --- a/cmake/FindMINIZIP.cmake +++ b/cmake/FindMINIZIP.cmake @@ -90,9 +90,9 @@ FindStaticLibs(MINIZIP) # ------- if(MINIZIP_FOUND) - file(STRINGS "${MINIZIP_INCLUDE_DIRS}/zlib.h" MINIZIP_VERSION_CONTENTS REGEX "Version [0-9]+\\.[0-9]+(\\.[0-9]+)?") - string(REGEX REPLACE ".*Version ([0-9]+)\\.[0-9]+" "\\1" MINIZIP_VERSION_MAJOR "${MINIZIP_VERSION_CONTENTS}") - string(REGEX REPLACE ".*Version [0-9]+\\.([0-9]+)" "\\1" MINIZIP_VERSION_MINOR "${MINIZIP_VERSION_CONTENTS}") + file(STRINGS "${MINIZIP_INCLUDE_DIRS}/zlib.h" MINIZIP_VERSION_CONTENTS REGEX "version [0-9]+\\.[0-9]+(\\.[0-9]+)?") + string(REGEX REPLACE ".*version ([0-9]+)\\.[0-9]+" "\\1" MINIZIP_VERSION_MAJOR "${MINIZIP_VERSION_CONTENTS}") + string(REGEX REPLACE ".*version [0-9]+\\.([0-9]+)" "\\1" MINIZIP_VERSION_MINOR "${MINIZIP_VERSION_CONTENTS}") set(MINIZIP_VERSION_PATCH 0) set(MINIZIP_VERSION_STRING "${MINIZIP_VERSION_MAJOR}.${MINIZIP_VERSION_MINOR}.${MINIZIP_VERSION_PATCH}") >From f477741dd3782101eefb35f9c6f9ed93ee3f642d Mon Sep 17 00:00:00 2001 From: Yihua Liu <yihuaj...@live.cn> Date: Sat, 29 Apr 2023 16:50:51 +0800 Subject: [PATCH] fix: cmake zlib minizip ver required --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e656184d..fb5a2f5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,13 +219,13 @@ enable_language(CXX) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # ZLIB -find_package(ZLIB REQUIRED "1.0") +find_package(ZLIB "1.0" REQUIRED) list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}) message("zlib version: " ${ZLIB_VERSION}) # MINIZIP if (USE_SYSTEM_MINIZIP) - find_package(MINIZIP REQUIRED "1.0") + find_package(MINIZIP "1.0" REQUIRED) list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) endif()
