Update to 0.3

15 years ago · 733d9c3811
parent 643d5879da
commit 733d9c3811
4 changed files with 32 additions and 90 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-quazip-0.2.3.tar.gz
+quazip-0.3.tar.gz
--- a/quazip-path.patch
+++ b/quazip-path.patch
@ -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
--- 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 <supercyper@163.com> - 0.3-1
+- update to 0.3
+
 * Wed Feb  3 2010 Chen Lei <supercyper@163.com> - 0.2.3-5
 - quazip-devel must Requires minizip-devel

--- a/2
+++ b/2
@ -1 +1 @@
-1f2d72e5dc9e79831933197c0c82f974  quazip-0.2.3.tar.gz
+7f4792471e8ac713f19a086638a17816  quazip-0.3.tar.gz