From b170fe5ae19309dd16be61bf94dd4e208023b57a Mon Sep 17 00:00:00 2001 From: supercyper Date: Wed, 3 Feb 2010 04:45:53 +0000 Subject: [PATCH 01/48] *** 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 02/48] 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 03/48] 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 04/48] 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 05/48] *** 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 06/48] 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 07/48] *** 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 08/48] 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 09/48] - 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 10/48] 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 11/48] 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 12/48] - 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 13/48] 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 14/48] - 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 15/48] 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 16/48] - 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 17/48] 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 18/48] - 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 19/48] 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 21/48] 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 22/48] - 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 23/48] 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 24/48] 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 25/48] - 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 26/48] 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 27/48] 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 28/48] - 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 29/48] 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 30/48] 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 31/48] - 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 32/48] - 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 33/48] 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 34/48] 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 35/48] 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 36/48] 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 37/48] - 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 38/48] 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 39/48] - 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 40/48] - 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 41/48] - 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 42/48] - 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 43/48] 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 44/48] - 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 45/48] 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 46/48] 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 47/48] - 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 48/48] 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