From 2cb067eeb795348f72f25bbfde9b7318432b44e8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 3 Feb 2010 04:18:26 +0000 Subject: [PATCH 01/71] Setup of module quazip --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..778aad5 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: quazip +# $Id$ +NAME := quazip +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From b170fe5ae19309dd16be61bf94dd4e208023b57a Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 3 Feb 2010 04:45:53 +0000 Subject: [PATCH 02/71] *** empty log message *** --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index e69de29..754d864 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +quazip-0.2.3.tar.gz diff --git a/sources b/sources index e69de29..fb8467e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1f2d72e5dc9e79831933197c0c82f974 quazip-0.2.3.tar.gz From 7d450a4207f191b9a51983e6e82b066259176926 Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 3 Feb 2010 04:51:56 +0000 Subject: [PATCH 03/71] Initial import --- quazip-path.patch | 42 ++++++++++++++++++++++++ quazip.spec | 84 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 quazip-path.patch create mode 100644 quazip.spec diff --git a/quazip-path.patch b/quazip-path.patch new file mode 100644 index 0000000..4afd0cf --- /dev/null +++ b/quazip-path.patch @@ -0,0 +1,42 @@ +--- quazip-0.2.3/quazip/quazip.pro 2008-01-16 00:39:37.000000000 +0800 ++++ quazip-0.2.3.new/quazip/quazip.pro 2010-01-31 02:30:00.319816815 +0800 +@@ -10,25 +10,20 @@ + INCLUDEPATH += . + + # Input +-HEADERS += crypt.h \ +- ioapi.h \ +- quazip.h \ ++HEADERS += quazip.h \ + quazipfile.h \ + quazipfileinfo.h \ +- quazipnewinfo.h \ +- unzip.h \ +- zip.h ++ quazipnewinfo.h + +-SOURCES += ioapi.c \ +- quazip.cpp \ ++SOURCES += quazip.cpp \ + quazipfile.cpp \ +- quazipnewinfo.cpp \ +- unzip.c \ +- zip.c ++ quazipnewinfo.cpp + + unix { + OBJECTS_DIR=.obj + MOC_DIR=.moc ++ INCLUDEPATH += /usr/include/minizip ++ LIBS += -lminizip + } + + # UNIX installation +@@ -38,6 +33,6 @@ + unix { + headers.path=$$PREFIX/include/quazip + headers.files=$$HEADERS +- target.path=$$PREFIX/lib ++ target.path=$$LIBDIR + INSTALLS += headers target + } diff --git a/quazip.spec b/quazip.spec new file mode 100644 index 0000000..2f50219 --- /dev/null +++ b/quazip.spec @@ -0,0 +1,84 @@ +Name: quazip +Version: 0.2.3 +Release: 4%{?dist} +Summary: Qt/C++ wrapper for the minizip library +License: GPLv2+ or LGPLv2+ +Group: System Environment/Libraries +URL: http://quazip.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# Fixes build and install +Patch0: quazip-path.patch +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: qt4-devel +#BuildRequires: zlib-devel +BuildRequires: minizip-devel + +%description +QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that +can be used to access ZIP archives. It uses Trolltech's Qt toolkit. + +QuaZIP allows you to access files inside ZIP archives using QIODevice API, +and - yes! - that means that you can also use QTextStream, QDataStream or +whatever you would like to use on your zipped files. + +QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading +from and writing to ZIP archives. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries, header files and documentations for +developing applications that use %{name}. + +%prep +%setup -q +%patch0 -p1 +#remove bundled minizip library +pushd quazip +rm -rf crypt.h ioapi* unzip* zip* +popd + +%build +export PATH=%{_qt4_bindir}:$PATH +%_qt4_qmake PREFIX=%{_prefix} LIBDIR=%{_libdir} +#do not build in parallel - there are race conditions in +#qmake-generated makefiles +make + +%install +rm -rf %{buildroot} +make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc COPYING* NEWS README +%{_libdir}/libquazip.so.* + +%files devel +%defattr(-,root,root,-) +%doc doc/html +%{_includedir}/%{name} +%{_libdir}/libquazip.so + +%changelog +* Sun Jan 31 2010 Chen Lei - 0.2.3-4 +- change license to GPLv2+ or LGPLv2+ + +* Sun Jan 31 2010 Chen Lei - 0.2.3-3 +- use %%doc for packaging documentations + +* Sun Jan 31 2010 Chen Lei - 0.2.3-2 +- use system-wide minizip library + +* Sun Jan 31 2010 Chen Lei - 0.2.3-1 +- initial rpm build From 510e03fc83157e90d643ebbdf11f5f554910632f Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 3 Feb 2010 05:13:58 +0000 Subject: [PATCH 04/71] Fix building --- quazip-path.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/quazip-path.patch b/quazip-path.patch index 4afd0cf..c6c72d6 100644 --- a/quazip-path.patch +++ b/quazip-path.patch @@ -40,3 +40,27 @@ + target.path=$$LIBDIR INSTALLS += headers target } +--- quazip-0.2.3.old/test/unzip/unzip.pro 2007-08-28 23:11:35.000000000 +0800 ++++ quazip-0.2.3/test/unzip/unzip.pro 2010-02-03 13:06:24.508318772 +0800 +@@ -7,7 +7,9 @@ + QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../.. ++INCLUDEPATH += /usr/include/minizip + unix:LIBS += -L../../quazip -lquazip ++unix:LIBS += -lminizip + win32:LIBS += -L../../quazip/release -lquazip + + # Input +--- quazip-0.2.3.old/test/zip/zip.pro 2007-08-28 23:11:35.000000000 +0800 ++++ quazip-0.2.3/test/zip/zip.pro 2010-02-03 13:05:03.282317770 +0800 +@@ -7,7 +7,9 @@ + QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../.. ++INCLUDEPATH += /usr/include/minizip + unix:LIBS += -L../../quazip -lquazip ++unix:LIBS += -lminizip + win32:LIBS += -L../../quazip/release -lquazip + + # Input From da19f21fca8c2bb515b5ed396bbac5837ee75ec5 Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 3 Feb 2010 06:16:01 +0000 Subject: [PATCH 05/71] quazip-devel must Requires minizip-devel --- quazip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 2f50219..58fa032 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -28,6 +28,7 @@ from and writing to ZIP archives. Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: minizip-devel %description devel The %{name}-devel package contains libraries, header files and documentations for @@ -71,6 +72,9 @@ rm -rf %{buildroot} %{_libdir}/libquazip.so %changelog +* Wed Feb 3 2010 Chen Lei - 0.2.3-5 +- quazip-devel must Requires minizip-devel + * Sun Jan 31 2010 Chen Lei - 0.2.3-4 - change license to GPLv2+ or LGPLv2+ From 643d5879daab2ad2125ef3979badc8a183ee46e9 Mon Sep 17 00:00:00 2001 From: supercyper Date: Sat, 17 Apr 2010 02:17:36 +0000 Subject: [PATCH 06/71] *** empty log message *** --- quazip.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/quazip.spec b/quazip.spec index 58fa032..de58536 100644 --- a/quazip.spec +++ b/quazip.spec @@ -27,8 +27,9 @@ from and writing to ZIP archives. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: minizip-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: minizip-devel%{?_isa} +Requires: qt4-devel%{?_isa} %description devel The %{name}-devel package contains libraries, header files and documentations for @@ -72,17 +73,17 @@ rm -rf %{buildroot} %{_libdir}/libquazip.so %changelog -* Wed Feb 3 2010 Chen Lei - 0.2.3-5 +* Wed Feb 3 2010 Chen Lei - 0.2.3-5 - quazip-devel must Requires minizip-devel -* Sun Jan 31 2010 Chen Lei - 0.2.3-4 +* Sun Jan 31 2010 Chen Lei - 0.2.3-4 - change license to GPLv2+ or LGPLv2+ -* Sun Jan 31 2010 Chen Lei - 0.2.3-3 +* Sun Jan 31 2010 Chen Lei - 0.2.3-3 - use %%doc for packaging documentations -* Sun Jan 31 2010 Chen Lei - 0.2.3-2 +* Sun Jan 31 2010 Chen Lei - 0.2.3-2 - use system-wide minizip library -* Sun Jan 31 2010 Chen Lei - 0.2.3-1 +* Sun Jan 31 2010 Chen Lei - 0.2.3-1 - initial rpm build From 733d9c3811947b4669edc95533ccd43ea1338584 Mon Sep 17 00:00:00 2001 From: supercyper Date: Sat, 24 Jul 2010 19:56:30 +0000 Subject: [PATCH 07/71] Update to 0.3 --- .cvsignore | 2 +- quazip-path.patch | 66 ----------------------------------------------- quazip.spec | 52 +++++++++++++++++++++---------------- sources | 2 +- 4 files changed, 32 insertions(+), 90 deletions(-) delete mode 100644 quazip-path.patch diff --git a/.cvsignore b/.cvsignore index 754d864..38c6cb2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -quazip-0.2.3.tar.gz +quazip-0.3.tar.gz diff --git a/quazip-path.patch b/quazip-path.patch deleted file mode 100644 index c6c72d6..0000000 --- a/quazip-path.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- quazip-0.2.3/quazip/quazip.pro 2008-01-16 00:39:37.000000000 +0800 -+++ quazip-0.2.3.new/quazip/quazip.pro 2010-01-31 02:30:00.319816815 +0800 -@@ -10,25 +10,20 @@ - INCLUDEPATH += . - - # Input --HEADERS += crypt.h \ -- ioapi.h \ -- quazip.h \ -+HEADERS += quazip.h \ - quazipfile.h \ - quazipfileinfo.h \ -- quazipnewinfo.h \ -- unzip.h \ -- zip.h -+ quazipnewinfo.h - --SOURCES += ioapi.c \ -- quazip.cpp \ -+SOURCES += quazip.cpp \ - quazipfile.cpp \ -- quazipnewinfo.cpp \ -- unzip.c \ -- zip.c -+ quazipnewinfo.cpp - - unix { - OBJECTS_DIR=.obj - MOC_DIR=.moc -+ INCLUDEPATH += /usr/include/minizip -+ LIBS += -lminizip - } - - # UNIX installation -@@ -38,6 +33,6 @@ - unix { - headers.path=$$PREFIX/include/quazip - headers.files=$$HEADERS -- target.path=$$PREFIX/lib -+ target.path=$$LIBDIR - INSTALLS += headers target - } ---- quazip-0.2.3.old/test/unzip/unzip.pro 2007-08-28 23:11:35.000000000 +0800 -+++ quazip-0.2.3/test/unzip/unzip.pro 2010-02-03 13:06:24.508318772 +0800 -@@ -7,7 +7,9 @@ - QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../.. -+INCLUDEPATH += /usr/include/minizip - unix:LIBS += -L../../quazip -lquazip -+unix:LIBS += -lminizip - win32:LIBS += -L../../quazip/release -lquazip - - # Input ---- quazip-0.2.3.old/test/zip/zip.pro 2007-08-28 23:11:35.000000000 +0800 -+++ quazip-0.2.3/test/zip/zip.pro 2010-02-03 13:05:03.282317770 +0800 -@@ -7,7 +7,9 @@ - QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../.. -+INCLUDEPATH += /usr/include/minizip - unix:LIBS += -L../../quazip -lquazip -+unix:LIBS += -lminizip - win32:LIBS += -L../../quazip/release -lquazip - - # Input diff --git a/quazip.spec b/quazip.spec index de58536..ff7ae6a 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,17 +1,14 @@ -Name: quazip -Version: 0.2.3 -Release: 5%{?dist} -Summary: Qt/C++ wrapper for the minizip library -License: GPLv2+ or LGPLv2+ -Group: System Environment/Libraries -URL: http://quazip.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Fixes build and install -Patch0: quazip-path.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: qt4-devel -#BuildRequires: zlib-devel -BuildRequires: minizip-devel +Name: quazip +Version: 0.3 +Release: 1%{?dist} +Summary: Qt/C++ wrapper for the minizip library +License: GPLv2+ or LGPLv2+ +Group: System Environment/Libraries +URL: http://quazip.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +BuildRequires: qt4-devel +BuildRequires: minizip-devel +BuildRequires: doxygen %description QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that @@ -32,26 +29,34 @@ Requires: minizip-devel%{?_isa} Requires: qt4-devel%{?_isa} %description devel -The %{name}-devel package contains libraries, header files and documentations for -developing applications that use %{name}. +The %{name}-devel package contains libraries, header files and documentation +for developing applications that use %{name}. %prep %setup -q -%patch0 -p1 + #remove bundled minizip library -pushd quazip +pushd %{name} rm -rf crypt.h ioapi* unzip* zip* popd +# Fixes build and install +sed -i 's\PREFIX/lib\PREFIX/%{_lib}\' %{name}/%{name}.pro +sed -i 's/\*.c //' %{name}/%{name}.pro + %build export PATH=%{_qt4_bindir}:$PATH -%_qt4_qmake PREFIX=%{_prefix} LIBDIR=%{_libdir} +%{_qt4_qmake} PREFIX=%{_prefix} LIBS+=" -lminizip" INCLUDEPATH+=" %{_includedir}/minizip" #do not build in parallel - there are race conditions in #qmake-generated makefiles make +doxygen Doxyfile +for file in doc/html/*; do + touch -r Doxyfile $file +done + %install -rm -rf %{buildroot} make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install %post -p /sbin/ldconfig @@ -64,15 +69,18 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING* NEWS README -%{_libdir}/libquazip.so.* +%{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/html %{_includedir}/%{name} -%{_libdir}/libquazip.so +%{_libdir}/*.so %changelog +* Sat Jul 24 2010 Chen Lei - 0.3-1 +- update to 0.3 + * Wed Feb 3 2010 Chen Lei - 0.2.3-5 - quazip-devel must Requires minizip-devel diff --git a/sources b/sources index fb8467e..d89e4e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f2d72e5dc9e79831933197c0c82f974 quazip-0.2.3.tar.gz +7f4792471e8ac713f19a086638a17816 quazip-0.3.tar.gz From 7b38ed2b7a7130330dd3a979e437e084ca5adec3 Mon Sep 17 00:00:00 2001 From: supercyper Date: Sun, 25 Jul 2010 05:09:04 +0000 Subject: [PATCH 08/71] *** empty log message *** --- quazip.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/quazip.spec b/quazip.spec index ff7ae6a..8bf9377 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,14 +1,13 @@ Name: quazip Version: 0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries URL: http://quazip.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -BuildRequires: qt4-devel -BuildRequires: minizip-devel -BuildRequires: doxygen +BuildRequires: qt4-devel minizip-devel +BuildRequires: doxygen graphviz %description QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that @@ -46,7 +45,7 @@ sed -i 's/\*.c //' %{name}/%{name}.pro %build export PATH=%{_qt4_bindir}:$PATH -%{_qt4_qmake} PREFIX=%{_prefix} LIBS+=" -lminizip" INCLUDEPATH+=" %{_includedir}/minizip" +%{_qt4_qmake} PREFIX=%{_prefix} LIBS+=-lminizip INCLUDEPATH+=%{_includedir}/minizip #do not build in parallel - there are race conditions in #qmake-generated makefiles make @@ -78,6 +77,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Sat Jul 24 2010 Chen Lei - 0.3-2 +- add BR:graphviz for building apidocs + * Sat Jul 24 2010 Chen Lei - 0.3-1 - update to 0.3 From 20d8dbe1274c31b61290e23b028689437a702c85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:11:43 +0000 Subject: [PATCH 09/71] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 778aad5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: quazip -# $Id$ -NAME := quazip -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From b582001b606d3bf2c90de16a909f1cbf4f4c1e94 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 23:45:42 -0600 Subject: [PATCH 10/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 8bf9377..ab8028b 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -77,6 +77,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jul 24 2010 Chen Lei - 0.3-2 - add BR:graphviz for building apidocs From 4d0ad28615350f5e93dbfb756ba33ab70066f346 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 25 Jul 2011 14:39:02 +0200 Subject: [PATCH 11/71] Update to 0.4.1 --- .gitignore | 1 + quazip-0.4.1-ld.patch | 48 +++++++++++++++++++++++++++++++++++++++++++ quazip.spec | 20 ++++++++++-------- sources | 2 +- 4 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 quazip-0.4.1-ld.patch diff --git a/.gitignore b/.gitignore index 38c6cb2..c1435fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ quazip-0.3.tar.gz +/quazip-0.4.1.tar.gz diff --git a/quazip-0.4.1-ld.patch b/quazip-0.4.1-ld.patch new file mode 100644 index 0000000..a59e2ee --- /dev/null +++ b/quazip-0.4.1-ld.patch @@ -0,0 +1,48 @@ +diff -up quazip-0.4.1/test/checksum/checksum.pro.ld quazip-0.4.1/test/checksum/checksum.pro +--- quazip-0.4.1/test/checksum/checksum.pro.ld 2011-07-25 14:29:04.022774007 +0200 ++++ quazip-0.4.1/test/checksum/checksum.pro 2011-07-25 14:28:42.555773994 +0200 +@@ -8,7 +8,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.1/test/jlcompress/jlcompress.pro.ld quazip-0.4.1/test/jlcompress/jlcompress.pro +--- quazip-0.4.1/test/jlcompress/jlcompress.pro.ld 2011-03-06 05:41:55.000000000 +0100 ++++ quazip-0.4.1/test/jlcompress/jlcompress.pro 2011-07-25 14:29:29.444774008 +0200 +@@ -8,7 +8,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.1/test/unzip/unzip.pro.ld quazip-0.4.1/test/unzip/unzip.pro +--- quazip-0.4.1/test/unzip/unzip.pro.ld 2011-07-25 14:28:21.582774005 +0200 ++++ quazip-0.4.1/test/unzip/unzip.pro 2011-07-25 14:28:29.410774007 +0200 +@@ -5,7 +5,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.1/test/zip/zip.pro.ld quazip-0.4.1/test/zip/zip.pro +--- quazip-0.4.1/test/zip/zip.pro.ld 2011-05-14 18:48:01.000000000 +0200 ++++ quazip-0.4.1/test/zip/zip.pro 2011-07-25 14:29:46.963774006 +0200 +@@ -5,7 +5,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp diff --git a/quazip.spec b/quazip.spec index ab8028b..f3ac406 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,12 +1,14 @@ Name: quazip -Version: 0.3 -Release: 3%{?dist} +Version: 0.4.1 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries URL: http://quazip.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -BuildRequires: qt4-devel minizip-devel +Patch0: quazip-0.4.1-ld.patch +BuildRequires: qt4-devel +BuildRequires: minizip-devel BuildRequires: doxygen graphviz %description @@ -33,19 +35,16 @@ for developing applications that use %{name}. %prep %setup -q - -#remove bundled minizip library -pushd %{name} -rm -rf crypt.h ioapi* unzip* zip* -popd +%patch0 -p1 -b .ld # Fixes build and install sed -i 's\PREFIX/lib\PREFIX/%{_lib}\' %{name}/%{name}.pro sed -i 's/\*.c //' %{name}/%{name}.pro + %build export PATH=%{_qt4_bindir}:$PATH -%{_qt4_qmake} PREFIX=%{_prefix} LIBS+=-lminizip INCLUDEPATH+=%{_includedir}/minizip +%{_qt4_qmake} PREFIX=%{_prefix} #do not build in parallel - there are race conditions in #qmake-generated makefiles make @@ -77,6 +76,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Mon Jul 25 2011 Nicolas Chauvet - 0.4.1-1 +- Update to 0.4.1 + * Tue Feb 08 2011 Fedora Release Engineering - 0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index d89e4e6..45718a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f4792471e8ac713f19a086638a17816 quazip-0.3.tar.gz +73d185bc374d0062830682d77c6a7207 quazip-0.4.1.tar.gz From 7a1283d2c433c82705994ddf8bbd92402b46082f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 19 Aug 2011 16:54:03 +0200 Subject: [PATCH 12/71] Update to 0.4.2 --- .gitignore | 1 + quazip.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c1435fc..b8caa70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ quazip-0.3.tar.gz /quazip-0.4.1.tar.gz +/quazip-0.4.2.tar.gz diff --git a/quazip.spec b/quazip.spec index f3ac406..e3498ff 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,5 +1,5 @@ Name: quazip -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ @@ -76,6 +76,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Fri Aug 19 2011 Nicolas Chauvet - 0.4.2-1 +- Update to 0.4.2 + * Mon Jul 25 2011 Nicolas Chauvet - 0.4.1-1 - Update to 0.4.1 diff --git a/sources b/sources index 45718a4..4a236ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73d185bc374d0062830682d77c6a7207 quazip-0.4.1.tar.gz +e0a4d60331fc7ff9f7446145c2ffd1c0 quazip-0.4.2.tar.gz From e82c7c7d34c56017122146d3766554f9690c1f7b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 19 Aug 2011 18:48:56 +0200 Subject: [PATCH 13/71] - Rebase ld patch --- quazip-0.4.1-ld.patch | 48 ------------------------------------------- quazip-0.4.2-ld.patch | 48 +++++++++++++++++++++++++++++++++++++++++++ quazip.spec | 3 ++- sources | 2 +- 4 files changed, 51 insertions(+), 50 deletions(-) delete mode 100644 quazip-0.4.1-ld.patch create mode 100644 quazip-0.4.2-ld.patch diff --git a/quazip-0.4.1-ld.patch b/quazip-0.4.1-ld.patch deleted file mode 100644 index a59e2ee..0000000 --- a/quazip-0.4.1-ld.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up quazip-0.4.1/test/checksum/checksum.pro.ld quazip-0.4.1/test/checksum/checksum.pro ---- quazip-0.4.1/test/checksum/checksum.pro.ld 2011-07-25 14:29:04.022774007 +0200 -+++ quazip-0.4.1/test/checksum/checksum.pro 2011-07-25 14:28:42.555773994 +0200 -@@ -8,7 +8,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.1/test/jlcompress/jlcompress.pro.ld quazip-0.4.1/test/jlcompress/jlcompress.pro ---- quazip-0.4.1/test/jlcompress/jlcompress.pro.ld 2011-03-06 05:41:55.000000000 +0100 -+++ quazip-0.4.1/test/jlcompress/jlcompress.pro 2011-07-25 14:29:29.444774008 +0200 -@@ -8,7 +8,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.1/test/unzip/unzip.pro.ld quazip-0.4.1/test/unzip/unzip.pro ---- quazip-0.4.1/test/unzip/unzip.pro.ld 2011-07-25 14:28:21.582774005 +0200 -+++ quazip-0.4.1/test/unzip/unzip.pro 2011-07-25 14:28:29.410774007 +0200 -@@ -5,7 +5,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.1/test/zip/zip.pro.ld quazip-0.4.1/test/zip/zip.pro ---- quazip-0.4.1/test/zip/zip.pro.ld 2011-05-14 18:48:01.000000000 +0200 -+++ quazip-0.4.1/test/zip/zip.pro 2011-07-25 14:29:46.963774006 +0200 -@@ -5,7 +5,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp diff --git a/quazip-0.4.2-ld.patch b/quazip-0.4.2-ld.patch new file mode 100644 index 0000000..91e2bcb --- /dev/null +++ b/quazip-0.4.2-ld.patch @@ -0,0 +1,48 @@ +diff -up quazip-0.4.2/test/checksum/checksum.pro.ld quazip-0.4.2/test/checksum/checksum.pro +--- quazip-0.4.2/test/checksum/checksum.pro.ld 2011-03-06 05:41:55.000000000 +0100 ++++ quazip-0.4.2/test/checksum/checksum.pro 2011-08-19 18:42:08.914907703 +0200 +@@ -8,7 +8,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.2/test/jlcompress/jlcompress.pro.ld quazip-0.4.2/test/jlcompress/jlcompress.pro +--- quazip-0.4.2/test/jlcompress/jlcompress.pro.ld 2011-03-06 05:41:55.000000000 +0100 ++++ quazip-0.4.2/test/jlcompress/jlcompress.pro 2011-08-19 18:42:08.915907841 +0200 +@@ -8,7 +8,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.2/test/unzip/unzip.pro.ld quazip-0.4.2/test/unzip/unzip.pro +--- quazip-0.4.2/test/unzip/unzip.pro.ld 2011-05-14 18:48:01.000000000 +0200 ++++ quazip-0.4.2/test/unzip/unzip.pro 2011-08-19 18:46:26.937001113 +0200 +@@ -5,7 +5,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.2/test/zip/zip.pro.ld quazip-0.4.2/test/zip/zip.pro +--- quazip-0.4.2/test/zip/zip.pro.ld 2011-05-14 18:48:01.000000000 +0200 ++++ quazip-0.4.2/test/zip/zip.pro 2011-08-19 18:46:38.997643584 +0200 +@@ -5,7 +5,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp diff --git a/quazip.spec b/quazip.spec index e3498ff..200e612 100644 --- a/quazip.spec +++ b/quazip.spec @@ -6,7 +6,7 @@ License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries URL: http://quazip.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: quazip-0.4.1-ld.patch +Patch0: quazip-0.4.2-ld.patch BuildRequires: qt4-devel BuildRequires: minizip-devel BuildRequires: doxygen graphviz @@ -78,6 +78,7 @@ rm -rf %{buildroot} %changelog * Fri Aug 19 2011 Nicolas Chauvet - 0.4.2-1 - Update to 0.4.2 +- Rebase ld patch * Mon Jul 25 2011 Nicolas Chauvet - 0.4.1-1 - Update to 0.4.1 diff --git a/sources b/sources index 4a236ec..6444561 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0a4d60331fc7ff9f7446145c2ffd1c0 quazip-0.4.2.tar.gz +d48d18c08ff5fe87cde0597adb7835de quazip-0.4.2.tar.gz From 5208acead56ca141649e37058c83a27630e7aab9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 17 Dec 2011 18:01:52 +0100 Subject: [PATCH 14/71] Update to 0.4.3 --- .gitignore | 1 + quazip-0.4.2-ld.patch | 48 ------------------------------------------- quazip.spec | 20 +++++++++++------- sources | 2 +- 4 files changed, 15 insertions(+), 56 deletions(-) delete mode 100644 quazip-0.4.2-ld.patch diff --git a/.gitignore b/.gitignore index b8caa70..cc3366c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ quazip-0.3.tar.gz /quazip-0.4.1.tar.gz /quazip-0.4.2.tar.gz +/quazip-0.4.3.tar.gz diff --git a/quazip-0.4.2-ld.patch b/quazip-0.4.2-ld.patch deleted file mode 100644 index 91e2bcb..0000000 --- a/quazip-0.4.2-ld.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up quazip-0.4.2/test/checksum/checksum.pro.ld quazip-0.4.2/test/checksum/checksum.pro ---- quazip-0.4.2/test/checksum/checksum.pro.ld 2011-03-06 05:41:55.000000000 +0100 -+++ quazip-0.4.2/test/checksum/checksum.pro 2011-08-19 18:42:08.914907703 +0200 -@@ -8,7 +8,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.2/test/jlcompress/jlcompress.pro.ld quazip-0.4.2/test/jlcompress/jlcompress.pro ---- quazip-0.4.2/test/jlcompress/jlcompress.pro.ld 2011-03-06 05:41:55.000000000 +0100 -+++ quazip-0.4.2/test/jlcompress/jlcompress.pro 2011-08-19 18:42:08.915907841 +0200 -@@ -8,7 +8,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.2/test/unzip/unzip.pro.ld quazip-0.4.2/test/unzip/unzip.pro ---- quazip-0.4.2/test/unzip/unzip.pro.ld 2011-05-14 18:48:01.000000000 +0200 -+++ quazip-0.4.2/test/unzip/unzip.pro 2011-08-19 18:46:26.937001113 +0200 -@@ -5,7 +5,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.2/test/zip/zip.pro.ld quazip-0.4.2/test/zip/zip.pro ---- quazip-0.4.2/test/zip/zip.pro.ld 2011-05-14 18:48:01.000000000 +0200 -+++ quazip-0.4.2/test/zip/zip.pro 2011-08-19 18:46:38.997643584 +0200 -@@ -5,7 +5,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp diff --git a/quazip.spec b/quazip.spec index 200e612..fca50ed 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,14 +1,12 @@ Name: quazip -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries URL: http://quazip.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: quazip-0.4.2-ld.patch BuildRequires: qt4-devel -BuildRequires: minizip-devel BuildRequires: doxygen graphviz %description @@ -26,7 +24,6 @@ from and writing to ZIP archives. Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: minizip-devel%{?_isa} Requires: qt4-devel%{?_isa} %description devel @@ -35,11 +32,17 @@ for developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .ld + +# Fix EOL encoding +sed -i -e 's/\r//g' COPYING NEWS README.txt # Fixes build and install sed -i 's\PREFIX/lib\PREFIX/%{_lib}\' %{name}/%{name}.pro -sed -i 's/\*.c //' %{name}/%{name}.pro +sed -i -e 's/test\/unzip//' quazip.pro +sed -i -e 's/test\/zip//' quazip.pro +sed -i -e 's/test\/jlcompress//' quazip.pro +sed -i -e 's/test\/checksum//' quazip.pro + %build @@ -66,7 +69,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING* NEWS README +%doc COPYING NEWS README.txt %{_libdir}/*.so.* %files devel @@ -76,6 +79,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Sat Dec 17 2011 Nicolas Chauvet - 0.4.3-1 +- Update to 0.4.3 + * Fri Aug 19 2011 Nicolas Chauvet - 0.4.2-1 - Update to 0.4.2 - Rebase ld patch diff --git a/sources b/sources index 6444561..3d51fda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d48d18c08ff5fe87cde0597adb7835de quazip-0.4.2.tar.gz +5e548a988d059430930b61330b5bfade quazip-0.4.3.tar.gz From 8a9ad098bf4c96f7274f0a0551313a2b98a17733 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 20:34:39 -0600 Subject: [PATCH 15/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index fca50ed..2cb2d48 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -79,6 +79,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Dec 17 2011 Nicolas Chauvet - 0.4.3-1 - Update to 0.4.3 From 025650b321120427e48218188611587f3bfc0e24 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 16 Jan 2012 11:20:25 +0100 Subject: [PATCH 16/71] Update to 0.4.4 --- .gitignore | 1 + quazip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cc3366c..6bd6a85 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ quazip-0.3.tar.gz /quazip-0.4.1.tar.gz /quazip-0.4.2.tar.gz /quazip-0.4.3.tar.gz +/quazip-0.4.4.tar.gz diff --git a/quazip.spec b/quazip.spec index 2cb2d48..8baff11 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip -Version: 0.4.3 -Release: 2%{?dist} +Version: 0.4.4 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -79,6 +79,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Mon Jan 16 2012 Nicolas Chauvet - 0.4.4-1 +- Update to 0.4.4 + * Sat Jan 14 2012 Fedora Release Engineering - 0.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 3d51fda..d2023c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e548a988d059430930b61330b5bfade quazip-0.4.3.tar.gz +5ca4957f317cbaa6a826ff2de490d1d8 quazip-0.4.4.tar.gz From 4be3a3236a60d5022a351a1ea1f050c9fdef3e05 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 09:02:57 -0500 Subject: [PATCH 17/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 8baff11..7adefff 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -79,6 +79,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 0.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jan 16 2012 Nicolas Chauvet - 0.4.4-1 - Update to 0.4.4 From bdc8ec85882f52b01f398ce56cc467b178b16777 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 9 Sep 2012 13:56:30 +0200 Subject: [PATCH 18/71] Update to 0.5 --- .gitignore | 1 + quazip.spec | 17 ++++++----------- sources | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 6bd6a85..4449dc4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ quazip-0.3.tar.gz /quazip-0.4.2.tar.gz /quazip-0.4.3.tar.gz /quazip-0.4.4.tar.gz +/quazip-0.5.tar.gz diff --git a/quazip.spec b/quazip.spec index 7adefff..a61cdbb 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip -Version: 0.4.4 -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -33,16 +33,8 @@ for developing applications that use %{name}. %prep %setup -q -# Fix EOL encoding -sed -i -e 's/\r//g' COPYING NEWS README.txt - # Fixes build and install sed -i 's\PREFIX/lib\PREFIX/%{_lib}\' %{name}/%{name}.pro -sed -i -e 's/test\/unzip//' quazip.pro -sed -i -e 's/test\/zip//' quazip.pro -sed -i -e 's/test\/jlcompress//' quazip.pro -sed -i -e 's/test\/checksum//' quazip.pro - %build @@ -69,7 +61,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING NEWS README.txt +%doc COPYING NEWS.txt README.txt %{_libdir}/*.so.* %files devel @@ -79,6 +71,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Sun Sep 09 2012 Nicolas Chauvet - 0.5-1 +- Update to 0.5 + * Sat Jul 21 2012 Fedora Release Engineering - 0.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index d2023c7..63e413f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ca4957f317cbaa6a826ff2de490d1d8 quazip-0.4.4.tar.gz +ab0763709c7e6863b30ffd018397a6d3 quazip-0.5.tar.gz From 6a10b6e0177845f03d88b01496a9b004431cf54d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 15:17:10 -0600 Subject: [PATCH 19/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index a61cdbb..f8eaf5e 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Sep 09 2012 Nicolas Chauvet - 0.5-1 - Update to 0.5 From 70f1417a8ae3da1bc665daf6b8f669fff0c86aca Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 3 Mar 2013 12:58:17 +0100 Subject: [PATCH 20/71] Update to 0.5.1 --- .gitignore | 1 + quazip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4449dc4..bf0f997 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ quazip-0.3.tar.gz /quazip-0.4.3.tar.gz /quazip-0.4.4.tar.gz /quazip-0.5.tar.gz +/quazip-0.5.1.tar.gz diff --git a/quazip.spec b/quazip.spec index f8eaf5e..c15e5de 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip -Version: 0.5 -Release: 2%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Sun Mar 03 2013 Nicolas Chauvet - 0.5.1-1 +- Update to 0.5.1 + * Thu Feb 14 2013 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 63e413f..dc2e7c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab0763709c7e6863b30ffd018397a6d3 quazip-0.5.tar.gz +eec6b9b6f19654230dfcd158f29ea9d0 quazip-0.5.1.tar.gz From 437669ef12a29098597a4331da0a4273f2b49c4c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 3 Mar 2013 14:49:06 +0100 Subject: [PATCH 22/71] Add new fix --- quazip-0.5.1-zlib.patch | 31 +++++++++++++++++++++++++++++++ quazip.spec | 5 ++--- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 quazip-0.5.1-zlib.patch diff --git a/quazip-0.5.1-zlib.patch b/quazip-0.5.1-zlib.patch new file mode 100644 index 0000000..690590e --- /dev/null +++ b/quazip-0.5.1-zlib.patch @@ -0,0 +1,31 @@ +diff -up quazip-0.5.1/qztest/testquagzipfile.cpp.zl quazip-0.5.1/qztest/testquagzipfile.cpp +--- quazip-0.5.1/qztest/testquagzipfile.cpp.zl 2012-09-05 17:24:35.000000000 +0200 ++++ quazip-0.5.1/qztest/testquagzipfile.cpp 2013-03-03 14:27:05.168659773 +0100 +@@ -8,9 +8,9 @@ void TestQuaGzipFile::read() + { + QDir curDir; + curDir.mkpath("tmp"); +- voidp gzFile = gzopen("tmp/test.gz", "wb"); +- gzwrite(gzFile, "test", 4); +- gzclose(gzFile); ++ gzFile File = gzopen("tmp/test.gz", "wb"); ++ gzwrite(File, "test", 4); ++ gzclose(File); + QuaGzipFile testFile("tmp/test.gz"); + QVERIFY(testFile.open(QIODevice::ReadOnly)); + char buf[5]; +@@ -32,11 +32,11 @@ void TestQuaGzipFile::write() + QCOMPARE(testFile.write("test", 4), static_cast(4)); + testFile.close(); + QVERIFY(!testFile.isOpen()); +- voidp gzFile = gzopen("tmp/test.gz", "rb"); ++ gzFile File = gzopen("tmp/test.gz", "rb"); + char buf[5]; + buf[4] = '\0'; +- QCOMPARE(gzread(gzFile, buf, 5), 4); +- gzclose(gzFile); ++ QCOMPARE(gzread(File, buf, 5), 4); ++ gzclose(File); + QCOMPARE(static_cast(buf), "test"); + curDir.remove("tmp/test.gz"); + curDir.rmdir("tmp"); diff --git a/quazip.spec b/quazip.spec index c15e5de..ece8176 100644 --- a/quazip.spec +++ b/quazip.spec @@ -6,6 +6,7 @@ License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries URL: http://quazip.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: quazip-0.5.1-zlib.patch BuildRequires: qt4-devel BuildRequires: doxygen graphviz @@ -32,6 +33,7 @@ for developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .zl # Fixes build and install sed -i 's\PREFIX/lib\PREFIX/%{_lib}\' %{name}/%{name}.pro @@ -74,9 +76,6 @@ rm -rf %{buildroot} * Sun Mar 03 2013 Nicolas Chauvet - 0.5.1-1 - Update to 0.5.1 -* Thu Feb 14 2013 Fedora Release Engineering - 0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - * Sun Sep 09 2012 Nicolas Chauvet - 0.5-1 - Update to 0.5 From 1c21aa7e427da3bee5924e593663ae3e13e7791f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 06:49:14 -0500 Subject: [PATCH 23/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index ece8176..3e792b4 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries @@ -73,6 +73,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sun Mar 03 2013 Nicolas Chauvet - 0.5.1-1 - Update to 0.5.1 From eb7e7a0441a28fddbce0f811e3d4a3bf693d4a33 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 26 Jan 2014 20:20:04 +0100 Subject: [PATCH 24/71] Update to 0.6.1 --- .gitignore | 1 + quazip-0.5.1-zlib.patch | 31 ------------------------------- quazip.spec | 16 ++++++---------- sources | 2 +- 4 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 quazip-0.5.1-zlib.patch diff --git a/.gitignore b/.gitignore index bf0f997..052a2aa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ quazip-0.3.tar.gz /quazip-0.4.4.tar.gz /quazip-0.5.tar.gz /quazip-0.5.1.tar.gz +/quazip-0.6.1.tar.gz diff --git a/quazip-0.5.1-zlib.patch b/quazip-0.5.1-zlib.patch deleted file mode 100644 index 690590e..0000000 --- a/quazip-0.5.1-zlib.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up quazip-0.5.1/qztest/testquagzipfile.cpp.zl quazip-0.5.1/qztest/testquagzipfile.cpp ---- quazip-0.5.1/qztest/testquagzipfile.cpp.zl 2012-09-05 17:24:35.000000000 +0200 -+++ quazip-0.5.1/qztest/testquagzipfile.cpp 2013-03-03 14:27:05.168659773 +0100 -@@ -8,9 +8,9 @@ void TestQuaGzipFile::read() - { - QDir curDir; - curDir.mkpath("tmp"); -- voidp gzFile = gzopen("tmp/test.gz", "wb"); -- gzwrite(gzFile, "test", 4); -- gzclose(gzFile); -+ gzFile File = gzopen("tmp/test.gz", "wb"); -+ gzwrite(File, "test", 4); -+ gzclose(File); - QuaGzipFile testFile("tmp/test.gz"); - QVERIFY(testFile.open(QIODevice::ReadOnly)); - char buf[5]; -@@ -32,11 +32,11 @@ void TestQuaGzipFile::write() - QCOMPARE(testFile.write("test", 4), static_cast(4)); - testFile.close(); - QVERIFY(!testFile.isOpen()); -- voidp gzFile = gzopen("tmp/test.gz", "rb"); -+ gzFile File = gzopen("tmp/test.gz", "rb"); - char buf[5]; - buf[4] = '\0'; -- QCOMPARE(gzread(gzFile, buf, 5), 4); -- gzclose(gzFile); -+ QCOMPARE(gzread(File, buf, 5), 4); -+ gzclose(File); - QCOMPARE(static_cast(buf), "test"); - curDir.remove("tmp/test.gz"); - curDir.rmdir("tmp"); diff --git a/quazip.spec b/quazip.spec index 3e792b4..9ade690 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,12 +1,10 @@ Name: quazip -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ -Group: System Environment/Libraries URL: http://quazip.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: quazip-0.5.1-zlib.patch BuildRequires: qt4-devel BuildRequires: doxygen graphviz @@ -33,7 +31,6 @@ for developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .zl # Fixes build and install sed -i 's\PREFIX/lib\PREFIX/%{_lib}\' %{name}/%{name}.pro @@ -58,21 +55,20 @@ make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install %postun -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %doc COPYING NEWS.txt README.txt %{_libdir}/*.so.* %files devel -%defattr(-,root,root,-) %doc doc/html %{_includedir}/%{name} %{_libdir}/*.so %changelog +* Sun Jan 26 2014 Nicolas Chauvet - 0.6.1-1 +- Update to 0.6.1 +- Clean spec file + * Sun Aug 04 2013 Fedora Release Engineering - 0.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index dc2e7c4..e2e9352 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eec6b9b6f19654230dfcd158f29ea9d0 quazip-0.5.1.tar.gz +7d0a7389656bed7414afb81c2b05dc39 quazip-0.6.1.tar.gz From d6eb3560f098518850eeb39b74a08c39f1225449 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 12 Feb 2014 00:22:41 +0100 Subject: [PATCH 25/71] Update to 0.6.2 --- .gitignore | 1 + quazip.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 052a2aa..b2c3fec 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ quazip-0.3.tar.gz /quazip-0.5.tar.gz /quazip-0.5.1.tar.gz /quazip-0.6.1.tar.gz +/quazip-0.6.2.tar.gz diff --git a/quazip.spec b/quazip.spec index 9ade690..85a0856 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,5 +1,5 @@ Name: quazip -Version: 0.6.1 +Version: 0.6.2 Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ @@ -65,6 +65,9 @@ make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install %{_libdir}/*.so %changelog +* Wed Feb 12 2014 Nicolas Chauvet - 0.6.2-1 +- Update to 0.6.2 + * Sun Jan 26 2014 Nicolas Chauvet - 0.6.1-1 - Update to 0.6.1 - Clean spec file diff --git a/sources b/sources index e2e9352..8639772 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d0a7389656bed7414afb81c2b05dc39 quazip-0.6.1.tar.gz +c11f8e2f757be94fd79dc49e5a4be0ca quazip-0.6.2.tar.gz From 10d4a1eab547f403968d7ccf05fb0a22a3e86edd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 20:35:22 -0500 Subject: [PATCH 26/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 85a0856..703ddaa 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -65,6 +65,9 @@ make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install %{_libdir}/*.so %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Feb 12 2014 Nicolas Chauvet - 0.6.2-1 - Update to 0.6.2 From 7d77d443826855f82d969b3d2042352ed68d1dcc Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 9 Aug 2014 18:26:54 +0200 Subject: [PATCH 27/71] Update to 0.7.0 --- quazip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/quazip.spec b/quazip.spec index 703ddaa..741a82d 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip -Version: 0.6.2 -Release: 2%{?dist} +Version: 0.7 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -65,6 +65,9 @@ make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install %{_libdir}/*.so %changelog +* Tue Jul 29 2014 Nicolas Chauvet - 0.7-1 +- Update to 0.7.0 + * Sun Jun 08 2014 Fedora Release Engineering - 0.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 7b50377b26d084673f790d2ee559a6de048bdddd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 9 Aug 2014 22:40:39 +0200 Subject: [PATCH 28/71] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b2c3fec..faf1736 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ quazip-0.3.tar.gz /quazip-0.5.1.tar.gz /quazip-0.6.1.tar.gz /quazip-0.6.2.tar.gz +/quazip-0.7.tar.gz diff --git a/sources b/sources index 8639772..63275df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c11f8e2f757be94fd79dc49e5a4be0ca quazip-0.6.2.tar.gz +52a9d807934ce4e9c30ead677a3148d2 quazip-0.7.tar.gz From b670e5d1780c8eb46f3a510345e8e9106f8aab86 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 23:07:50 +0000 Subject: [PATCH 29/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 741a82d..e081fe3 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -65,6 +65,9 @@ make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install %{_libdir}/*.so %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jul 29 2014 Nicolas Chauvet - 0.7-1 - Update to 0.7.0 From f15b9cbefa12327bbd0b0fb19c288551d1f66748 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 8 Jan 2015 16:49:12 +0100 Subject: [PATCH 30/71] Update to 0.7.1 --- .gitignore | 1 + quazip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index faf1736..627f3ed 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ quazip-0.3.tar.gz /quazip-0.6.1.tar.gz /quazip-0.6.2.tar.gz /quazip-0.7.tar.gz +/quazip-0.7.1.tar.gz diff --git a/quazip.spec b/quazip.spec index e081fe3..43eb7b1 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip -Version: 0.7 -Release: 2%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -65,6 +65,9 @@ make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install %{_libdir}/*.so %changelog +* Thu Jan 08 2015 Nicolas Chauvet - 0.7.1-1 +- Update to 0.7.1 + * Sun Aug 17 2014 Fedora Release Engineering - 0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 63275df..b500b77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52a9d807934ce4e9c30ead677a3148d2 quazip-0.7.tar.gz +3b99effb2a9417707d463e6f19cf2629 quazip-0.7.1.tar.gz From 8cc672e4b7b83404e80c379bb632c5fe655c22fa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 19 Apr 2015 17:39:38 -0500 Subject: [PATCH 31/71] quazip qt5 support (#1197484) --- quazip-0.7.1-qt5.patch | 94 ++++++++++++++++++++++++++++++++++++++++++ quazip.spec | 78 +++++++++++++++++++++++++++++------ 2 files changed, 159 insertions(+), 13 deletions(-) create mode 100644 quazip-0.7.1-qt5.patch diff --git a/quazip-0.7.1-qt5.patch b/quazip-0.7.1-qt5.patch new file mode 100644 index 0000000..098f878 --- /dev/null +++ b/quazip-0.7.1-qt5.patch @@ -0,0 +1,94 @@ +diff -up quazip-0.7.1/CMakeLists.txt.qt5 quazip-0.7.1/CMakeLists.txt +--- quazip-0.7.1/CMakeLists.txt.qt5 2013-11-18 11:37:54.000000000 -0600 ++++ quazip-0.7.1/CMakeLists.txt 2015-04-19 17:25:59.638703934 -0500 +@@ -10,10 +10,11 @@ endif() + + if (Qt5Core_FOUND) + set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES}) ++ set(QUAZIP_LIB_VERSION_SUFFIX 5) + # if there is no QT_ROOT, try to deduce it from Qt QtCore include + if ("${QT_ROOT}" STREQUAL "") + set(QT_ROOT ${QT_QTCORE_INCLUDE_DIR}/../..) +- endif() ++ endif() + include_directories(${Qt5Core_INCLUDE_DIRS}) + + macro(qt_wrap_cpp) +@@ -33,7 +34,7 @@ else() + endif() + + # Use system zlib on unix and Qt ZLIB on Windows +-IF(UNIX) ++IF(UNIX OR MINGW) + find_package(ZLIB REQUIRED) + ELSE(UNIX) + SET(ZLIB_INCLUDE_DIRS "${QT_ROOT}/src/3rdparty/zlib" CACHE STRING "Path to ZLIB headers of Qt") +@@ -48,7 +49,9 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_D + + set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") + set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) ++set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE ++ INTERNAL "Target name of libquazip" FORCE) + + add_subdirectory(quazip) + +-install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) ++install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) +diff -up quazip-0.7.1/FindQuaZip.cmake.qt5 quazip-0.7.1/FindQuaZip.cmake +--- quazip-0.7.1/FindQuaZip.cmake.qt5 2012-02-26 00:46:10.000000000 -0600 ++++ quazip-0.7.1/FindQuaZip.cmake 2015-04-19 17:25:59.638703934 -0500 +@@ -9,14 +9,17 @@ IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRA + # in cache already + SET(QUAZIP_FOUND TRUE) + ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) ++ IF (Qt5Core_FOUND) ++ set(QUAZIP_LIB_VERSION_SUFFIX 5) ++ ENDIF() + IF (WIN32) + FIND_PATH(QUAZIP_LIBRARY_DIR + WIN32_DEBUG_POSTFIX d +- NAMES libquazip.dll ++ NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll + HINTS "C:/Programme/" "C:/Program Files" + PATH_SUFFIXES QuaZip/lib + ) +- FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip.dll HINTS ${QUAZIP_LIBRARY_DIR}) ++ FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) + FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) + ELSE(WIN32) +@@ -25,12 +28,12 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIB + pkg_check_modules(PC_QUAZIP quazip) + FIND_LIBRARY(QUAZIP_LIBRARIES + WIN32_DEBUG_POSTFIX d +- NAMES quazip ++ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} + HINTS /usr/lib /usr/lib64 + ) + FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h + HINTS /usr/include /usr/local/include +- PATH_SUFFIXES quazip ++ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} + ) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) + ENDIF (WIN32) +diff -up quazip-0.7.1/quazip/CMakeLists.txt.qt5 quazip-0.7.1/quazip/CMakeLists.txt +--- quazip-0.7.1/quazip/CMakeLists.txt.qt5 2013-08-10 11:00:00.000000000 -0500 ++++ quazip-0.7.1/quazip/CMakeLists.txt 2015-04-19 17:29:26.600686574 -0500 +@@ -14,10 +14,11 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) + qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) + set(SRCS ${SRCS} ${MOC_SRCS}) + +-add_library(quazip SHARED ${SRCS}) +-set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1) ++add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) ++ ++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 ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES}) ++target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + +-install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip) +-install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) ++install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) diff --git a/quazip.spec b/quazip.spec index 43eb7b1..d034f69 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,13 +1,21 @@ Name: quazip Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?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 +BuildRequires: cmake BuildRequires: qt4-devel +BuildRequires: qt5-qtbase-devel BuildRequires: doxygen graphviz +# Combine upstream qt5 parallel-installable commits and some other fixes +# and omit support for quazip_static (it's broken) +#http://sourceforge.net/p/quazip/code/254/ +#http://sourceforge.net/p/quazip/code/257/ +Patch1: quazip-0.7.1-qt5.patch + %description QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that can be used to access ZIP archives. It uses Trolltech's Qt toolkit. @@ -29,19 +37,47 @@ Requires: qt4-devel%{?_isa} The %{name}-devel package contains libraries, header files and documentation for developing applications that use %{name}. +%package qt5 +Summary: Qt5 wrapper for the minizip library +%description qt5 +QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that +can be used to access ZIP archives. It uses Trolltech's Qt toolkit. + +QuaZIP allows you to access files inside ZIP archives using QIODevice API, +and - yes! - that means that you can also use QTextStream, QDataStream or +whatever you would like to use on your zipped files. + +QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading +from and writing to ZIP archives. + +%package qt5-devel +Summary: Development files for %{name} +Requires: %{name}-qt5%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} + +%description qt5-devel +The %{name}-devel package contains libraries, header files and documentation +for developing applications that use %{name}. + + %prep %setup -q +%patch1 -p1 -b .qt5 -# Fixes build and install -sed -i 's\PREFIX/lib\PREFIX/%{_lib}\' %{name}/%{name}.pro +%build +mkdir build-qt4 +pushd build-qt4 +%cmake .. -DBUILD_WITH_QT4:BOOL=ON +make %{?_smp_mflags} +popd -%build -export PATH=%{_qt4_bindir}:$PATH -%{_qt4_qmake} PREFIX=%{_prefix} -#do not build in parallel - there are race conditions in -#qmake-generated makefiles -make +mkdir build-qt5 +pushd build-qt5 +%cmake .. -DBUILD_WITH_QT4:BOOL=OFF + +make %{?_smp_mflags} +popd doxygen Doxyfile for file in doc/html/*; do @@ -49,7 +85,8 @@ for file in doc/html/*; do done %install -make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install +make install/fast DESTDIR=%{buildroot} -C build-qt5 +make install/fast DESTDIR=%{buildroot} -C build-qt4 %post -p /sbin/ldconfig @@ -57,14 +94,29 @@ make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install %files %doc COPYING NEWS.txt README.txt -%{_libdir}/*.so.* +%{_libdir}/libquazip.so.1* %files devel %doc doc/html -%{_includedir}/%{name} -%{_libdir}/*.so +%{_includedir}/quazip/ +%{_libdir}/libquazip.so +%{_datadir}/cmake/Modules/FindQuaZip.cmake + +%files qt5 +%doc COPYING NEWS.txt README.txt +%{_libdir}/libquazip5.so.1* + +%files qt5-devel +%doc doc/html +%{_includedir}/quazip5/ +%{_libdir}/libquazip5.so +%{_datadir}/cmake/Modules/FindQuaZip5.cmake + %changelog +* Sun Apr 19 2015 Rex Dieter 0.7.1-2 +- quazip qt5 support (#1197484) + * Thu Jan 08 2015 Nicolas Chauvet - 0.7.1-1 - Update to 0.7.1 From 67e8c6068d3d1de856fa7efdcf2bc6e9d90dad7a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 21:56:31 +0000 Subject: [PATCH 32/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index d034f69..30e39b6 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -114,6 +114,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 0.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Apr 19 2015 Rex Dieter 0.7.1-2 - quazip qt5 support (#1197484) From f15ea49239d2662f37e7338611c0189693b14fc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 21:51:30 +0000 Subject: [PATCH 33/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 30e39b6..24b55aa 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -114,6 +114,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jun 18 2015 Fedora Release Engineering - 0.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9dbb175836f7decfb8ba1e1d72c78156b66a63a6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 12 Apr 2016 09:38:31 +0200 Subject: [PATCH 34/71] Update to 0.7.2 --- .gitignore | 1 + quazip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 627f3ed..5113928 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ quazip-0.3.tar.gz /quazip-0.6.2.tar.gz /quazip-0.7.tar.gz /quazip-0.7.1.tar.gz +/quazip-0.7.2.tar.gz diff --git a/quazip.spec b/quazip.spec index 24b55aa..4aee6df 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip -Version: 0.7.1 -Release: 4%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -114,6 +114,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Tue Apr 12 2016 Nicolas Chauvet - 0.7.2-1 +- Update to 0.7.2 + * Thu Feb 04 2016 Fedora Release Engineering - 0.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index b500b77..151c626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b99effb2a9417707d463e6f19cf2629 quazip-0.7.1.tar.gz +84163487a4c3470781c93e5f56c4ca43 quazip-0.7.2.tar.gz From bf62c6d5b94781e460e8ad9d549f236a2b85b51b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 12 Apr 2016 09:40:13 +0200 Subject: [PATCH 35/71] Remove upstreamed patch --- quazip-0.7.1-qt5.patch | 94 ------------------------------------------ 1 file changed, 94 deletions(-) delete mode 100644 quazip-0.7.1-qt5.patch diff --git a/quazip-0.7.1-qt5.patch b/quazip-0.7.1-qt5.patch deleted file mode 100644 index 098f878..0000000 --- a/quazip-0.7.1-qt5.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -up quazip-0.7.1/CMakeLists.txt.qt5 quazip-0.7.1/CMakeLists.txt ---- quazip-0.7.1/CMakeLists.txt.qt5 2013-11-18 11:37:54.000000000 -0600 -+++ quazip-0.7.1/CMakeLists.txt 2015-04-19 17:25:59.638703934 -0500 -@@ -10,10 +10,11 @@ endif() - - if (Qt5Core_FOUND) - set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES}) -+ set(QUAZIP_LIB_VERSION_SUFFIX 5) - # if there is no QT_ROOT, try to deduce it from Qt QtCore include - if ("${QT_ROOT}" STREQUAL "") - set(QT_ROOT ${QT_QTCORE_INCLUDE_DIR}/../..) -- endif() -+ endif() - include_directories(${Qt5Core_INCLUDE_DIRS}) - - macro(qt_wrap_cpp) -@@ -33,7 +34,7 @@ else() - endif() - - # Use system zlib on unix and Qt ZLIB on Windows --IF(UNIX) -+IF(UNIX OR MINGW) - find_package(ZLIB REQUIRED) - ELSE(UNIX) - SET(ZLIB_INCLUDE_DIRS "${QT_ROOT}/src/3rdparty/zlib" CACHE STRING "Path to ZLIB headers of Qt") -@@ -48,7 +49,9 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_D - - set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") - set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) -+set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE -+ INTERNAL "Target name of libquazip" FORCE) - - add_subdirectory(quazip) - --install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) -+install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) -diff -up quazip-0.7.1/FindQuaZip.cmake.qt5 quazip-0.7.1/FindQuaZip.cmake ---- quazip-0.7.1/FindQuaZip.cmake.qt5 2012-02-26 00:46:10.000000000 -0600 -+++ quazip-0.7.1/FindQuaZip.cmake 2015-04-19 17:25:59.638703934 -0500 -@@ -9,14 +9,17 @@ IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRA - # in cache already - SET(QUAZIP_FOUND TRUE) - ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) -+ IF (Qt5Core_FOUND) -+ set(QUAZIP_LIB_VERSION_SUFFIX 5) -+ ENDIF() - IF (WIN32) - FIND_PATH(QUAZIP_LIBRARY_DIR - WIN32_DEBUG_POSTFIX d -- NAMES libquazip.dll -+ NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll - HINTS "C:/Programme/" "C:/Program Files" - PATH_SUFFIXES QuaZip/lib - ) -- FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip.dll HINTS ${QUAZIP_LIBRARY_DIR}) -+ FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) - FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) - FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) - ELSE(WIN32) -@@ -25,12 +28,12 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIB - pkg_check_modules(PC_QUAZIP quazip) - FIND_LIBRARY(QUAZIP_LIBRARIES - WIN32_DEBUG_POSTFIX d -- NAMES quazip -+ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} - HINTS /usr/lib /usr/lib64 - ) - FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h - HINTS /usr/include /usr/local/include -- PATH_SUFFIXES quazip -+ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} - ) - FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) - ENDIF (WIN32) -diff -up quazip-0.7.1/quazip/CMakeLists.txt.qt5 quazip-0.7.1/quazip/CMakeLists.txt ---- quazip-0.7.1/quazip/CMakeLists.txt.qt5 2013-08-10 11:00:00.000000000 -0500 -+++ quazip-0.7.1/quazip/CMakeLists.txt 2015-04-19 17:29:26.600686574 -0500 -@@ -14,10 +14,11 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) - qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) - set(SRCS ${SRCS} ${MOC_SRCS}) - --add_library(quazip SHARED ${SRCS}) --set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1) -+add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) -+ -+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 ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES}) -+target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) - --install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip) --install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) -+install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) -+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) From ee97c61e8e928419c5d147d79cf93ac633a3a163 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 27 Apr 2016 13:26:18 +0200 Subject: [PATCH 36/71] Remove merged patch --- quazip.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/quazip.spec b/quazip.spec index 4aee6df..4499e89 100644 --- a/quazip.spec +++ b/quazip.spec @@ -10,11 +10,6 @@ BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel BuildRequires: doxygen graphviz -# Combine upstream qt5 parallel-installable commits and some other fixes -# and omit support for quazip_static (it's broken) -#http://sourceforge.net/p/quazip/code/254/ -#http://sourceforge.net/p/quazip/code/257/ -Patch1: quazip-0.7.1-qt5.patch %description QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that @@ -62,7 +57,6 @@ for developing applications that use %{name}. %prep %setup -q -%patch1 -p1 -b .qt5 %build mkdir build-qt4 From 9320ac1a2e1d36a3101e333f2b41ffa108bbbdea Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 27 Apr 2016 15:40:40 +0200 Subject: [PATCH 37/71] Fix build for qt5 --- quazip-0.7.2-fix_static.patch | 26 ++++++++++++++++++++++++++ quazip.spec | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 quazip-0.7.2-fix_static.patch diff --git a/quazip-0.7.2-fix_static.patch b/quazip-0.7.2-fix_static.patch new file mode 100644 index 0000000..60ec615 --- /dev/null +++ b/quazip-0.7.2-fix_static.patch @@ -0,0 +1,26 @@ +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}) + 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 + if (NOT WIN32) +- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) ++ set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) + endif () + +-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}) + + 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}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) diff --git a/quazip.spec b/quazip.spec index 4499e89..92b94d1 100644 --- a/quazip.spec +++ b/quazip.spec @@ -5,6 +5,7 @@ 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 BuildRequires: cmake BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel @@ -57,6 +58,7 @@ for developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .orig %build mkdir build-qt4 @@ -110,6 +112,7 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog * Tue Apr 12 2016 Nicolas Chauvet - 0.7.2-1 - Update to 0.7.2 +- Add patch to fix build with qt5 (disable static version) * Thu Feb 04 2016 Fedora Release Engineering - 0.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ee1cd6b4d210d19a71373acf728abc68836404d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 11:26:36 +0000 Subject: [PATCH 38/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 92b94d1..eff9244 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -110,6 +110,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Apr 12 2016 Nicolas Chauvet - 0.7.2-1 - Update to 0.7.2 - Add patch to fix build with qt5 (disable static version) From 0cb040b6d0bb3f7c4dffd93fafc3aba36c183600 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 13 Feb 2017 15:49:58 +0100 Subject: [PATCH 39/71] Update to 0.7.3 --- .gitignore | 13 +------------ quazip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 5113928..17fc953 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1 @@ -quazip-0.3.tar.gz -/quazip-0.4.1.tar.gz -/quazip-0.4.2.tar.gz -/quazip-0.4.3.tar.gz -/quazip-0.4.4.tar.gz -/quazip-0.5.tar.gz -/quazip-0.5.1.tar.gz -/quazip-0.6.1.tar.gz -/quazip-0.6.2.tar.gz -/quazip-0.7.tar.gz -/quazip-0.7.1.tar.gz -/quazip-0.7.2.tar.gz +quazip-*.tar.gz diff --git a/quazip.spec b/quazip.spec index eff9244..33ce930 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip -Version: 0.7.2 -Release: 2%{?dist} +Version: 0.7.3 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -110,6 +110,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Mon Feb 13 2017 Nicolas Chauvet - 0.7.3-1 +- Update to 0.7.3 + * Sat Feb 11 2017 Fedora Release Engineering - 0.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 151c626..8536e20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84163487a4c3470781c93e5f56c4ca43 quazip-0.7.2.tar.gz +SHA512 (quazip-0.7.3.tar.gz) = d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe From 6af5f936d0a846801c8a3a42a8e195fb66c0d42d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 12:50:17 +0000 Subject: [PATCH 40/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 33ce930..e51d47a 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -110,6 +110,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Feb 13 2017 Nicolas Chauvet - 0.7.3-1 - Update to 0.7.3 From 841b31588718b1af366ae332645fc9140628a7e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 07:27:06 +0000 Subject: [PATCH 41/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index e51d47a..c080674 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -110,6 +110,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From ad6f1713fc19f15f93cc55eb37c433d1a9d3ec7d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 12:34:05 +0000 Subject: [PATCH 42/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index c080674..70faa97 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -110,6 +110,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 35ee2a30e3b4e5b618054e408bca7876fe6bdd7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:15:34 +0000 Subject: [PATCH 43/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 70faa97..8b6d261 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: http://quazip.sourceforge.net/ @@ -110,6 +110,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.7.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 26d9b008f16c28b62f038c9dc7c406e4117a34f1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 17 Jul 2018 11:30:51 +0200 Subject: [PATCH 44/71] Update to 0.7.6 (switch to github) --- ...tic.patch => quazip-0.7.6-fix_static.patch | 13 ++++---- quazip.spec | 31 ++++++++++--------- sources | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) rename quazip-0.7.2-fix_static.patch => quazip-0.7.6-fix_static.patch (71%) 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 From 590c7c08af52adebb2f99eb4aeca7837f5d938ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 10:53:27 +0000 Subject: [PATCH 45/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 26d92e2..285f529 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -108,6 +108,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 0.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 17 2018 Nicolas Chauvet - 0.7.6-1 - Update to 0.7.6 From 94cddf6de247379fd84fbd7979299121be2c2d15 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 26 Mar 2019 09:32:58 +0100 Subject: [PATCH 46/71] Add zlib-devel - rhbz#1634468 --- quazip.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 285f529..37012ed 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -27,6 +27,7 @@ from and writing to ZIP archives. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt4-devel%{?_isa} +Requires: zlib-devel%{?_isa} %description devel The %{name}-devel package contains libraries, header files and documentation @@ -49,6 +50,7 @@ from and writing to ZIP archives. Summary: Development files for %{name} Requires: %{name}-qt5%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel%{?_isa} +Requires: zlib-devel%{?_isa} %description qt5-devel The %{name}-devel package contains libraries, header files and documentation @@ -108,6 +110,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Tue Mar 26 2019 Nicolas Chauvet - 0.7.6-3 +- Add zlib-devel - rhbz#1634468 + * Sat Feb 02 2019 Fedora Release Engineering - 0.7.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0f15320e0075a47e7a353341a80a3b2828c452bd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 26 Mar 2019 09:34:06 +0100 Subject: [PATCH 47/71] Add c++ --- quazip.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/quazip.spec b/quazip.spec index 37012ed..1a624b7 100644 --- a/quazip.spec +++ b/quazip.spec @@ -7,6 +7,7 @@ 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: gcc-c++ BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel BuildRequires: doxygen graphviz From 021803822698d61c8ee7ec0c005fdfc3bbbecb31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 18:00:01 +0000 Subject: [PATCH 48/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 1a624b7..748fbeb 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -111,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.7.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Mar 26 2019 Nicolas Chauvet - 0.7.6-3 - Add zlib-devel - rhbz#1634468 From 9febbfea473ca3cb850af65d10a1ef2e808f72bd Mon Sep 17 00:00:00 2001 From: Felipe Borges Date: Mon, 21 Oct 2019 12:09:09 +0200 Subject: [PATCH 49/71] Install FindQuaZip.cmake in the right prefix This was proposed upstream in https://github.com/stachenov/quazip/pull/20 For context: we are building Flatpaks from RPMs[0], and Quazip gets pulled in as dependency for keepassxc. [0] https://docs.fedoraproject.org/en-US/flatpak/tutorial/ Fixes rhbz#1761528 --- quazip-0.7.6-install-right-prefix.patch | 22 ++++++++++++++++++++++ quazip.spec | 10 +++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 quazip-0.7.6-install-right-prefix.patch diff --git a/quazip-0.7.6-install-right-prefix.patch b/quazip-0.7.6-install-right-prefix.patch new file mode 100644 index 0000000..39946ff --- /dev/null +++ b/quazip-0.7.6-install-right-prefix.patch @@ -0,0 +1,22 @@ +From f323e478b1c05f470393bb57b486c0d871cf4736 Mon Sep 17 00:00:00 2001 +From: Aleix Pol +Date: Thu, 31 Jan 2019 18:19:30 +0100 +Subject: [PATCH] Install the FindQuaZip.cmake in the right prefix + +It should go wherever CMAKE_INSTALL_PREFIX is installing. +This fixes the build on flatpak and should also fix it for other cross +compilation setups. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 539caa4..a43fefe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,4 +60,4 @@ set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE + + add_subdirectory(quazip) + +-install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) ++install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION share/cmake) diff --git a/quazip.spec b/quazip.spec index 748fbeb..1f5e37f 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,11 +1,12 @@ Name: quazip Version: 0.7.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: quazip-0.7.6-fix_static.patch +Patch1: quazip-0.7.6-install-right-prefix.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: qt4-devel @@ -96,7 +97,7 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %doc doc/html %{_includedir}/quazip/ %{_libdir}/libquazip.so -%{_datadir}/cmake/Modules/FindQuaZip.cmake +%{_datadir}/cmake/FindQuaZip.cmake %files qt5 %doc NEWS.txt README.md @@ -107,10 +108,13 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %doc doc/html %{_includedir}/quazip5/ %{_libdir}/libquazip5.so -%{_datadir}/cmake/Modules/FindQuaZip5.cmake +%{_datadir}/cmake/FindQuaZip5.cmake %changelog +* Mon Oct 21 2019 Felipe Borges - 0.7.6-5 +- Add patch to fix FindQuaZip.cmake install path + * Fri Jul 26 2019 Fedora Release Engineering - 0.7.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 58419b35b44bdea1e1b648d31019a4aed04c4009 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 29 Oct 2019 13:00:22 -0500 Subject: [PATCH 50/71] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From d895c2bf939235b5f20f5f27fb5504290ffd92fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 17:07:36 +0000 Subject: [PATCH 51/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 1f5e37f..e404f74 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -112,6 +112,9 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.7.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Oct 21 2019 Felipe Borges - 0.7.6-5 - Add patch to fix FindQuaZip.cmake install path From 8cc90001be4b8b70a9267df0ee90132f91bd3b86 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 4 Mar 2020 14:18:53 +0100 Subject: [PATCH 52/71] Fix cmake module install path --- quazip-0.7.6-install-right-prefix.patch | 2 +- quazip.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/quazip-0.7.6-install-right-prefix.patch b/quazip-0.7.6-install-right-prefix.patch index 39946ff..3ad2ac4 100644 --- a/quazip-0.7.6-install-right-prefix.patch +++ b/quazip-0.7.6-install-right-prefix.patch @@ -19,4 +19,4 @@ index 539caa4..a43fefe 100644 add_subdirectory(quazip) -install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) -+install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION share/cmake) ++install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${SHARE_INSTALL_PREFIX}/cmake/Modules) diff --git a/quazip.spec b/quazip.spec index e404f74..9e5d78c 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,6 +1,6 @@ Name: quazip Version: 0.7.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -97,7 +97,7 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %doc doc/html %{_includedir}/quazip/ %{_libdir}/libquazip.so -%{_datadir}/cmake/FindQuaZip.cmake +%{_datadir}/cmake/Modules/FindQuaZip.cmake %files qt5 %doc NEWS.txt README.md @@ -108,10 +108,13 @@ make install/fast DESTDIR=%{buildroot} -C build-qt4 %doc doc/html %{_includedir}/quazip5/ %{_libdir}/libquazip5.so -%{_datadir}/cmake/FindQuaZip5.cmake +%{_datadir}/cmake/Modules/FindQuaZip5.cmake %changelog +* Wed Mar 04 2020 Sandro Mani - 0.7.6-7 +- Fix cmake module install path + * Thu Jan 30 2020 Fedora Release Engineering - 0.7.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 508f3d67c9a9a2691fdcdb6e833155face290839 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 8 Jul 2020 17:05:19 +0200 Subject: [PATCH 53/71] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- quazip.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/quazip.spec b/quazip.spec index 9e5d78c..3485b13 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + Name: quazip Version: 0.7.6 Release: 7%{?dist} @@ -63,19 +65,13 @@ for developing applications that use %{name}. %autosetup -p1 %build -mkdir build-qt4 -pushd build-qt4 -%cmake .. -DBUILD_WITH_QT4:BOOL=ON - -%make_build -popd - -mkdir build-qt5 -pushd build-qt5 -%cmake .. -DBUILD_WITH_QT4:BOOL=OFF +%global _vpath_builddir build-qt4 +%cmake -DBUILD_WITH_QT4:BOOL=ON +%cmake_build -%make_build -popd +%global _vpath_builddir build-qt5 +%cmake -DBUILD_WITH_QT4:BOOL=OFF +%cmake_build doxygen Doxyfile for file in doc/html/*; do @@ -83,8 +79,10 @@ for file in doc/html/*; do done %install -make install/fast DESTDIR=%{buildroot} -C build-qt5 -make install/fast DESTDIR=%{buildroot} -C build-qt4 +%global _vpath_builddir build-qt4 +%cmake_install +%global _vpath_builddir build-qt5 +%cmake_install %ldconfig_scriptlets From a1d836d7c1a541b8fb9a74d728bc9f97559efdeb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:20:26 +0000 Subject: [PATCH 54/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 3485b13..fb707ed 100644 --- a/quazip.spec +++ b/quazip.spec @@ -2,7 +2,7 @@ Name: quazip Version: 0.7.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -110,6 +110,9 @@ done %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.7.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Mar 04 2020 Sandro Mani - 0.7.6-7 - Fix cmake module install path From 51a248c445947b0d1d943ad707d9451ffba77224 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 07:40:49 +0000 Subject: [PATCH 55/71] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index fb707ed..3ab8860 100644 --- a/quazip.spec +++ b/quazip.spec @@ -2,7 +2,7 @@ Name: quazip Version: 0.7.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -110,6 +110,10 @@ done %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.7.6-9 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.7.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c7aa18f3a7358021ce49d1c8527745ee0ee39a57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 14:53:55 +0000 Subject: [PATCH 56/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 3ab8860..564f83c 100644 --- a/quazip.spec +++ b/quazip.spec @@ -2,7 +2,7 @@ Name: quazip Version: 0.7.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -110,6 +110,9 @@ done %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.7.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.7.6-9 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6071e4b49cffe5871c60098b439aea0c27d894c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:00:47 +0000 Subject: [PATCH 57/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 564f83c..edebbcd 100644 --- a/quazip.spec +++ b/quazip.spec @@ -2,7 +2,7 @@ Name: quazip Version: 0.7.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -110,6 +110,9 @@ done %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.7.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.7.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a63557c5636c64ba4da04d8a04c00ea9052d144f Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Wed, 28 Jul 2021 23:17:40 +0200 Subject: [PATCH 58/71] Update to 1.1 Current upstream version has changed the name of the library, include paths, and CMake module names. To allow other packages to still build using the old paths, add compat symlinks and the old CMake modules to the -devel subpackages. These compat hacks can be removed once all dependent packages have switched to use the new pkgconfig or CMake files. Signed-off-by: Ondrej Mosnacek --- FindQuaZip.cmake | 43 ++++++++++++++++++++ quazip-0.7.6-fix_static.patch | 25 ------------ quazip-0.7.6-install-right-prefix.patch | 22 ---------- quazip.spec | 53 ++++++++++++++++++++----- sources | 2 +- 5 files changed, 86 insertions(+), 59 deletions(-) create mode 100644 FindQuaZip.cmake delete mode 100644 quazip-0.7.6-fix_static.patch delete mode 100644 quazip-0.7.6-install-right-prefix.patch diff --git a/FindQuaZip.cmake b/FindQuaZip.cmake new file mode 100644 index 0000000..23f4918 --- /dev/null +++ b/FindQuaZip.cmake @@ -0,0 +1,43 @@ +# QUAZIP_FOUND - QuaZip library was found +# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir +# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR) +# QUAZIP_LIBRARIES - List of QuaZip libraries +# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers + + +IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + # in cache already + SET(QUAZIP_FOUND TRUE) +ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + IF (Qt5Core_FOUND) + set(QUAZIP_LIB_VERSION_SUFFIX 5) + ENDIF() + IF (WIN32) + FIND_PATH(QUAZIP_LIBRARY_DIR + WIN32_DEBUG_POSTFIX d + NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll + HINTS "C:/Programme/" "C:/Program Files" + PATH_SUFFIXES QuaZip/lib + ) + FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) + FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) + ELSE(WIN32) + FIND_PACKAGE(PkgConfig) +# pkg_check_modules(PC_QCA2 QUIET qca2) + pkg_check_modules(PC_QUAZIP quazip) + FIND_LIBRARY(QUAZIP_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} + HINTS /usr/lib /usr/lib64 + ) + FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h + HINTS /usr/include /usr/local/include + PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} + ) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) + ENDIF (WIN32) + INCLUDE(FindPackageHandleStandardArgs) + SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR}) + find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS) +ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) diff --git a/quazip-0.7.6-fix_static.patch b/quazip-0.7.6-fix_static.patch deleted file mode 100644 index dd71128..0000000 --- a/quazip-0.7.6-fix_static.patch +++ /dev/null @@ -1,25 +0,0 @@ -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}) - - # 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 - if (NOT WIN32) -- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) -+ set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) - endif () - --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} ${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}) -+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) diff --git a/quazip-0.7.6-install-right-prefix.patch b/quazip-0.7.6-install-right-prefix.patch deleted file mode 100644 index 3ad2ac4..0000000 --- a/quazip-0.7.6-install-right-prefix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f323e478b1c05f470393bb57b486c0d871cf4736 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Thu, 31 Jan 2019 18:19:30 +0100 -Subject: [PATCH] Install the FindQuaZip.cmake in the right prefix - -It should go wherever CMAKE_INSTALL_PREFIX is installing. -This fixes the build on flatpak and should also fix it for other cross -compilation setups. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 539caa4..a43fefe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,4 +60,4 @@ set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE - - add_subdirectory(quazip) - --install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) -+install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${SHARE_INSTALL_PREFIX}/cmake/Modules) diff --git a/quazip.spec b/quazip.spec index edebbcd..3bbbfe2 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,14 +1,14 @@ %undefine __cmake_in_source_build Name: quazip -Version: 0.7.6 -Release: 11%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: quazip-0.7.6-fix_static.patch -Patch1: quazip-0.7.6-install-right-prefix.patch +Source0: %{url}/archive/v%{version}/%{name}-v%{version}.tar.gz +# pre-1.0 compat CMake module +Source1: FindQuaZip.cmake BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: qt4-devel @@ -66,11 +66,11 @@ for developing applications that use %{name}. %build %global _vpath_builddir build-qt4 -%cmake -DBUILD_WITH_QT4:BOOL=ON +%cmake -DQUAZIP_QT_MAJOR_VERSION=4 %cmake_build %global _vpath_builddir build-qt5 -%cmake -DBUILD_WITH_QT4:BOOL=OFF +%cmake -DQUAZIP_QT_MAJOR_VERSION=5 %cmake_build doxygen Doxyfile @@ -84,32 +84,63 @@ done %global _vpath_builddir build-qt5 %cmake_install +# Create compat symlinks/files so that packages that use the old (pre-1.0) +# library location, include paths, or CMake module still build against the +# devel package. Note that the resulting binaries will refer to the new +# library name, though. +# +# These symlinks should probably be removed once all dependent packages are +# switched to use the new pkgconfig or CMake modules. +ln -s libquazip1-qt4.so %{buildroot}%{_libdir}/libquazip.so +ln -s libquazip1-qt5.so %{buildroot}%{_libdir}/libquazip5.so + +ln -s QuaZip-Qt4-1.1/quazip %{buildroot}%{_includedir}/quazip +ln -s QuaZip-Qt5-1.1/quazip %{buildroot}%{_includedir}/quazip5 + +install -d %{buildroot}%{_datadir}/cmake/Modules +install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip.cmake +install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cmake + %ldconfig_scriptlets %files %doc NEWS.txt README.md %license COPYING -%{_libdir}/libquazip.so.1* +%{_libdir}/libquazip1-qt4.so.1* %files devel %doc doc/html -%{_includedir}/quazip/ +%{_includedir}/QuaZip-Qt4-1.1/ +%{_libdir}/libquazip1-qt4.so +%{_libdir}/cmake/QuaZip-Qt4-1.1/ +%{_libdir}/pkgconfig/quazip1-qt4.pc +# pre-1.0 compat files +%{_includedir}/quazip %{_libdir}/libquazip.so %{_datadir}/cmake/Modules/FindQuaZip.cmake %files qt5 %doc NEWS.txt README.md %license COPYING -%{_libdir}/libquazip5.so.1* +%{_libdir}/libquazip1-qt5.so.1* %files qt5-devel %doc doc/html -%{_includedir}/quazip5/ +%{_includedir}/QuaZip-Qt5-1.1/ +%{_libdir}/libquazip1-qt5.so +%{_libdir}/cmake/QuaZip-Qt5-1.1/ +%{_libdir}/pkgconfig/quazip1-qt5.pc +# pre-1.0 compat files +%{_includedir}/quazip5 %{_libdir}/libquazip5.so %{_datadir}/cmake/Modules/FindQuaZip5.cmake %changelog +* Sat Jul 31 2021 Ondrej Mosnacek - 1.1-1 +- Update to 1.1 +- Resolves: rhbz#1895170 + * Fri Jul 23 2021 Fedora Release Engineering - 0.7.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 3cdd217..2a9efbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (quazip-0.7.6.tar.gz) = 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1 +SHA512 (quazip-v1.1.tar.gz) = 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c From ff87952be4d411d333448a821b54ff1975a9bdf9 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Thu, 19 Aug 2021 17:10:09 +0200 Subject: [PATCH 59/71] Add Qt6 subpackages It turns out that version 1.1 supports building a Qt6 version as well and Fedora already has Qt6 devel packages, so start building also the Qt6 version for fun and profit. Signed-off-by: Ondrej Mosnacek --- quazip.spec | 57 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/quazip.spec b/quazip.spec index 3bbbfe2..21f66bf 100644 --- a/quazip.spec +++ b/quazip.spec @@ -2,7 +2,7 @@ Name: quazip Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -13,6 +13,8 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qt5compat-devel BuildRequires: doxygen graphviz @@ -53,11 +55,35 @@ from and writing to ZIP archives. %package qt5-devel Summary: Development files for %{name} Requires: %{name}-qt5%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel%{?_isa} -Requires: zlib-devel%{?_isa} +Requires: qt5-qtbase-devel%{?_isa} +Requires: zlib-devel%{?_isa} %description qt5-devel -The %{name}-devel package contains libraries, header files and documentation +The %{name}-qt5-devel package contains libraries, header files and documentation +for developing applications that use %{name}. + +%package qt6 +Summary: Qt6 wrapper for the minizip library +%description qt6 +QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that +can be used to access ZIP archives. It uses Trolltech's Qt toolkit. + +QuaZIP allows you to access files inside ZIP archives using QIODevice API, +and - yes! - that means that you can also use QTextStream, QDataStream or +whatever you would like to use on your zipped files. + +QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading +from and writing to ZIP archives. + +%package qt6-devel +Summary: Development files for %{name} +Requires: %{name}-qt6%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Requires: qt6-qt5compat-devel%{?_isa} +Requires: zlib-devel%{?_isa} + +%description qt6-devel +The %{name}-qt6-devel package contains libraries, header files and documentation for developing applications that use %{name}. @@ -73,6 +99,10 @@ for developing applications that use %{name}. %cmake -DQUAZIP_QT_MAJOR_VERSION=5 %cmake_build +%global _vpath_builddir build-qt6 +%cmake -DQUAZIP_QT_MAJOR_VERSION=6 +%cmake_build + doxygen Doxyfile for file in doc/html/*; do touch -r Doxyfile $file @@ -83,6 +113,8 @@ done %cmake_install %global _vpath_builddir build-qt5 %cmake_install +%global _vpath_builddir build-qt6 +%cmake_install # Create compat symlinks/files so that packages that use the old (pre-1.0) # library location, include paths, or CMake module still build against the @@ -135,8 +167,25 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cm %{_libdir}/libquazip5.so %{_datadir}/cmake/Modules/FindQuaZip5.cmake +%files qt6 +%doc NEWS.txt README.md +%license COPYING +%{_libdir}/libquazip1-qt6.so.1* + +%files qt6-devel +%doc doc/html +%{_includedir}/QuaZip-Qt6-1.1/ +%{_libdir}/libquazip1-qt6.so +%{_libdir}/cmake/QuaZip-Qt6-1.1/ +# qt6-qtbase-devel currently doesn't provide pkgconfig(Qt6Core) +# https://bugreports.qt.io/browse/QTBUG-86080 +%exclude %{_libdir}/pkgconfig/quazip1-qt6.pc + %changelog +* Thu Aug 19 2021 Ondrej Mosnacek - 1.1-2 +- Add Qt6 subpackages + * Sat Jul 31 2021 Ondrej Mosnacek - 1.1-1 - Update to 1.1 - Resolves: rhbz#1895170 From dff1031c08544b5becf248a71ecb147dfacb0972 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Thu, 19 Aug 2021 18:34:25 +0200 Subject: [PATCH 60/71] Fix up my email address in changelog Signed-off-by: Ondrej Mosnacek --- quazip.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quazip.spec b/quazip.spec index 21f66bf..92f8689 100644 --- a/quazip.spec +++ b/quazip.spec @@ -183,10 +183,10 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cm %changelog -* Thu Aug 19 2021 Ondrej Mosnacek - 1.1-2 +* Thu Aug 19 2021 Ondrej Mosnacek - 1.1-2 - Add Qt6 subpackages -* Sat Jul 31 2021 Ondrej Mosnacek - 1.1-1 +* Sat Jul 31 2021 Ondrej Mosnacek - 1.1-1 - Update to 1.1 - Resolves: rhbz#1895170 From 5f66a78cb0a1c2e9061d31b4dc85bbe86967d3f2 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Tue, 14 Sep 2021 09:38:09 +0200 Subject: [PATCH 61/71] Fix symlink-directory conflict on upgrade Due to a years-old stupid limitation of rpm [1], it is not possible to upgrade between directory and symlink without ugly hacks, so instead of symlinking the include directory, only symlink the individual include files inside it. Without this fix, upgrading quazip-devel or quazip-qt5-devel will fail. [1] https://bugzilla.redhat.com/show_bug.cgi?id=447156 Signed-off-by: Ondrej Mosnacek --- quazip.spec | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/quazip.spec b/quazip.spec index 92f8689..53f5f39 100644 --- a/quazip.spec +++ b/quazip.spec @@ -2,7 +2,7 @@ Name: quazip Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -126,8 +126,19 @@ done ln -s libquazip1-qt4.so %{buildroot}%{_libdir}/libquazip.so ln -s libquazip1-qt5.so %{buildroot}%{_libdir}/libquazip5.so -ln -s QuaZip-Qt4-1.1/quazip %{buildroot}%{_includedir}/quazip -ln -s QuaZip-Qt5-1.1/quazip %{buildroot}%{_includedir}/quazip5 +install -d %{buildroot}%{_includedir}/quazip +pushd %{buildroot}%{_includedir}/QuaZip-Qt4-1.1/quazip +for f in *; do + ln -s ../QuaZip-Qt4-1.1/quazip/$f %{buildroot}%{_includedir}/quazip/$f +done +popd + +install -d %{buildroot}%{_includedir}/quazip5 +pushd %{buildroot}%{_includedir}/QuaZip-Qt5-1.1/quazip +for f in *; do + ln -s ../QuaZip-Qt5-1.1/quazip/$f %{buildroot}%{_includedir}/quazip5/$f +done +popd install -d %{buildroot}%{_datadir}/cmake/Modules install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip.cmake @@ -147,7 +158,7 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cm %{_libdir}/cmake/QuaZip-Qt4-1.1/ %{_libdir}/pkgconfig/quazip1-qt4.pc # pre-1.0 compat files -%{_includedir}/quazip +%{_includedir}/quazip/ %{_libdir}/libquazip.so %{_datadir}/cmake/Modules/FindQuaZip.cmake @@ -163,7 +174,7 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cm %{_libdir}/cmake/QuaZip-Qt5-1.1/ %{_libdir}/pkgconfig/quazip1-qt5.pc # pre-1.0 compat files -%{_includedir}/quazip5 +%{_includedir}/quazip5/ %{_libdir}/libquazip5.so %{_datadir}/cmake/Modules/FindQuaZip5.cmake @@ -183,6 +194,9 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cm %changelog +* Tue Sep 14 2021 Ondrej Mosnacek - 1.1-3 +- Fix symlink-directory conflict on upgrade + * Thu Aug 19 2021 Ondrej Mosnacek - 1.1-2 - Add Qt6 subpackages From 7f860843d77b4c3d2d8ac3f091595562e389de01 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Fri, 20 Aug 2021 18:17:49 +0200 Subject: [PATCH 62/71] Run tests in %check Build and run the provided tests in %check. The locale needs to be overriden to C.UTF-8 to make the Qt4 tests pass due to an issue with Japanese character handling. It is possible to disable the tests by building with `--without test` (for example `fedpkg mockbuild --without test`). Signed-off-by: Ondrej Mosnacek --- quazip.spec | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/quazip.spec b/quazip.spec index 53f5f39..e78483b 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,5 +1,7 @@ %undefine __cmake_in_source_build +%bcond_without test + Name: quazip Version: 1.1 Release: 3%{?dist} @@ -144,6 +146,26 @@ install -d %{buildroot}%{_datadir}/cmake/Modules install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip.cmake install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cmake +%if %{with test} +%check +# Qt4 uses the locale rather than libicu to determine file name encoding. +# Thus we need to force a UTF-8 locale, otherwise the tests will fail +# under Qt4. +# https://github.com/stachenov/quazip/issues/127 +export LC_ALL=C.UTF-8 +# In some emulated environments (such as the s390x mock chroot emulated +# on x86_64) the regexp JIT is broken, so turn it off to avoid incorrect +# test failures. +export QT_ENABLE_REGEXP_JIT=0 + +%global _vpath_builddir build-qt4 +%cmake_build -t check +%global _vpath_builddir build-qt5 +%cmake_build -t check +%global _vpath_builddir build-qt6 +%cmake_build -t check +%endif + %ldconfig_scriptlets %files From d9b59307852f9bb506c9965637107dc26f94d7c8 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Sat, 11 Sep 2021 11:31:53 +0200 Subject: [PATCH 63/71] Clean up whitespace Signed-off-by: Ondrej Mosnacek --- quazip.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/quazip.spec b/quazip.spec index e78483b..8d28536 100644 --- a/quazip.spec +++ b/quazip.spec @@ -11,8 +11,8 @@ URL: https://github.com/stachenov/quazip Source0: %{url}/archive/v%{version}/%{name}-v%{version}.tar.gz # pre-1.0 compat CMake module Source1: FindQuaZip.cmake -BuildRequires: cmake -BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt6-qtbase-devel @@ -32,10 +32,10 @@ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading from and writing to ZIP archives. %package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt4-devel%{?_isa} -Requires: zlib-devel%{?_isa} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt4-devel%{?_isa} +Requires: zlib-devel%{?_isa} %description devel The %{name}-devel package contains libraries, header files and documentation @@ -55,10 +55,10 @@ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading from and writing to ZIP archives. %package qt5-devel -Summary: Development files for %{name} -Requires: %{name}-qt5%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel%{?_isa} -Requires: zlib-devel%{?_isa} +Summary: Development files for %{name} +Requires: %{name}-qt5%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +Requires: zlib-devel%{?_isa} %description qt5-devel The %{name}-qt5-devel package contains libraries, header files and documentation @@ -78,11 +78,11 @@ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading from and writing to ZIP archives. %package qt6-devel -Summary: Development files for %{name} -Requires: %{name}-qt6%{?_isa} = %{version}-%{release} -Requires: qt6-qtbase-devel%{?_isa} -Requires: qt6-qt5compat-devel%{?_isa} -Requires: zlib-devel%{?_isa} +Summary: Development files for %{name} +Requires: %{name}-qt6%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Requires: qt6-qt5compat-devel%{?_isa} +Requires: zlib-devel%{?_isa} %description qt6-devel The %{name}-qt6-devel package contains libraries, header files and documentation From f00a583b9e1efcfc62ce25660bf780b85cee2e49 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Sat, 11 Sep 2021 11:36:11 +0200 Subject: [PATCH 64/71] Fix package name references in Summary/Description Signed-off-by: Ondrej Mosnacek --- quazip.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/quazip.spec b/quazip.spec index 8d28536..02b49d8 100644 --- a/quazip.spec +++ b/quazip.spec @@ -55,14 +55,14 @@ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading from and writing to ZIP archives. %package qt5-devel -Summary: Development files for %{name} +Summary: Development files for %{name}-qt5 Requires: %{name}-qt5%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel%{?_isa} Requires: zlib-devel%{?_isa} %description qt5-devel The %{name}-qt5-devel package contains libraries, header files and documentation -for developing applications that use %{name}. +for developing applications that use %{name}-qt5. %package qt6 Summary: Qt6 wrapper for the minizip library @@ -78,7 +78,7 @@ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading from and writing to ZIP archives. %package qt6-devel -Summary: Development files for %{name} +Summary: Development files for %{name}-qt6 Requires: %{name}-qt6%{?_isa} = %{version}-%{release} Requires: qt6-qtbase-devel%{?_isa} Requires: qt6-qt5compat-devel%{?_isa} @@ -86,7 +86,7 @@ Requires: zlib-devel%{?_isa} %description qt6-devel The %{name}-qt6-devel package contains libraries, header files and documentation -for developing applications that use %{name}. +for developing applications that use %{name}-qt6. %prep From a870e56457a502528981ed0da2209b41fe02100e Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Sat, 11 Sep 2021 11:29:27 +0200 Subject: [PATCH 65/71] Allow building subpackages for individual Qt versions conditionally Provide conditionals for building for only a subset of Qt versions. This will be useful for implementing EPEL8 support. Signed-off-by: Ondrej Mosnacek --- quazip.spec | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/quazip.spec b/quazip.spec index 02b49d8..0315201 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,5 +1,9 @@ %undefine __cmake_in_source_build +%bcond_without qt4 +%bcond_without qt5 +%bcond_without qt6 + %bcond_without test Name: quazip @@ -13,10 +17,17 @@ Source0: %{url}/archive/v%{version}/%{name}-v%{version}.tar.gz Source1: FindQuaZip.cmake BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: zlib-devel +%if %{with qt4} BuildRequires: qt4-devel +%endif +%if %{with qt5} BuildRequires: qt5-qtbase-devel +%endif +%if %{with qt6} BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qt5compat-devel +%endif BuildRequires: doxygen graphviz @@ -31,6 +42,8 @@ whatever you would like to use on your zipped files. QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading from and writing to ZIP archives. + +%if %{with qt4} %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -40,7 +53,9 @@ Requires: zlib-devel%{?_isa} %description devel The %{name}-devel package contains libraries, header files and documentation for developing applications that use %{name}. +%endif +%if %{with qt5} %package qt5 Summary: Qt5 wrapper for the minizip library %description qt5 @@ -63,7 +78,9 @@ Requires: zlib-devel%{?_isa} %description qt5-devel The %{name}-qt5-devel package contains libraries, header files and documentation for developing applications that use %{name}-qt5. +%endif +%if %{with qt6} %package qt6 Summary: Qt6 wrapper for the minizip library %description qt6 @@ -87,23 +104,30 @@ Requires: zlib-devel%{?_isa} %description qt6-devel The %{name}-qt6-devel package contains libraries, header files and documentation for developing applications that use %{name}-qt6. +%endif %prep %autosetup -p1 %build +%if %{with qt4} %global _vpath_builddir build-qt4 %cmake -DQUAZIP_QT_MAJOR_VERSION=4 %cmake_build +%endif +%if %{with qt5} %global _vpath_builddir build-qt5 %cmake -DQUAZIP_QT_MAJOR_VERSION=5 %cmake_build +%endif +%if %{with qt6} %global _vpath_builddir build-qt6 %cmake -DQUAZIP_QT_MAJOR_VERSION=6 %cmake_build +%endif doxygen Doxyfile for file in doc/html/*; do @@ -111,12 +135,20 @@ for file in doc/html/*; do done %install +%if %{with qt4} %global _vpath_builddir build-qt4 %cmake_install +%endif + +%if %{with qt5} %global _vpath_builddir build-qt5 %cmake_install +%endif + +%if %{with qt6} %global _vpath_builddir build-qt6 %cmake_install +%endif # Create compat symlinks/files so that packages that use the old (pre-1.0) # library location, include paths, or CMake module still build against the @@ -125,8 +157,8 @@ done # # These symlinks should probably be removed once all dependent packages are # switched to use the new pkgconfig or CMake modules. +%if %{with qt4} ln -s libquazip1-qt4.so %{buildroot}%{_libdir}/libquazip.so -ln -s libquazip1-qt5.so %{buildroot}%{_libdir}/libquazip5.so install -d %{buildroot}%{_includedir}/quazip pushd %{buildroot}%{_includedir}/QuaZip-Qt4-1.1/quazip @@ -135,6 +167,13 @@ for f in *; do done popd +install -d %{buildroot}%{_datadir}/cmake/Modules +install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip.cmake +%endif + +%if %{with qt5} +ln -s libquazip1-qt5.so %{buildroot}%{_libdir}/libquazip5.so + install -d %{buildroot}%{_includedir}/quazip5 pushd %{buildroot}%{_includedir}/QuaZip-Qt5-1.1/quazip for f in *; do @@ -143,8 +182,9 @@ done popd install -d %{buildroot}%{_datadir}/cmake/Modules -install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip.cmake install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cmake +%endif + %if %{with test} %check @@ -158,16 +198,25 @@ export LC_ALL=C.UTF-8 # test failures. export QT_ENABLE_REGEXP_JIT=0 +%if %{with qt4} %global _vpath_builddir build-qt4 %cmake_build -t check +%endif + +%if %{with qt5} %global _vpath_builddir build-qt5 %cmake_build -t check +%endif + +%if %{with qt6} %global _vpath_builddir build-qt6 %cmake_build -t check %endif +%endif %ldconfig_scriptlets +%if %{with qt4} %files %doc NEWS.txt README.md %license COPYING @@ -183,7 +232,9 @@ export QT_ENABLE_REGEXP_JIT=0 %{_includedir}/quazip/ %{_libdir}/libquazip.so %{_datadir}/cmake/Modules/FindQuaZip.cmake +%endif +%if %{with qt5} %files qt5 %doc NEWS.txt README.md %license COPYING @@ -199,7 +250,9 @@ export QT_ENABLE_REGEXP_JIT=0 %{_includedir}/quazip5/ %{_libdir}/libquazip5.so %{_datadir}/cmake/Modules/FindQuaZip5.cmake +%endif +%if %{with qt6} %files qt6 %doc NEWS.txt README.md %license COPYING @@ -213,6 +266,7 @@ export QT_ENABLE_REGEXP_JIT=0 # qt6-qtbase-devel currently doesn't provide pkgconfig(Qt6Core) # https://bugreports.qt.io/browse/QTBUG-86080 %exclude %{_libdir}/pkgconfig/quazip1-qt6.pc +%endif %changelog From ce2e771ccbbb00fc044cbf4b92f949a9b8825b40 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Sat, 11 Sep 2021 12:23:52 +0200 Subject: [PATCH 66/71] Enable building for EPEL8 Now the only thing needed to get a successful build on EPEL8 is to turn off Qt4 and Qt6 subpackages there by default. Signed-off-by: Ondrej Mosnacek --- quazip.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/quazip.spec b/quazip.spec index 0315201..b55d4e7 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,8 +1,16 @@ %undefine __cmake_in_source_build -%bcond_without qt4 -%bcond_without qt5 -%bcond_without qt6 +%if 0%{?rhel} +# EPEL - only Qt5 packages +%bcond_with qt4 +%bcond_without qt5 +%bcond_with qt6 +%else +# Fedora - build everything +%bcond_without qt4 +%bcond_without qt5 +%bcond_without qt6 +%endif %bcond_without test From 9357b0e15a4bf6c75692829a42dec4dd8dd72eb1 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Sun, 14 Nov 2021 09:54:36 +0100 Subject: [PATCH 67/71] Use %{version} where appropriate Some paths contain the full version, so use the macro to allow for smooth updates to new upstream releases. Note that there are still places where the major version is used explicitly - this is intentional to avoid accidental soname bumps (which should happen only between major versions). Signed-off-by: Ondrej Mosnacek --- quazip.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/quazip.spec b/quazip.spec index b55d4e7..3be13b5 100644 --- a/quazip.spec +++ b/quazip.spec @@ -169,9 +169,9 @@ done ln -s libquazip1-qt4.so %{buildroot}%{_libdir}/libquazip.so install -d %{buildroot}%{_includedir}/quazip -pushd %{buildroot}%{_includedir}/QuaZip-Qt4-1.1/quazip +pushd %{buildroot}%{_includedir}/QuaZip-Qt4-%{version}/quazip for f in *; do - ln -s ../QuaZip-Qt4-1.1/quazip/$f %{buildroot}%{_includedir}/quazip/$f + ln -s ../QuaZip-Qt4-%{version}/quazip/$f %{buildroot}%{_includedir}/quazip/$f done popd @@ -183,9 +183,9 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip.cma ln -s libquazip1-qt5.so %{buildroot}%{_libdir}/libquazip5.so install -d %{buildroot}%{_includedir}/quazip5 -pushd %{buildroot}%{_includedir}/QuaZip-Qt5-1.1/quazip +pushd %{buildroot}%{_includedir}/QuaZip-Qt5-%{version}/quazip for f in *; do - ln -s ../QuaZip-Qt5-1.1/quazip/$f %{buildroot}%{_includedir}/quazip5/$f + ln -s ../QuaZip-Qt5-%{version}/quazip/$f %{buildroot}%{_includedir}/quazip5/$f done popd @@ -232,9 +232,9 @@ export QT_ENABLE_REGEXP_JIT=0 %files devel %doc doc/html -%{_includedir}/QuaZip-Qt4-1.1/ +%{_includedir}/QuaZip-Qt4-%{version}/ %{_libdir}/libquazip1-qt4.so -%{_libdir}/cmake/QuaZip-Qt4-1.1/ +%{_libdir}/cmake/QuaZip-Qt4-%{version}/ %{_libdir}/pkgconfig/quazip1-qt4.pc # pre-1.0 compat files %{_includedir}/quazip/ @@ -250,9 +250,9 @@ export QT_ENABLE_REGEXP_JIT=0 %files qt5-devel %doc doc/html -%{_includedir}/QuaZip-Qt5-1.1/ +%{_includedir}/QuaZip-Qt5-%{version}/ %{_libdir}/libquazip1-qt5.so -%{_libdir}/cmake/QuaZip-Qt5-1.1/ +%{_libdir}/cmake/QuaZip-Qt5-%{version}/ %{_libdir}/pkgconfig/quazip1-qt5.pc # pre-1.0 compat files %{_includedir}/quazip5/ @@ -268,9 +268,9 @@ export QT_ENABLE_REGEXP_JIT=0 %files qt6-devel %doc doc/html -%{_includedir}/QuaZip-Qt6-1.1/ +%{_includedir}/QuaZip-Qt6-%{version}/ %{_libdir}/libquazip1-qt6.so -%{_libdir}/cmake/QuaZip-Qt6-1.1/ +%{_libdir}/cmake/QuaZip-Qt6-%{version}/ # qt6-qtbase-devel currently doesn't provide pkgconfig(Qt6Core) # https://bugreports.qt.io/browse/QTBUG-86080 %exclude %{_libdir}/pkgconfig/quazip1-qt6.pc From fb93d1211fdf311556cb9a26f7511da43d5ff9c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Monitoring Date: Sun, 14 Nov 2021 00:19:53 +0000 Subject: [PATCH 68/71] Update to 1.2 (#2023014) Note that 1.2 made building tests optional, so we need to explictly enable it. Signed-off-by: Ondrej Mosnacek --- quazip.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/quazip.spec b/quazip.spec index 3be13b5..0311c3e 100644 --- a/quazip.spec +++ b/quazip.spec @@ -15,8 +15,8 @@ %bcond_without test Name: quazip -Version: 1.1 -Release: 3%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -121,19 +121,19 @@ for developing applications that use %{name}-qt6. %build %if %{with qt4} %global _vpath_builddir build-qt4 -%cmake -DQUAZIP_QT_MAJOR_VERSION=4 +%cmake -DQUAZIP_QT_MAJOR_VERSION=4 -DQUAZIP_ENABLE_TESTS=ON %cmake_build %endif %if %{with qt5} %global _vpath_builddir build-qt5 -%cmake -DQUAZIP_QT_MAJOR_VERSION=5 +%cmake -DQUAZIP_QT_MAJOR_VERSION=5 -DQUAZIP_ENABLE_TESTS=ON %cmake_build %endif %if %{with qt6} %global _vpath_builddir build-qt6 -%cmake -DQUAZIP_QT_MAJOR_VERSION=6 +%cmake -DQUAZIP_QT_MAJOR_VERSION=6 -DQUAZIP_ENABLE_TESTS=ON %cmake_build %endif @@ -278,6 +278,9 @@ export QT_ENABLE_REGEXP_JIT=0 %changelog +* Sun Nov 14 2021 Fedora Release Monitoring - 1.2-1 +- Update to 1.2 (#2023014) + * Tue Sep 14 2021 Ondrej Mosnacek - 1.1-3 - Fix symlink-directory conflict on upgrade diff --git a/sources b/sources index 2a9efbd..50d603f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (quazip-v1.1.tar.gz) = 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c +SHA512 (quazip-v1.2.tar.gz) = 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386 From da517a503e47cb38e26333baece9a5ff7f1d6bdf Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Sun, 14 Nov 2021 10:39:46 +0100 Subject: [PATCH 69/71] Do not build qt6 subpackages on s390x for now See the spec file comment for more info. Signed-off-by: Ondrej Mosnacek --- quazip.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/quazip.spec b/quazip.spec index 0311c3e..8cb947a 100644 --- a/quazip.spec +++ b/quazip.spec @@ -9,8 +9,15 @@ # Fedora - build everything %bcond_without qt4 %bcond_without qt5 +# qt6 is currently FTBFS and thus excluded on s390x +# https://bugzilla.redhat.com/show_bug.cgi?id=2012824 +# https://bugreports.qt.io/browse/QTBUG-93101 +%ifarch s390x +%bcond_with qt6 +%else %bcond_without qt6 %endif +%endif %bcond_without test From 51c7851418b81bfe7f13ad597657bc149526bc51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 17:20:44 +0000 Subject: [PATCH 70/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- quazip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quazip.spec b/quazip.spec index 8cb947a..eb4ff29 100644 --- a/quazip.spec +++ b/quazip.spec @@ -23,7 +23,7 @@ Name: quazip Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt/C++ wrapper for the minizip library License: GPLv2+ or LGPLv2+ URL: https://github.com/stachenov/quazip @@ -285,6 +285,9 @@ export QT_ENABLE_REGEXP_JIT=0 %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Nov 14 2021 Fedora Release Monitoring - 1.2-1 - Update to 1.2 (#2023014) From cb93aaf96a722ca3258e1a9bb8229586819e7df7 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 31 Oct 2023 00:15:43 +0300 Subject: [PATCH 71/71] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 50d603f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (quazip-v1.2.tar.gz) = 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386