| |
@@ -9,14 +9,21 @@
|
| |
# Fedora - build everything
|
| |
%bcond_without qt4
|
| |
%bcond_without qt5
|
| |
+ # qt6 is currently FTBFS and thus excluded on s390x
|
| |
+ # https://bugzilla.redhat.com/show_bug.cgi?id=2012824
|
| |
+ # https://bugreports.qt.io/browse/QTBUG-93101
|
| |
+ %ifarch s390x
|
| |
+ %bcond_with qt6
|
| |
+ %else
|
| |
%bcond_without qt6
|
| |
%endif
|
| |
+ %endif
|
| |
|
| |
%bcond_without test
|
| |
|
| |
Name: quazip
|
| |
- Version: 1.1
|
| |
- Release: 3%{?dist}
|
| |
+ Version: 1.2
|
| |
+ Release: 1%{?dist}
|
| |
Summary: Qt/C++ wrapper for the minizip library
|
| |
License: GPLv2+ or LGPLv2+
|
| |
URL: https://github.com/stachenov/quazip
|
| |
@@ -121,19 +128,19 @@
|
| |
%build
|
| |
%if %{with qt4}
|
| |
%global _vpath_builddir build-qt4
|
| |
- %cmake -DQUAZIP_QT_MAJOR_VERSION=4
|
| |
+ %cmake -DQUAZIP_QT_MAJOR_VERSION=4 -DQUAZIP_ENABLE_TESTS=ON
|
| |
%cmake_build
|
| |
%endif
|
| |
|
| |
%if %{with qt5}
|
| |
%global _vpath_builddir build-qt5
|
| |
- %cmake -DQUAZIP_QT_MAJOR_VERSION=5
|
| |
+ %cmake -DQUAZIP_QT_MAJOR_VERSION=5 -DQUAZIP_ENABLE_TESTS=ON
|
| |
%cmake_build
|
| |
%endif
|
| |
|
| |
%if %{with qt6}
|
| |
%global _vpath_builddir build-qt6
|
| |
- %cmake -DQUAZIP_QT_MAJOR_VERSION=6
|
| |
+ %cmake -DQUAZIP_QT_MAJOR_VERSION=6 -DQUAZIP_ENABLE_TESTS=ON
|
| |
%cmake_build
|
| |
%endif
|
| |
|
| |
@@ -169,9 +176,9 @@
|
| |
ln -s libquazip1-qt4.so %{buildroot}%{_libdir}/libquazip.so
|
| |
|
| |
install -d %{buildroot}%{_includedir}/quazip
|
| |
- pushd %{buildroot}%{_includedir}/QuaZip-Qt4-1.1/quazip
|
| |
+ pushd %{buildroot}%{_includedir}/QuaZip-Qt4-%{version}/quazip
|
| |
for f in *; do
|
| |
- ln -s ../QuaZip-Qt4-1.1/quazip/$f %{buildroot}%{_includedir}/quazip/$f
|
| |
+ ln -s ../QuaZip-Qt4-%{version}/quazip/$f %{buildroot}%{_includedir}/quazip/$f
|
| |
done
|
| |
popd
|
| |
|
| |
@@ -183,9 +190,9 @@
|
| |
ln -s libquazip1-qt5.so %{buildroot}%{_libdir}/libquazip5.so
|
| |
|
| |
install -d %{buildroot}%{_includedir}/quazip5
|
| |
- pushd %{buildroot}%{_includedir}/QuaZip-Qt5-1.1/quazip
|
| |
+ pushd %{buildroot}%{_includedir}/QuaZip-Qt5-%{version}/quazip
|
| |
for f in *; do
|
| |
- ln -s ../QuaZip-Qt5-1.1/quazip/$f %{buildroot}%{_includedir}/quazip5/$f
|
| |
+ ln -s ../QuaZip-Qt5-%{version}/quazip/$f %{buildroot}%{_includedir}/quazip5/$f
|
| |
done
|
| |
popd
|
| |
|
| |
@@ -232,9 +239,9 @@
|
| |
|
| |
%files devel
|
| |
%doc doc/html
|
| |
- %{_includedir}/QuaZip-Qt4-1.1/
|
| |
+ %{_includedir}/QuaZip-Qt4-%{version}/
|
| |
%{_libdir}/libquazip1-qt4.so
|
| |
- %{_libdir}/cmake/QuaZip-Qt4-1.1/
|
| |
+ %{_libdir}/cmake/QuaZip-Qt4-%{version}/
|
| |
%{_libdir}/pkgconfig/quazip1-qt4.pc
|
| |
# pre-1.0 compat files
|
| |
%{_includedir}/quazip/
|
| |
@@ -250,9 +257,9 @@
|
| |
|
| |
%files qt5-devel
|
| |
%doc doc/html
|
| |
- %{_includedir}/QuaZip-Qt5-1.1/
|
| |
+ %{_includedir}/QuaZip-Qt5-%{version}/
|
| |
%{_libdir}/libquazip1-qt5.so
|
| |
- %{_libdir}/cmake/QuaZip-Qt5-1.1/
|
| |
+ %{_libdir}/cmake/QuaZip-Qt5-%{version}/
|
| |
%{_libdir}/pkgconfig/quazip1-qt5.pc
|
| |
# pre-1.0 compat files
|
| |
%{_includedir}/quazip5/
|
| |
@@ -268,9 +275,9 @@
|
| |
|
| |
%files qt6-devel
|
| |
%doc doc/html
|
| |
- %{_includedir}/QuaZip-Qt6-1.1/
|
| |
+ %{_includedir}/QuaZip-Qt6-%{version}/
|
| |
%{_libdir}/libquazip1-qt6.so
|
| |
- %{_libdir}/cmake/QuaZip-Qt6-1.1/
|
| |
+ %{_libdir}/cmake/QuaZip-Qt6-%{version}/
|
| |
# qt6-qtbase-devel currently doesn't provide pkgconfig(Qt6Core)
|
| |
# https://bugreports.qt.io/browse/QTBUG-86080
|
| |
%exclude %{_libdir}/pkgconfig/quazip1-qt6.pc
|
| |
@@ -278,6 +285,9 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * 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
|
| |
|
| |
