From f391b2ef96ac68c088e089b00a22572b17d84e51 Mon Sep 17 00:00:00 2001 From: Bartek Szady Date: Tue, 24 Jan 2023 22:10:48 +0100 Subject: [PATCH] - updated to 1.3 --- cmake.patch | 23 +++++++++++++++++++++++ quazip.spec | 47 ++++++++++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 cmake.patch diff --git a/cmake.patch b/cmake.patch new file mode 100644 index 0000000..d6ee457 --- /dev/null +++ b/cmake.patch @@ -0,0 +1,23 @@ +diff -up quazip-1.3/CMakeLists.txt._orig quazip-1.3/CMakeLists.txt +--- quazip-1.3/CMakeLists.txt._orig 2022-04-16 14:46:16.000000000 +0200 ++++ quazip-1.3/CMakeLists.txt 2023-01-22 22:04:21.433521145 +0100 +@@ -5,8 +5,8 @@ project(QuaZip VERSION 1.3) + + set(CMAKE_CXX_STANDARD 14) + +-set(QUAZIP_LIB_VERSION ${QuaZip_VERSION}) +-set(QUAZIP_LIB_SOVERSION 1.3.0) ++set(QUAZIP_LIB_VERSION ${QuaZip_VERSION}.0) ++set(QUAZIP_LIB_SOVERSION ${QuaZip_VERSION}) + + option(BUILD_SHARED_LIBS "" ON) + option(QUAZIP_INSTALL "" ON) +@@ -46,7 +46,7 @@ set(QUAZIP_SOURCE_DIR ${CMAKE_CURRENT_SO + set(QUAZIP_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) + set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSION}) + set(QUAZIP_LIB_TARGET_NAME QuaZip) +-set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION}) ++set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QuaZip_VERSION}) + set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}) + + if(QUAZIP_QT_MAJOR_VERSION EQUAL 6) diff --git a/quazip.spec b/quazip.spec index 736d4f5..5c315ff 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,19 +1,23 @@ +# TODO: +# - test or remove Qt 4 version +# - compile static library if needed # # Conditional build: -%bcond_without qt4 # Qt 4 version +%bcond_with qt4 # Qt 4 version %bcond_without qt5 # Qt 5 version Summary: Qt/C++ wrapper for the minizip library Summary(pl.UTF-8): Obudowanie Qt/C++ do biblioteki minizip Name: quazip -Version: 0.7.2 -Release: 2 +Version: 1.3 +Release: 1 License: GPL v2+ or LGPL v2+ Group: X11/Libraries -Source0: http://downloads.sourceforge.net/quazip/%{name}-%{version}.tar.gz -# Source0-md5: 84163487a4c3470781c93e5f56c4ca43 -URL: http://quazip.sourceforge.net/ -BuildRequires: cmake >= 2.6 +Source0: https://github.com/stachenov/quazip/archive/v%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 52b45020f8153a45920cd572d777c6a7 +Patch0: cmake.patch +URL: https://stachenov.github.io/quazip/ +BuildRequires: cmake >= 3.15 BuildRequires: doxygen BuildRequires: graphviz BuildRequires: libstdc++-devel @@ -140,6 +144,7 @@ Statyczna biblioteka QuaZIP (wersja dla Qt 5). %prep %setup -q +%patch0 -p1 %build install -d build-qt{4,5} @@ -190,16 +195,17 @@ rm -rf $RPM_BUILD_ROOT %if %{with qt4} %files %defattr(644,root,root,755) -%doc COPYING NEWS.txt README.txt -%attr(755,root,root) %{_libdir}/libquazip.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libquazip.so.1 +%doc COPYING NEWS.txt README.md +%attr(755,root,root) %{_libdir}/libquazip1-qt4.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libquazip1-qt4.so.1.3 %files devel %defattr(644,root,root,755) %doc doc/html -%attr(755,root,root) %{_libdir}/libquazip.so -%{_includedir}/quazip -%{_datadir}/cmake/Modules/FindQuaZip.cmake +%attr(755,root,root) %{_libdir}/libquazip1-qt4.so +%{_includedir}/QuaZip-Qt4-1.3 +%{_libdir}/cmake/QuaZip-Qt4-1.3 +%{_pkgconfigdir}/quazip1-qt4.pc %files static %defattr(644,root,root,755) @@ -209,18 +215,21 @@ rm -rf $RPM_BUILD_ROOT %if %{with qt5} %files qt5 %defattr(644,root,root,755) -%doc COPYING NEWS.txt README.txt -%attr(755,root,root) %{_libdir}/libquazip5.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libquazip5.so.1 +%doc COPYING NEWS.txt README.md +%attr(755,root,root) %{_libdir}/libquazip1-qt5.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libquazip1-qt5.so.1.3 %files qt5-devel %defattr(644,root,root,755) %doc doc/html -%attr(755,root,root) %{_libdir}/libquazip5.so -%{_includedir}/quazip5 -%{_datadir}/cmake/Modules/FindQuaZip5.cmake +%attr(755,root,root) %{_libdir}/libquazip1-qt5.so +%{_includedir}/QuaZip-Qt5-1.3 +%{_libdir}/cmake/QuaZip-Qt5-1.3 +%{_pkgconfigdir}/quazip1-qt5.pc +%if 0 %files qt5-static %defattr(644,root,root,755) %{_libdir}/libquazip5.a %endif +%endif -- 2.44.0