- updated to 1.4 (bzip2 support)

diff --git a/cmake.patch b/cmake.patch
index d6ee4571c8be05e6ca45a0d44163fa97ae4d7dce..742c7e12b954bddf34242ad24e29930d32ae7851 100644 (file)
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,18 +1,17 @@
-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)
+--- quazip-1.4/CMakeLists.txt.orig     2023-01-22 21:03:50.000000000 +0100
++++ quazip-1.4/CMakeLists.txt  2023-01-25 21:18:52.501026579 +0100
+@@ -5,8 +5,8 @@ project(QuaZip VERSION 1.4)
  
- set(CMAKE_CXX_STANDARD 14)
+ include(cmake/clone-repo.cmake)
  
 -set(QUAZIP_LIB_VERSION ${QuaZip_VERSION})
--set(QUAZIP_LIB_SOVERSION 1.3.0)
+-set(QUAZIP_LIB_SOVERSION 1.4.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
+ if(EMSCRIPTEN)
+   #option(ZLIB_INCLUDE "Path to include dir" "")
+@@ -68,7 +68,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)

diff --git a/quazip.spec b/quazip.spec
index 5dc26c1472193dac869e98c8e489dee52525b7c2..c638a8b528be39f37de9098abe9d6db7c7a70dba 100644 (file)
--- a/quazip.spec
+++ b/quazip.spec
@@ -8,19 +8,24 @@
 Summary:       Qt/C++ wrapper for the minizip library
 Summary(pl.UTF-8):     Obudowanie Qt/C++ do biblioteki minizip
 Name:          quazip
-Version:       1.3
+Version:       1.4
 Release:       1
 License:       GPL v2+ or LGPL v2+
 Group:         X11/Libraries
 #Source0Download: https://github.com/stachenov/quazip/releases
 Source0:       https://github.com/stachenov/quazip/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 52b45020f8153a45920cd572d777c6a7
+# Source0-md5: f861638a19acaece2aaea11f7ec3b812
 Patch0:                cmake.patch
 URL:           https://stachenov.github.io/quazip/
+BuildRequires: bzip2-devel
 BuildRequires: cmake >= 3.15
 BuildRequires: doxygen
 BuildRequires: graphviz
+%if %{with qt6}
+BuildRequires: libstdc++-devel >= 6:7
+%else
 BuildRequires: libstdc++-devel >= 6:5
+%endif
 BuildRequires: rpm-build >= 4.6
 BuildRequires: zlib-devel
 %if %{with qt4}
@@ -361,13 +366,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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
+%attr(755,root,root) %ghost %{_libdir}/libquazip1-qt4.so.1.4
 
 %files qt4-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libquazip1-qt4.so
-%{_includedir}/QuaZip-Qt4-1.3
-%{_libdir}/cmake/QuaZip-Qt4-1.3
+%{_includedir}/QuaZip-Qt4-1.4
+%{_libdir}/cmake/QuaZip-Qt4-1.4
 %{_pkgconfigdir}/quazip1-qt4.pc
 
 %if %{with static_libs}
@@ -382,13 +387,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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
+%attr(755,root,root) %ghost %{_libdir}/libquazip1-qt5.so.1.4
 
 %files qt5-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libquazip1-qt5.so
-%{_includedir}/QuaZip-Qt5-1.3
-%{_libdir}/cmake/QuaZip-Qt5-1.3
+%{_includedir}/QuaZip-Qt5-1.4
+%{_libdir}/cmake/QuaZip-Qt5-1.4
 %{_pkgconfigdir}/quazip1-qt5.pc
 
 %if %{with static_libs}
@@ -403,13 +408,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING NEWS.txt README.md
 %attr(755,root,root) %{_libdir}/libquazip1-qt6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libquazip1-qt6.so.1.3
+%attr(755,root,root) %ghost %{_libdir}/libquazip1-qt6.so.1.4
 
 %files qt6-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libquazip1-qt6.so
-%{_includedir}/QuaZip-Qt6-1.3
-%{_libdir}/cmake/QuaZip-Qt6-1.3
+%{_includedir}/QuaZip-Qt6-1.4
+%{_libdir}/cmake/QuaZip-Qt6-1.4
 %{_pkgconfigdir}/quazip1-qt6.pc
 
 %if %{with static_libs}