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