Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ebook-tools for openSUSE:Factory checked in at 2025-03-24 13:25:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ebook-tools (Old) and /work/SRC/openSUSE:Factory/.ebook-tools.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ebook-tools" Mon Mar 24 13:25:14 2025 rev:25 rq:1255003 version:0.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ebook-tools/ebook-tools.changes 2024-02-23 16:41:26.478880542 +0100 +++ /work/SRC/openSUSE:Factory/.ebook-tools.new.2696/ebook-tools.changes 2025-03-24 13:25:15.682321842 +0100 @@ -1,0 +2,8 @@ +Fri Mar 21 12:33:41 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Add patch: + * ebook-tools-cmake4.patch +- Rebase patches +- Drop unneeded baselibs.conf + +------------------------------------------------------------------- Old: ---- baselibs.conf New: ---- ebook-tools-cmake4.patch BETA DEBUG BEGIN: New:- Add patch: * ebook-tools-cmake4.patch - Rebase patches BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ebook-tools.spec ++++++ --- /var/tmp/diff_new_pack.yoni0g/_old 2025-03-24 13:25:16.670363010 +0100 +++ /var/tmp/diff_new_pack.yoni0g/_new 2025-03-24 13:25:16.670363010 +0100 @@ -1,7 +1,7 @@ # # spec file for package ebook-tools # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,16 +21,16 @@ Release: 0 Summary: A library for reading ebook files License: MIT -Group: Development/Libraries/C and C++ URL: https://sourceforge.net/projects/ebook-tools/ Source: %{name}-%{version}.tar.gz -Source1: baselibs.conf -Patch1: ebook-tools-64bit-installation.diff -Patch2: ebook-tools-visibility-hidden.patch +Patch0: ebook-tools-64bit-installation.diff +Patch1: ebook-tools-visibility-hidden.patch # PATCH-FIX-OPENSUSE - fix https://sourceforge.net/p/ebook-tools/bugs/8/ -Patch3: 0001-Avoid-crash-on-toc.ncx-navPoint-without-navLabel.patch +Patch2: 0001-Avoid-crash-on-toc.ncx-navPoint-without-navLabel.patch # PATCH-FIX-OPENSUSE -Patch4: 0002-Avoid-crash-on-spine-itemref-without-idref.patch +Patch3: 0002-Avoid-crash-on-spine-itemref-without-idref.patch +# PATCH-FIX-UPSTREAM +Patch4: ebook-tools-cmake4.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -38,30 +38,24 @@ BuildRequires: pkgconfig(libzip) %description -ebook-tools provides some tools to handle ebook files +ebook-tools provides some tools to handle ebook files. %package -n libepub0 Summary: A library for reading ebook files -Group: Development/Libraries/C and C++ %description -n libepub0 libepub library is needed for okular to support ebook format. %package -n libepub-devel Summary: Header files for libepub library -Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libepub0 = %{version} %description -n libepub-devel -Header files for the libepub library +Header files for the libepub library. %prep -%setup -q -%patch -P 1 -p1 -%patch -P 2 -%patch -P 3 -p1 -%patch -P 4 -p1 +%autosetup -p1 %build %cmake @@ -70,10 +64,8 @@ %install %cmake_install -nm -C -D %{buildroot}%{_libdir}/libepub.so.* -%post -n libepub0 -p /sbin/ldconfig -%postun -n libepub0 -p /sbin/ldconfig +%ldconfig_scriptlets -n libepub0 %files %{_bindir}/einfo ++++++ ebook-tools-64bit-installation.diff ++++++ --- /var/tmp/diff_new_pack.yoni0g/_old 2025-03-24 13:25:16.718365011 +0100 +++ /var/tmp/diff_new_pack.yoni0g/_new 2025-03-24 13:25:16.722365177 +0100 @@ -1,7 +1,8 @@ -diff -Naur ebook-tools-0.2.2.orig/CMakeLists.txt ebook-tools-0.2.2/CMakeLists.txt ---- ebook-tools-0.2.2.orig/CMakeLists.txt 2012-09-04 16:32:32.000000000 +0200 -+++ ebook-tools-0.2.2/CMakeLists.txt 2013-10-13 00:16:47.779199221 +0200 -@@ -2,6 +2,8 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc141c2..c2f2b66 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,8 @@ project (EBOOK-TOOLS C) cmake_minimum_required(VERSION 2.4.0) @@ -10,9 +11,10 @@ #set(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) set(LIBRARY_OUTPUT_PATH ${EBOOK-TOOLS_BINARY_DIR}/libs) set(EXECUTABLE_OUTPUT_PATH ${EBOOK-TOOLS_BINARY_DIR}/bin) -diff -Naur ebook-tools-0.2.2.orig/src/libepub/CMakeLists.txt ebook-tools-0.2.2/src/libepub/CMakeLists.txt ---- ebook-tools-0.2.2.orig/src/libepub/CMakeLists.txt 2012-09-04 16:32:32.000000000 +0200 -+++ ebook-tools-0.2.2/src/libepub/CMakeLists.txt 2013-10-13 00:11:35.694100822 +0200 +diff --git a/src/libepub/CMakeLists.txt b/src/libepub/CMakeLists.txt +index a3208b7..3bebea7 100644 +--- a/src/libepub/CMakeLists.txt ++++ b/src/libepub/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories (${EBOOK-TOOLS_SOURCE_DIR}/src/libepub ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR}) +include_directories (${EBOOK-TOOLS_SOURCE_DIR}/src/libepub ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR} ${ZIP_INCLUDE_DIRS} ) ++++++ ebook-tools-cmake4.patch ++++++ >From ff65f88d25d8c76ed467b1f3c532c7338ed162d1 Mon Sep 17 00:00:00 2001 From: Christophe Marin <christo...@krop.fr> Date: Thu, 20 Mar 2025 23:17:57 +0100 Subject: [PATCH] Fix build with CMake 4 Required CMake versions older than 3.5 will throw errors. Bump the minimum version to 3.16 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bb621c..1dcb5f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ -project (EBOOK-TOOLS C) +cmake_minimum_required(VERSION 3.16) -cmake_minimum_required(VERSION 2.4.0) +project (EBOOK-TOOLS C) find_package(PkgConfig) pkg_check_modules(ZIP libzip) -- 2.49.0 ++++++ ebook-tools-visibility-hidden.patch ++++++ --- /var/tmp/diff_new_pack.yoni0g/_old 2025-03-24 13:25:16.746366177 +0100 +++ /var/tmp/diff_new_pack.yoni0g/_new 2025-03-24 13:25:16.746366177 +0100 @@ -1,5 +1,20 @@ ---- src/libepub/epub_shared.h.orig -+++ src/libepub/epub_shared.h +diff --git a/CMakeLists.txt b/CMakeLists.txt +index abc7474..1dcb5f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,7 +16,7 @@ find_package(LibXml2 REQUIRED) + find_package(LibZip REQUIRED) + + if(CMAKE_C_COMPILER_ID MATCHES GNU) +- set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common ${CMAKE_C_FLAGS}") ++ set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common -fvisibility=hidden ${CMAKE_C_FLAGS}") + endif(CMAKE_C_COMPILER_ID MATCHES GNU) + if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +diff --git a/src/libepub/epub_shared.h b/src/libepub/epub_shared.h +index 17f7049..1f585be 100644 +--- a/src/libepub/epub_shared.h ++++ b/src/libepub/epub_shared.h @@ -8,7 +8,7 @@ # define EPUB_EXPORT __declspec(dllimport) # endif @@ -9,15 +24,4 @@ #endif /** ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -15,7 +15,7 @@ find_package(LibXml2 REQUIRED) - find_package(LibZip REQUIRED) - - if(CMAKE_C_COMPILER_ID MATCHES GNU) -- set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common ${CMAKE_C_FLAGS}") -+ set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common -fvisibility=hidden ${CMAKE_C_FLAGS}") - endif(CMAKE_C_COMPILER_ID MATCHES GNU) - if(MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS)
