[quazip] Update to 0.4.1
Nicolas Chauvet
kwizart at fedoraproject.org
Mon Jul 25 12:39:31 UTC 2011
commit 4d0ad28615350f5e93dbfb756ba33ab70066f346
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Mon Jul 25 14:39:02 2011 +0200
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(-)
---
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 <kwizart at gmail.com> - 0.4.1-1
+- Update to 0.4.1
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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
More information about the scm-commits
mailing list