diff --git a/quazip-0.7.2-fix_static.patch b/quazip-0.7.6-fix_static.patch similarity index 71% rename from quazip-0.7.2-fix_static.patch rename to quazip-0.7.6-fix_static.patch index 60ec615..dd71128 100644 --- a/quazip-0.7.2-fix_static.patch +++ b/quazip-0.7.6-fix_static.patch @@ -1,12 +1,11 @@ -diff -up quazip-0.7.2/quazip/CMakeLists.txt.orig quazip-0.7.2/quazip/CMakeLists.txt ---- quazip-0.7.2/quazip/CMakeLists.txt.orig 2016-01-03 07:01:40.000000000 +0100 -+++ quazip-0.7.2/quazip/CMakeLists.txt 2016-04-27 14:07:12.492586196 +0200 -@@ -15,17 +15,17 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) +diff -up quazip/quazip/CMakeLists.txt.orig quazip/quazip/CMakeLists.txt +--- quazip/quazip/CMakeLists.txt.orig 2018-07-17 11:06:16.243887366 +0200 ++++ quazip/quazip/CMakeLists.txt 2018-07-17 11:17:10.088864720 +0200 +@@ -15,18 +15,16 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) set(SRCS ${SRCS} ${MOC_SRCS}) add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) -add_library(quazip_static STATIC ${SRCS}) -+#add_library(quazip_static STATIC ${SRCS}) # Windows uses .lib extension for both static and shared library # *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name @@ -18,8 +17,8 @@ diff -up quazip-0.7.2/quazip/CMakeLists.txt.orig quazip-0.7.2/quazip/CMakeLists. -set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION 1.0.0 SOVERSION 1 DEBUG_POSTFIX d) +set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 1 DEBUG_POSTFIX d) # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) --target_link_libraries(${QUAZIP_LIB_TARGET_NAME} quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) -+target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) +-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) -install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) diff --git a/quazip.spec b/quazip.spec index 8b6d261..26d92e2 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,11 +1,11 @@ Name: quazip -Version: 0.7.3 -Release: 5%{?dist} +Version: 0.7.6 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ -URL: http://quazip.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: quazip-0.7.2-fix_static.patch +URL: https://github.com/stachenov/quazip +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: quazip-0.7.6-fix_static.patch BuildRequires: cmake BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel @@ -25,7 +25,6 @@ from and writing to ZIP archives. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt4-devel%{?_isa} @@ -57,22 +56,21 @@ for developing applications that use %{name}. %prep -%setup -q -%patch0 -p1 -b .orig +%autosetup -p1 %build mkdir build-qt4 pushd build-qt4 %cmake .. -DBUILD_WITH_QT4:BOOL=ON -make %{?_smp_mflags} +%make_build popd mkdir build-qt5 pushd build-qt5 %cmake .. -DBUILD_WITH_QT4:BOOL=OFF -make %{?_smp_mflags} +%make_build popd doxygen Doxyfile @@ -84,12 +82,11 @@ done make install/fast DESTDIR=%{buildroot} -C build-qt5 make install/fast DESTDIR=%{buildroot} -C build-qt4 -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%doc COPYING NEWS.txt README.txt +%doc NEWS.txt README.md +%license COPYING %{_libdir}/libquazip.so.1* %files devel @@ -99,7 +96,8 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %{_datadir}/cmake/Modules/FindQuaZip.cmake %files qt5 -%doc COPYING NEWS.txt README.txt +%doc NEWS.txt README.md +%license COPYING %{_libdir}/libquazip5.so.1* %files qt5-devel @@ -110,6 +108,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Tue Jul 17 2018 Nicolas Chauvet - 0.7.6-1 +- Update to 0.7.6 + * Sat Jul 14 2018 Fedora Release Engineering - 0.7.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 8536e20..3cdd217 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (quazip-0.7.3.tar.gz) = d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe +SHA512 (quazip-0.7.6.tar.gz) = 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1