Compare commits

...
Sign in to create a new pull request.

46 commits

Author SHA1 Message Date
Fedora Release Engineering
d075d2af45 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 11:40:13 +00:00
Fedora Release Engineering
4c0f4babdc Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 21:51:45 +00:00
Miroslav Suchý
a0ed2d5615 convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-09-04 21:20:51 +02:00
Fedora Release Engineering
68754a52e3 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 18:04:38 +00:00
Fedora Release Engineering
95875f2ff9 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 14:27:05 +00:00
Fedora Release Engineering
4c1f67aa42 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 10:21:55 +00:00
Fedora Release Engineering
10a5da8081 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 16:20:50 +00:00
Nicolas Chauvet
20bed09064 Add bzip2-devel 2023-05-05 09:53:41 +02:00
Nicolas Chauvet
c11ced66a7 Fixup soversion 2023-05-04 16:14:11 +02:00
Nicolas Chauvet
601dfeca2b Update quazip soversion 2023-05-04 15:37:53 +02:00
Nicolas Chauvet
c1425c9652 Update to 1.4 2023-05-04 15:15:21 +02:00
topazus
f5ecc47d79 switch to %ctest macro 2023-03-25 08:51:16 +08:00
topazus
f9cd5d3383 Remove ldconfig scriptlets 2023-03-25 08:49:51 +08:00
topazus
5546d01790 CMake do out-of-source builds by default 2023-03-25 08:48:27 +08:00
Fedora Release Engineering
5123819275 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-20 19:18:32 +00:00
Ondrej Mosnáček
aa86ea2486
Ship quazip1-qt6.pc in the devel package
- Resolves: rhbz#2123295

QTBUG-86080 has been fixed and qt6-qtbase-devel now provides
pkgconfig(Qt6Core), so we can safely ship the file now.

Signed-off-by: Ondrej Mosnáček <omosnacek@gmail.com>
2022-09-01 13:57:39 +02:00
Ondrej Mosnáček
65c4079343
Switch to rpmautospec
It wants to set the release to 5 for some reason, so 4 is skipped in the
changelog (it's not a typo).

Signed-off-by: Ondrej Mosnáček <omosnacek@gmail.com>
2022-09-01 13:54:28 +02:00
Fedora Release Engineering
10b4da1375 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 00:19:45 +00:00
Rex Dieter
cd2e468c4a cleanup/fix prior commit
there's both a libarary_soname and library_version file installed
2022-04-18 15:49:59 -05:00
Rex Dieter
d3e29ea990 track library sonames explicitly
previously, I had naively assumed soname=1 (when it was really 1.0.0)
2022-04-18 15:33:38 -05:00
Ondrej Mosnacek
c74dede071
Update to 1.3
Resolves: rhbz#2075993
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2022-04-17 19:46:42 +02:00
Ondrej Mosnacek
41cb0811b7 Build Qt6 subpackages on s390x again
Qt6 s390x builds are back, so we can start building the Qt6 subpackages
on s390x again.

See: https://bugzilla.redhat.com/show_bug.cgi?id=2012824
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2022-03-18 20:18:15 +01:00
Fedora Release Engineering
51c7851418 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-21 17:20:44 +00:00
Ondrej Mosnacek
da517a503e Do not build qt6 subpackages on s390x for now
See the spec file comment for more info.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-11-14 10:41:30 +01:00
Fedora Release Monitoring
fb93d1211f Update to 1.2 (#2023014)
Note that 1.2 made building tests optional, so we need to explictly
enable it.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-11-14 10:19:50 +01:00
Ondrej Mosnacek
9357b0e15a Use %{version} where appropriate
Some paths contain the full version, so use the macro to allow for
smooth updates to new upstream releases. Note that there are still
places where the major version is used explicitly - this is intentional
to avoid accidental soname bumps (which should happen only between major
versions).

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-11-14 10:17:04 +01:00
Ondrej Mosnacek
80132e2655 Merge branch 'epel8' into rawhide
Add this dummy merge commit to bring epel8 and rawhide to the same
commit.
2021-11-14 09:42:45 +01:00
Ondrej Mosnacek
ce2e771ccb Enable building for EPEL8
Now the only thing needed to get a successful build on EPEL8 is to turn
off Qt4 and Qt6 subpackages there by default.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-09-14 18:36:35 +02:00
Ondrej Mosnacek
a870e56457 Allow building subpackages for individual Qt versions conditionally
Provide conditionals for building for only a subset of Qt versions. This
will be useful for implementing EPEL8 support.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-09-14 18:36:33 +02:00
Ondrej Mosnacek
f00a583b9e Fix package name references in Summary/Description
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-09-14 18:30:53 +02:00
Ondrej Mosnacek
d9b5930785 Clean up whitespace
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-09-14 18:30:53 +02:00
Ondrej Mosnacek
7f860843d7 Run tests in %check
Build and run the provided tests in %check. The locale needs to be
overriden to C.UTF-8 to make the Qt4 tests pass due to an issue with
Japanese character handling.

It is possible to disable the tests by building with `--without test`
(for example `fedpkg mockbuild --without test`).

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-09-14 18:29:58 +02:00
Ondrej Mosnacek
5f66a78cb0 Fix symlink-directory conflict on upgrade
Due to a years-old stupid limitation of rpm [1], it is not possible to
upgrade between directory and symlink without ugly hacks, so instead of
symlinking the include directory, only symlink the individual include
files inside it.

Without this fix, upgrading quazip-devel or quazip-qt5-devel will fail.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=447156

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-09-14 09:44:21 +02:00
Ondrej Mosnacek
dff1031c08 Fix up my email address in changelog
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-09-10 21:05:11 +02:00
Ondrej Mosnacek
ff87952be4 Add Qt6 subpackages
It turns out that version 1.1 supports building a Qt6 version as well
and Fedora already has Qt6 devel packages, so start building also the
Qt6 version for fun and profit.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-09-10 21:05:11 +02:00
Ondrej Mosnacek
a63557c563 Update to 1.1
Current upstream version has changed the name of the library, include
paths, and CMake module names. To allow other packages to still build
using the old paths, add compat symlinks and the old CMake modules to
the -devel subpackages. These compat hacks can be removed once all
dependent packages have switched to use the new pkgconfig or CMake
files.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
2021-08-10 21:44:50 +02:00
Fedora Release Engineering
6071e4b49c - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 11:00:47 +00:00
Fedora Release Engineering
c7aa18f3a7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 14:53:55 +00:00
Fedora Release Engineering
51a248c445 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 07:40:49 +00:00
Fedora Release Engineering
a1d836d7c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 05:20:26 +00:00
Igor Raits
508f3d67c9
Improve compatibility with new CMake macro
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-08 17:05:19 +02:00
Sandro Mani
8cc90001be Fix cmake module install path 2020-03-04 14:18:53 +01:00
Fedora Release Engineering
d895c2bf93 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 17:07:36 +00:00
Nicolas Chauvet
c14f7d61e1 Merge branch 'master' into epel8 2019-10-31 15:25:41 +01:00
Gwyn Ciesla
58419b35b4 "Adding package.cfg file" 2019-10-29 13:00:22 -05:00
Felipe Borges
9febbfea47 Install FindQuaZip.cmake in the right prefix
This was proposed upstream in
https://github.com/stachenov/quazip/pull/20

For context: we are building Flatpaks from RPMs[0], and Quazip gets
pulled in as dependency for keepassxc.

[0] https://docs.fedoraproject.org/en-US/flatpak/tutorial/

Fixes rhbz#1761528
2019-10-21 12:38:46 +02:00
5 changed files with 419 additions and 172 deletions

43
FindQuaZip.cmake Normal file
View file

@ -0,0 +1,43 @@
# QUAZIP_FOUND - QuaZip library was found
# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
# QUAZIP_LIBRARIES - List of QuaZip libraries
# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
# 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${QUAZIP_LIB_VERSION_SUFFIX}.dll
HINTS "C:/Programme/" "C:/Program Files"
PATH_SUFFIXES QuaZip/lib
)
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)
FIND_PACKAGE(PkgConfig)
# pkg_check_modules(PC_QCA2 QUIET qca2)
pkg_check_modules(PC_QUAZIP quazip)
FIND_LIBRARY(QUAZIP_LIBRARIES
WIN32_DEBUG_POSTFIX d
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${QUAZIP_LIB_VERSION_SUFFIX}
)
FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
ENDIF (WIN32)
INCLUDE(FindPackageHandleStandardArgs)
SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)

167
changelog Normal file
View file

@ -0,0 +1,167 @@
* Thu Sep 01 2022 Ondrej Mosnáček <omosnacek@gmail.com> - 1.3-5
- Switch to rpmautospec
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Apr 18 2022 Rex Dieter <rdieter@fedoraproject.org> 1.3-2
- track library sonames explicitly
* Sun Apr 17 2022 Ondrej Mosnacek <omosnace@redhat.com> - 1.3-1
- Update to 1.3
- Resolves: rhbz#2075993
* Sun Mar 06 2022 Ondrej Mosnacek <omosnace@redhat.com> - 1.2-3
- Build Qt6 subpackages on s390x
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sun Nov 14 2021 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1.2-1
- Update to 1.2 (#2023014)
* Tue Sep 14 2021 Ondrej Mosnacek <omosnace@redhat.com> - 1.1-3
- Fix symlink-directory conflict on upgrade
* Thu Aug 19 2021 Ondrej Mosnacek <omosnace@redhat.com> - 1.1-2
- Add Qt6 subpackages
* Sat Jul 31 2021 Ondrej Mosnacek <omosnace@redhat.com> - 1.1-1
- Update to 1.1
- Resolves: rhbz#1895170
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-9
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Mar 04 2020 Sandro Mani <manisandro@gmail.com> - 0.7.6-7
- Fix cmake module install path
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Oct 21 2019 Felipe Borges <feborges@redhat.com> - 0.7.6-5
- Add patch to fix FindQuaZip.cmake install path
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Mar 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 0.7.6-3
- Add zlib-devel - rhbz#1634468
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 17 2018 Nicolas Chauvet <kwizart@gmail.com> - 0.7.6-1
- Update to 0.7.6
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Feb 13 2017 Nicolas Chauvet <kwizart@gmail.com> - 0.7.3-1
- Update to 0.7.3
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Apr 12 2016 Nicolas Chauvet <kwizart@gmail.com> - 0.7.2-1
- Update to 0.7.2
- Add patch to fix build with qt5 (disable static version)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Apr 19 2015 Rex Dieter <rdieter@fedoraproject.org> 0.7.1-2
- quazip qt5 support (#1197484)
* Thu Jan 08 2015 Nicolas Chauvet <kwizart@gmail.com> - 0.7.1-1
- Update to 0.7.1
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Tue Jul 29 2014 Nicolas Chauvet <kwizart@gmail.com> - 0.7-1
- Update to 0.7.0
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Feb 12 2014 Nicolas Chauvet <kwizart@gmail.com> - 0.6.2-1
- Update to 0.6.2
* Sun Jan 26 2014 Nicolas Chauvet <kwizart@gmail.com> - 0.6.1-1
- Update to 0.6.1
- Clean spec file
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sun Mar 03 2013 Nicolas Chauvet <kwizart@gmail.com> - 0.5.1-1
- Update to 0.5.1
* Sun Sep 09 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.5-1
- Update to 0.5
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jan 16 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.4.4-1
- Update to 0.4.4
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* 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
* Mon Jul 25 2011 Nicolas Chauvet <kwizart@gmail.com> - 0.4.1-1
- Update to 0.4.1
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Jul 24 2010 Chen Lei <supercyper@163.com> - 0.3-2
- add BR:graphviz for building apidocs
* 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
* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.3-4
- change license to GPLv2+ or LGPLv2+
* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.3-3
- use %%doc for packaging documentations
* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.3-2
- use system-wide minizip library
* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.3-1
- initial rpm build

View file

@ -1,25 +0,0 @@
diff -up quazip/quazip/CMakeLists.txt.orig quazip/quazip/CMakeLists.txt
--- quazip/quazip/CMakeLists.txt.orig 2018-07-17 11:06:16.243887366 +0200
+++ quazip/quazip/CMakeLists.txt 2018-07-17 11:17:10.088864720 +0200
@@ -15,18 +15,16 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
set(SRCS ${SRCS} ${MOC_SRCS})
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${QUAZIP_LIB_VERSION_SUFFIX})
+ set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})
endif ()
-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION 1.0.0 SOVERSION 1 DEBUG_POSTFIX d)
+set_target_properties(${QUAZIP_LIB_TARGET_NAME} 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_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
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})
+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})

View file

@ -1,15 +1,45 @@
%if 0%{?rhel}
# EPEL - only Qt5 packages
%bcond_with qt4
%bcond_without qt5
%bcond_with qt6
%else
# Fedora - build everything
%bcond_without qt4
%bcond_without qt5
%bcond_without qt6
%endif
%bcond_without test
# see top-ldevel CMakeLists.txt for variables of same name
%global QUAZIP_LIB_VERSION %{version}
%global QUAZIP_LIB_SOVERSION 1.4.0
Name: quazip
Version: 0.7.6
Release: 4%{?dist}
Version: 1.4
Release: %autorelease
Summary: Qt/C++ wrapper for the minizip library
License: GPLv2+ or LGPLv2+
# Automatically converted from old format: GPLv2+ or LGPLv2+ - review is highly recommended.
License: GPL-2.0-or-later OR LicenseRef-Callaway-LGPLv2+
URL: https://github.com/stachenov/quazip
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: quazip-0.7.6-fix_static.patch
BuildRequires: cmake
BuildRequires: gcc-c++
Source0: %{url}/archive/v%{version}/%{name}-v%{version}.tar.gz
# pre-1.0 compat CMake module
Source1: FindQuaZip.cmake
BuildRequires: bzip2-devel
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: zlib-devel
%if %{with qt4}
BuildRequires: qt4-devel
%endif
%if %{with qt5}
BuildRequires: qt5-qtbase-devel
%endif
%if %{with qt6}
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qt5compat-devel
%endif
BuildRequires: doxygen graphviz
@ -24,16 +54,21 @@ whatever you would like to use on your zipped files.
QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading
from and writing to ZIP archives.
%if %{with qt4}
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt4-devel%{?_isa}
Requires: zlib-devel%{?_isa}
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: bzip2-devel%{?_isa}
Requires: qt4-devel%{?_isa}
Requires: zlib-devel%{?_isa}
%description devel
The %{name}-devel package contains libraries, header files and documentation
for developing applications that use %{name}.
%endif
%if %{with qt5}
%package qt5
Summary: Qt5 wrapper for the minizip library
%description qt5
@ -48,33 +83,66 @@ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading
from and writing to ZIP archives.
%package qt5-devel
Summary: Development files for %{name}
Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
Requires: zlib-devel%{?_isa}
Summary: Development files for %{name}-qt5
Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
Requires: bzip2-devel%{?_isa}
Requires: qt5-qtbase-devel%{?_isa}
Requires: zlib-devel%{?_isa}
%description qt5-devel
The %{name}-devel package contains libraries, header files and documentation
for developing applications that use %{name}.
The %{name}-qt5-devel package contains libraries, header files and documentation
for developing applications that use %{name}-qt5.
%endif
%if %{with qt6}
%package qt6
Summary: Qt6 wrapper for the minizip library
%description qt6
QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
QuaZIP allows you to access files inside ZIP archives using QIODevice API,
and - yes! - that means that you can also use QTextStream, QDataStream or
whatever you would like to use on your zipped files.
QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading
from and writing to ZIP archives.
%package qt6-devel
Summary: Development files for %{name}-qt6
Requires: %{name}-qt6%{?_isa} = %{version}-%{release}
Requires: bzip2-devel%{?_isa}
Requires: qt6-qtbase-devel%{?_isa}
Requires: qt6-qt5compat-devel%{?_isa}
Requires: zlib-devel%{?_isa}
%description qt6-devel
The %{name}-qt6-devel package contains libraries, header files and documentation
for developing applications that use %{name}-qt6.
%endif
%prep
%autosetup -p1
%build
mkdir build-qt4
pushd build-qt4
%cmake .. -DBUILD_WITH_QT4:BOOL=ON
%if %{with qt4}
%global _vpath_builddir build-qt4
%cmake -DQUAZIP_QT_MAJOR_VERSION=4 -DQUAZIP_ENABLE_TESTS=ON
%cmake_build
%endif
%make_build
popd
%if %{with qt5}
%global _vpath_builddir build-qt5
%cmake -DQUAZIP_QT_MAJOR_VERSION=5 -DQUAZIP_ENABLE_TESTS=ON
%cmake_build
%endif
mkdir build-qt5
pushd build-qt5
%cmake .. -DBUILD_WITH_QT4:BOOL=OFF
%make_build
popd
%if %{with qt6}
%global _vpath_builddir build-qt6
%cmake -DQUAZIP_QT_MAJOR_VERSION=6 -DQUAZIP_ENABLE_TESTS=ON
%cmake_build
%endif
doxygen Doxyfile
for file in doc/html/*; do
@ -82,145 +150,139 @@ for file in doc/html/*; do
done
%install
make install/fast DESTDIR=%{buildroot} -C build-qt5
make install/fast DESTDIR=%{buildroot} -C build-qt4
%if %{with qt4}
%global _vpath_builddir build-qt4
%cmake_install
%endif
%ldconfig_scriptlets
%if %{with qt5}
%global _vpath_builddir build-qt5
%cmake_install
%endif
%if %{with qt6}
%global _vpath_builddir build-qt6
%cmake_install
%endif
# Create compat symlinks/files so that packages that use the old (pre-1.0)
# library location, include paths, or CMake module still build against the
# devel package. Note that the resulting binaries will refer to the new
# library name, though.
#
# These symlinks should probably be removed once all dependent packages are
# switched to use the new pkgconfig or CMake modules.
%if %{with qt4}
ln -s libquazip1-qt4.so %{buildroot}%{_libdir}/libquazip.so
install -d %{buildroot}%{_includedir}/quazip
pushd %{buildroot}%{_includedir}/QuaZip-Qt4-%{version}/quazip
for f in *; do
ln -s ../QuaZip-Qt4-%{version}/quazip/$f %{buildroot}%{_includedir}/quazip/$f
done
popd
install -d %{buildroot}%{_datadir}/cmake/Modules
install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip.cmake
%endif
%if %{with qt5}
ln -s libquazip1-qt5.so %{buildroot}%{_libdir}/libquazip5.so
install -d %{buildroot}%{_includedir}/quazip5
pushd %{buildroot}%{_includedir}/QuaZip-Qt5-%{version}/quazip
for f in *; do
ln -s ../QuaZip-Qt5-%{version}/quazip/$f %{buildroot}%{_includedir}/quazip5/$f
done
popd
install -d %{buildroot}%{_datadir}/cmake/Modules
install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip5.cmake
%endif
%if %{with test}
%check
# Qt4 uses the locale rather than libicu to determine file name encoding.
# Thus we need to force a UTF-8 locale, otherwise the tests will fail
# under Qt4.
# https://github.com/stachenov/quazip/issues/127
export LC_ALL=C.UTF-8
# In some emulated environments (such as the s390x mock chroot emulated
# on x86_64) the regexp JIT is broken, so turn it off to avoid incorrect
# test failures.
export QT_ENABLE_REGEXP_JIT=0
%if %{with qt4}
%global _vpath_builddir build-qt4
%ctest
%endif
%if %{with qt5}
%global _vpath_builddir build-qt5
%ctest
%endif
%if %{with qt6}
%global _vpath_builddir build-qt6
%ctest
%endif
%endif
%if %{with qt4}
%files
%doc NEWS.txt README.md
%license COPYING
%{_libdir}/libquazip.so.1*
%{_libdir}/libquazip1-qt4.so.%{QUAZIP_LIB_VERSION}
%{_libdir}/libquazip1-qt4.so.%{QUAZIP_LIB_SOVERSION}
%files devel
%doc doc/html
%{_includedir}/QuaZip-Qt4-%{version}/
%{_libdir}/libquazip1-qt4.so
%{_libdir}/cmake/QuaZip-Qt4-%{version}/
%{_libdir}/pkgconfig/quazip1-qt4.pc
# pre-1.0 compat files
%{_includedir}/quazip/
%{_libdir}/libquazip.so
%{_datadir}/cmake/Modules/FindQuaZip.cmake
%endif
%if %{with qt5}
%files qt5
%doc NEWS.txt README.md
%license COPYING
%{_libdir}/libquazip5.so.1*
%{_libdir}/libquazip1-qt5.so.%{QUAZIP_LIB_VERSION}
%{_libdir}/libquazip1-qt5.so.%{QUAZIP_LIB_SOVERSION}
%files qt5-devel
%doc doc/html
%{_includedir}/QuaZip-Qt5-%{version}/
%{_libdir}/libquazip1-qt5.so
%{_libdir}/cmake/QuaZip-Qt5-%{version}/
%{_libdir}/pkgconfig/quazip1-qt5.pc
# pre-1.0 compat files
%{_includedir}/quazip5/
%{_libdir}/libquazip5.so
%{_datadir}/cmake/Modules/FindQuaZip5.cmake
%endif
%if %{with qt6}
%files qt6
%doc NEWS.txt README.md
%license COPYING
%{_libdir}/libquazip1-qt6.so.%{QUAZIP_LIB_VERSION}
%{_libdir}/libquazip1-qt6.so.%{QUAZIP_LIB_SOVERSION}
%files qt6-devel
%doc doc/html
%{_includedir}/QuaZip-Qt6-%{version}/
%{_libdir}/libquazip1-qt6.so
%{_libdir}/cmake/QuaZip-Qt6-%{version}/
%{_libdir}/pkgconfig/quazip1-qt6.pc
%endif
%changelog
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Mar 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 0.7.6-3
- Add zlib-devel - rhbz#1634468
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 17 2018 Nicolas Chauvet <kwizart@gmail.com> - 0.7.6-1
- Update to 0.7.6
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Feb 13 2017 Nicolas Chauvet <kwizart@gmail.com> - 0.7.3-1
- Update to 0.7.3
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Apr 12 2016 Nicolas Chauvet <kwizart@gmail.com> - 0.7.2-1
- Update to 0.7.2
- Add patch to fix build with qt5 (disable static version)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Apr 19 2015 Rex Dieter <rdieter@fedoraproject.org> 0.7.1-2
- quazip qt5 support (#1197484)
* Thu Jan 08 2015 Nicolas Chauvet <kwizart@gmail.com> - 0.7.1-1
- Update to 0.7.1
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Tue Jul 29 2014 Nicolas Chauvet <kwizart@gmail.com> - 0.7-1
- Update to 0.7.0
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Feb 12 2014 Nicolas Chauvet <kwizart@gmail.com> - 0.6.2-1
- Update to 0.6.2
* Sun Jan 26 2014 Nicolas Chauvet <kwizart@gmail.com> - 0.6.1-1
- Update to 0.6.1
- Clean spec file
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sun Mar 03 2013 Nicolas Chauvet <kwizart@gmail.com> - 0.5.1-1
- Update to 0.5.1
* Sun Sep 09 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.5-1
- Update to 0.5
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jan 16 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.4.4-1
- Update to 0.4.4
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* 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
* Mon Jul 25 2011 Nicolas Chauvet <kwizart@gmail.com> - 0.4.1-1
- Update to 0.4.1
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Jul 24 2010 Chen Lei <supercyper@163.com> - 0.3-2
- add BR:graphviz for building apidocs
* 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
* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.3-4
- change license to GPLv2+ or LGPLv2+
* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.3-3
- use %%doc for packaging documentations
* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.3-2
- use system-wide minizip library
* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.3-1
- initial rpm build
%autochangelog

View file

@ -1 +1 @@
SHA512 (quazip-0.7.6.tar.gz) = 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1
SHA512 (quazip-v1.4.tar.gz) = 38ce3aa77df1fd92229454e56b7290c066d1e319afa36a9f8ec8477004ae94df682e8f454f13cdaf586a1d0b0e033fe698081033a19536ecd53dd1e4b0204af9