From 5208acead56ca141649e37058c83a27630e7aab9 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sat, 17 Dec 2011 18:01:52 +0100
Subject: [PATCH] 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 <kwizart@gmail.com> - 0.4.3-1
+- Update to 0.4.3
+
 * Fri Aug 19 2011 Nicolas Chauvet <kwizart@gmail.com> - 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