From 437669ef12a29098597a4331da0a4273f2b49c4c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 3 Mar 2013 14:49:06 +0100 Subject: [PATCH] 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