Hello community, here is the log from the commit of package quazip for openSUSE:Factory checked in at 2015-11-24 22:20:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quazip (Old) and /work/SRC/openSUSE:Factory/.quazip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quazip" Changes: -------- New Changes file: --- /dev/null 2015-11-02 12:10:47.524024255 +0100 +++ /work/SRC/openSUSE:Factory/.quazip.new/quazip-qt5.changes 2015-11-24 22:20:17.000000000 +0100 @@ -0,0 +1,96 @@ +------------------------------------------------------------------- +Tue Nov 10 08:00:40 UTC 2015 - [email protected] + +- Add Provides/Obsoletes for old libquazip-qt5 + +------------------------------------------------------------------- +Wed Nov 4 21:11:36 UTC 2015 - [email protected] + +- streamline quazip and libquaszip-qt5 specs +- rename libquaszip-qt5.* to quaszip-qt5.* +- apply quazip-0.7.1-r260.diff generated from svn + svn diff -r r250:r260 + +------------------------------------------------------------------- +Thu May 7 20:27:34 UTC 2015 - [email protected] + +- Comment out the Source URL, since we now have a git snapshot + +------------------------------------------------------------------- +Fri Feb 6 22:46:59 UTC 2015 - [email protected] + +- update to latest svn trunk + * fixes coninstallation of Qt4 and Qt5 devel packages + * remove patch soversion.diff, it was a downstream hack + * upstream uses a new soname now + +------------------------------------------------------------------- +Sun Dec 28 20:53:51 UTC 2014 - [email protected] + +- this is qt5 version splitted from the qt4 one. + +------------------------------------------------------------------- +Sat Oct 11 01:50:43 UTC 2014 - [email protected] + +- quazip-devel should require pkgconfig(qtcore) +- Build shared library with -fvisibility-inlines-hidden +- Ensure doxygen does not create html files with timestamps. + +------------------------------------------------------------------- +Sat Sep 7 20:09:12 UTC 2013 - [email protected] + +- Update to 0.5.1 version: + * Lots of QuaZipDir fixes, thanks to all bug reporters. + * Full Qt Creator support. + * MS VS 2010 Express support. + * Qt5 support (didn't need any source code changes anyway). + * Lots of minor bug fixes. + +------------------------------------------------------------------- +Sat Dec 15 20:32:37 UTC 2012 - [email protected] + +- Update to 0.5 version: + * Added run_moc.bat files for building under Windows in case Qt + integration is not available (e. g. VS 2008 Express). + * Added the QuaZipDir class to simplify ZIP navigation in terms + of directories. + * Added the QuaGzipFile class for working with GZIP archives. It + was added as a bonus since it has nothing to do with the main + purpose of the library. It probably won't get any major + improvements, although minor bug fixes are possible. + * Added the QuaZIODevice class for working with zlib + compression. It has nothing to do with the ZIP format, and + therefore the same notice as for the QuaGzipFile applies. + * The global comment is no longer erased when adding files to + an archive. + * Many bug fixes. + +------------------------------------------------------------------- +Sun Jan 29 12:22:18 UTC 2012 - [email protected] + +- Remove redundant tags/sections per specfile guideline suggestions + +------------------------------------------------------------------- +Mon Sep 12 20:15:16 UTC 2011 - [email protected] + +- update to 0.4.3 + See NEWS for details + +------------------------------------------------------------------- +Wed Sep 7 19:15:04 UTC 2011 - [email protected] + +- update to 0.4.2 + See NEWS for details + +------------------------------------------------------------------- +Fri May 27 13:30:37 UTC 2011 - [email protected] + +- license update: GPL-2.0+ or LGPL-2.1+ + Update license syntax. Also GPLv2 was not correct. It is an ^or later^ + clause + +------------------------------------------------------------------- +Wed Feb 23 15:41:23 UTC 2011 - [email protected] + +- new package + --- /work/SRC/openSUSE:Factory/quazip/quazip.changes 2015-03-18 13:00:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quazip.new/quazip.changes 2015-11-24 22:20:17.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 4 21:11:36 UTC 2015 - [email protected] + +- streamline quazip and libquaszip-qt5 specs +- rename libquaszip-qt5.* to quaszip-qt5.* +- apply quazip-0.7.1-r260.diff generated from svn + svn diff -r r250:r260 + +------------------------------------------------------------------- New: ---- quazip-0.7.1-r260.diff quazip-qt5.changes quazip-qt5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quazip-qt5.spec ++++++ # # spec file for package quazip-qt5 # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define so_ver 1 Name: quazip-qt5 Version: 0.7.1 Release: 0 Summary: C++ wrapper for ZIP/UNZIP License: GPL-2.0+ or LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://quazip.sourceforge.net/ Source0: http://sourceforge.net/projects/quazip/files/quazip/%{version}/quazip-%{version}.tar.gz Patch0: quazip-0.7.1-r260.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: graphviz BuildRequires: graphviz-gnome BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt5Core) %description A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt5 toolkit. Useful to access ZIP archives from the Qt5 programs. %package -n libquazip5-%so_ver Summary: C++ wrapper for ZIP/UNZIP Group: Development/Libraries/C and C++ %description -n libquazip5-%so_ver A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt5 toolkit. Useful to access ZIP archives from the Qt5 programs. %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ Requires: libquazip5-%so_ver = %{version}-%{release} Requires: pkgconfig(Qt5Core) Provides: libquazip-qt5-devel = %{version} Obsoletes: libquazip-qt5-devel < %{version} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %package doc Summary: C++ wrapper for ZIP/UNZIP Group: Development/Libraries/C and C++ Provides: libquazip-qt5-doc = %{version} Obsoletes: libquazip-qt5-doc < %{version} %description doc A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt5 toolkit. Useful to access ZIP archives from the Qt5 programs. %prep %setup -q -n quazip-%{version} %patch0 -p1 %build %cmake -DCMAKE_CXX_FLAGS="-fPIC" %make_jobs cd .. echo 'HTML_TIMESTAMP=NO' >> Doxyfile doxygen -u doxygen %install cd build %make_install rm %{buildroot}/%{_libdir}/libquazip.a %post -n libquazip5-%so_ver -p /sbin/ldconfig %postun -n libquazip5-%so_ver -p /sbin/ldconfig %files -n libquazip5-%so_ver %defattr(-,root,root,-) %doc COPYING* NEWS.txt README.txt %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/quazip5/ %{_libdir}/*.so %{_datadir}/cmake/Modules/FindQuaZip5.cmake %files doc %defattr(-,root,root,-) %doc doc/html %changelog ++++++ quazip.spec ++++++ --- /var/tmp/diff_new_pack.xMoMg1/_old 2015-11-24 22:20:18.000000000 +0100 +++ /var/tmp/diff_new_pack.xMoMg1/_new 2015-11-24 22:20:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package quazip # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +%define so_ver 1 + Name: quazip Version: 0.7.1 Release: 0 @@ -25,30 +27,34 @@ Url: http://quazip.sourceforge.net/ Source0: http://sourceforge.net/projects/quazip/files/quazip/%{version}/quazip-%{version}.tar.gz +Patch0: quazip-0.7.1-r260.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build + +BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: graphviz BuildRequires: graphviz-gnome -BuildRequires: libqt4-devel +BuildRequires: zlib-devel +BuildRequires: pkgconfig(QtCore) %description -A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Trolltech's Qt toolkit. +A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt4 toolkit. Useful to access ZIP archives from the Qt programs. -%package -n libquazip1 +%package -n libquazip%{so_ver} Summary: C++ wrapper for ZIP/UNZIP Group: Development/Libraries/C and C++ -%description -n libquazip1 -A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Trolltech's Qt toolkit. +%description -n libquazip%{so_ver} +A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt4 toolkit. Useful to access ZIP archives from the Qt programs. %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ -Requires: libquazip1 = %{version}-%{release} +Requires: libquazip%{so_ver} = %{version}-%{release} Requires: pkgconfig(QtCore) %description devel @@ -60,12 +66,13 @@ Group: Development/Libraries/C and C++ %description doc -A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Trolltech's Qt toolkit. +A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using Qt4 toolkit. Useful to access ZIP archives from the Qt programs. %prep %setup -q +%patch0 -p1 %build echo 'HTML_TIMESTAMP=NO' >> Doxyfile @@ -87,11 +94,11 @@ %fdupes -s . popd -%post -n libquazip1 -p /sbin/ldconfig +%post -n libquazip%{so_ver} -p /sbin/ldconfig -%postun -n libquazip1 -p /sbin/ldconfig +%postun -n libquazip%{so_ver} -p /sbin/ldconfig -%files -n libquazip1 +%files -n libquazip%{so_ver} %defattr(-,root,root,-) %doc COPYING* NEWS.txt README.txt %{_libdir}/*.so.* ++++++ quazip-0.7.1-r260.diff ++++++ Index: quazip/FindQuaZip.cmake =================================================================== --- quazip/FindQuaZip.cmake (Revision 250) +++ quazip/FindQuaZip.cmake (Arbeitskopie) @@ -9,14 +9,17 @@ # in cache already SET(QUAZIP_FOUND TRUE) ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + IF (Qt5Core_FOUND) + set(QUAZIP_LIB_VERSION_SUFFIX 5) + ENDIF() IF (WIN32) FIND_PATH(QUAZIP_LIBRARY_DIR WIN32_DEBUG_POSTFIX d - NAMES libquazip.dll + NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS "C:/Programme/" "C:/Program Files" PATH_SUFFIXES QuaZip/lib ) - FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip.dll HINTS ${QUAZIP_LIBRARY_DIR}) + FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) ELSE(WIN32) @@ -25,12 +28,12 @@ pkg_check_modules(PC_QUAZIP quazip) FIND_LIBRARY(QUAZIP_LIBRARIES WIN32_DEBUG_POSTFIX d - NAMES quazip + NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} HINTS /usr/lib /usr/lib64 ) FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h HINTS /usr/include /usr/local/include - PATH_SUFFIXES quazip + PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} ) FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) ENDIF (WIN32) Index: quazip/quazip/quazipfile.cpp =================================================================== --- quazip/quazip/quazipfile.cpp (Revision 250) +++ quazip/quazip/quazipfile.cpp (Arbeitskopie) @@ -37,6 +37,7 @@ class QuaZipFilePrivate { friend class QuaZipFile; private: + Q_DISABLE_COPY(QuaZipFilePrivate) /// The pointer to the associated QuaZipFile instance. QuaZipFile *q; /// The QuaZip object to work with. @@ -76,10 +77,25 @@ void setZipError(int zipError) const; /// The constructor for the corresponding QuaZipFile constructor. inline QuaZipFilePrivate(QuaZipFile *q): - q(q), zip(NULL), internal(true), zipError(UNZ_OK) {} + q(q), + zip(NULL), + caseSensitivity(QuaZip::csDefault), + raw(false), + writePos(0), + uncompressedSize(0), + crc(0), + internal(true), + zipError(UNZ_OK) {} /// The constructor for the corresponding QuaZipFile constructor. inline QuaZipFilePrivate(QuaZipFile *q, const QString &zipName): - q(q), internal(true), zipError(UNZ_OK) + q(q), + caseSensitivity(QuaZip::csDefault), + raw(false), + writePos(0), + uncompressedSize(0), + crc(0), + internal(true), + zipError(UNZ_OK) { zip=new QuaZip(zipName); } @@ -86,7 +102,13 @@ /// The constructor for the corresponding QuaZipFile constructor. inline QuaZipFilePrivate(QuaZipFile *q, const QString &zipName, const QString &fileName, QuaZip::CaseSensitivity cs): - q(q), internal(true), zipError(UNZ_OK) + q(q), + raw(false), + writePos(0), + uncompressedSize(0), + crc(0), + internal(true), + zipError(UNZ_OK) { zip=new QuaZip(zipName); this->fileName=fileName; @@ -96,7 +118,14 @@ } /// The constructor for the QuaZipFile constructor accepting a file name. inline QuaZipFilePrivate(QuaZipFile *q, QuaZip *zip): - q(q), zip(zip), internal(false), zipError(UNZ_OK) {} + q(q), + zip(zip), + raw(false), + writePos(0), + uncompressedSize(0), + crc(0), + internal(false), + zipError(UNZ_OK) {} /// The destructor. inline ~QuaZipFilePrivate() { Index: quazip/quazip/CMakeLists.txt =================================================================== --- quazip/quazip/CMakeLists.txt (Revision 250) +++ quazip/quazip/CMakeLists.txt (Arbeitskopie) @@ -14,10 +14,18 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) set(SRCS ${SRCS} ${MOC_SRCS}) -add_library(quazip SHARED ${SRCS}) -set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1) +add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) +add_library(quazip_static STATIC ${SRCS}) + +# Windows uses .lib extension for both static and shared library +# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name +if (NOT WIN32) + set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip) +endif () + +set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION 1.0.0 SOVERSION 1 DEBUG_POSTFIX d) # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) -target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES}) +target_link_libraries(${QUAZIP_LIB_TARGET_NAME} quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) -install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip) -install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) +install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) +install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) Index: quazip/quazip/quazip.cpp =================================================================== --- quazip/quazip/quazip.cpp (Revision 250) +++ quazip/quazip/quazip.cpp (Arbeitskopie) @@ -39,6 +39,7 @@ class QuaZipPrivate { friend class QuaZip; private: + Q_DISABLE_COPY(QuaZipPrivate) /// The pointer to the corresponding QuaZip instance. QuaZip *q; /// The codec for file names. @@ -90,6 +91,8 @@ zip64(false), autoClose(true) { + unzFile_f = NULL; + zipFile_f = NULL; lastMappedDirectoryEntry.num_of_file = 0; lastMappedDirectoryEntry.pos_in_zip_directory = 0; } @@ -107,6 +110,8 @@ zip64(false), autoClose(true) { + unzFile_f = NULL; + zipFile_f = NULL; lastMappedDirectoryEntry.num_of_file = 0; lastMappedDirectoryEntry.pos_in_zip_directory = 0; } @@ -123,6 +128,8 @@ zip64(false), autoClose(true) { + unzFile_f = NULL; + zipFile_f = NULL; lastMappedDirectoryEntry.num_of_file = 0; lastMappedDirectoryEntry.pos_in_zip_directory = 0; } @@ -747,7 +754,7 @@ Qt::CaseSensitivity QuaZip::convertCaseSensitivity(QuaZip::CaseSensitivity cs) { if (cs == csDefault) { -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN return Qt::CaseInsensitive; #else return Qt::CaseSensitive; Index: quazip/quazip/quazip.pro =================================================================== --- quazip/quazip/quazip.pro (Revision 250) +++ quazip/quazip/quazip.pro (Arbeitskopie) @@ -33,6 +33,12 @@ # Input include(quazip.pri) + +CONFIG(debug, debug|release) { + mac: TARGET = $$join(TARGET,,,_debug) + win32: TARGET = $$join(TARGET,,,d) +} + unix:!symbian { headers.path=$$PREFIX/include/quazip headers.files=$$HEADERS Index: quazip/qztest/testquazipfile.cpp =================================================================== --- quazip/qztest/testquazipfile.cpp (Revision 250) +++ quazip/qztest/testquazipfile.cpp (Arbeitskopie) @@ -135,6 +135,18 @@ QCOMPARE(archivedData, originalData); testUnzip.goToNextFile(); } + if (!password.isEmpty()) { + QVERIFY(testUnzip.goToFirstFile()); + QuaZipFileInfo64 info; + QVERIFY(testUnzip.getCurrentFileInfo(&info)); + QFile original("tmp/" + info.name); + QVERIFY(original.open(QIODevice::ReadOnly)); + QuaZipFile archived(&testUnzip); + QVERIFY(archived.open(QIODevice::ReadOnly, "WrongPassword")); + QByteArray originalData = original.readAll(); + QByteArray archivedData = archived.readAll(); + QVERIFY(archivedData != originalData); + } testUnzip.close(); QCOMPARE(testUnzip.getZipError(), UNZ_OK); // clean up @@ -325,7 +337,7 @@ QVERIFY(createTestArchive(testZipName, QStringList() << testFileName)); QuaZipFile testFile(testZipName); testFile.setFileName(testFileName.toUpper()); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN QVERIFY(testFile.open(QIODevice::ReadOnly)); testFile.close(); #else Index: quazip/CMakeLists.txt =================================================================== --- quazip/CMakeLists.txt (Revision 250) +++ quazip/CMakeLists.txt (Arbeitskopie) @@ -10,10 +10,11 @@ if (Qt5Core_FOUND) set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES}) + set(QUAZIP_LIB_VERSION_SUFFIX 5) # if there is no QT_ROOT, try to deduce it from Qt QtCore include if ("${QT_ROOT}" STREQUAL "") set(QT_ROOT ${QT_QTCORE_INCLUDE_DIR}/../..) - endif() + endif() include_directories(${Qt5Core_INCLUDE_DIRS}) macro(qt_wrap_cpp) @@ -33,7 +34,7 @@ endif() # Use system zlib on unix and Qt ZLIB on Windows -IF(UNIX) +IF(UNIX OR MINGW) find_package(ZLIB REQUIRED) ELSE(UNIX) SET(ZLIB_INCLUDE_DIRS "${QT_ROOT}/src/3rdparty/zlib" CACHE STRING "Path to ZLIB headers of Qt") @@ -48,7 +49,9 @@ set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) +set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE + INTERNAL "Target name of libquazip" FORCE) add_subdirectory(quazip) -install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) +install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules)
