simplify .gitignore file

Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>

.gitignore

@@ -1,14 +1,3 @@
-/zulucrypt-064e9db3a81f0c3e2030eabc1931914461c7a829.tar.gz
 /zulucrypt-gui.policy
 /zulumount-gui.policy
-/zulucrypt-5.0.1.tar.gz
-/zulucrypt-5.0.2.tar.gz
-/zulucrypt-5.1.0.tar.gz
-/zulucrypt-5.2.0.tar.gz
-/zulucrypt-5.4.0.tar.gz
-/zulucrypt-5.5.0.tar.gz
-/zulucrypt-5.6.0.tar.gz
-/zulucrypt-5.7.0.tar.gz
-/zulucrypt-5.7.1.tar.gz
-/zulucrypt-6.0.0.tar.gz
-/zulucrypt-6.2.0.tar.gz
+/zulucrypt-*.tar.gz

sources

@@ -1 +1 @@
-SHA512 (zulucrypt-6.2.0.tar.gz) = 3a2d738da2f97fd51d3c2508e07a9081d3bc9384703b944408c5f9ed25f3a5999bd4aa0841129f74cc5a8aded9a81beb9f4dd25ba720da1e449bac330d905bdc
+SHA512 (zulucrypt-7.1.1.tar.gz) = 4531e6f9ccafc18341d65fcc9b0fd185ccd9f8c21ffe5eee9048efd045ce2233352f477f1c7fd97775931cfd636e0284a897ba79272b14bd27eec7464a39b5a2

zulucrypt.spec

@@ -1,16 +1,19 @@
+%bcond_without  use_qt6
 %bcond_with     bundle_lxqtwallet
 %bcond_without  bundle_tcplay
 %global srcname zuluCrypt
 
 Name:           zulucrypt
-Version:        6.2.0
+Version:        7.1.1
 Release:        1%{?dist}
 Summary:        Qt GUI front end to cryptsetup
 
-# Major license is GPLv3+ (but GPLv2+ for some source files)
-# BSD for lxqt_wallet and tcplay (both bundled)
-# Public Domain for bundled md5-openssl
-License:        GPLv3+ and GPLv2+ and BSD and Public Domain
+# More details available in the copyright file in the source tarball.
+# Major license is GPLv2+ (but GPLv3+ for some files)
+# BSD for zuluwallet and dependencies lxqt_wallet and tcplay (at least tcplay is always bundled)
+# CRC32 for a file in tcplay
+# generic-xts for a part of tcplay
+License:        GPL-3.0-or-later AND GPL-2.0-or-later AND BSD-2-clause AND BSD-3-clause AND generic-xts AND LicenseRef-Fedora-UltraPermissive
 URL:            https://mhogomchungu.github.io/zuluCrypt
 Source0:        https://github.com/mhogomchungu/zuluCrypt/archive/%{version}/%{name}-%{version}.tar.gz
 
@@ -21,13 +24,24 @@ Source11:      zulumount-gui.policy
 BuildRequires:  gcc gcc-c++
 
 BuildRequires:  kf5-rpm-macros
+
+# These are only needed for building the lxqt-wallet bundled library
+%if %{with bundle_lxqtwallet}
 BuildRequires:  cmake(KF5Wallet)
 BuildRequires:  cmake(KF5Notifications)
+%endif
 
+%if %{with use_qt6}
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Network)
+BuildRequires:  pkgconfig(Qt6Widgets)
+%else
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Widgets)
+%endif
 
 BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(devmapper)
@@ -48,11 +62,12 @@ Provides:       bundled(tcplay) = 2.0
 #BuildRequires:  tcplay-devel >= 2.0
 %endif
 
+# NB: LXQT version 4.0.0 is only built with QT6
 %if %{with bundle_lxqtwallet}
 # Version 6.2.0 bundles lxqt-wallet 3.2.2
 Provides:       bundled(lxqt-wallet) = 3.2.0
 %else
-BuildRequires:  pkgconfig(lxqt-wallet) >= 3.2.0
+BuildRequires:  pkgconfig(lxqt-wallet) >= 4.0.0
 %endif
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
@@ -108,7 +123,7 @@ BuildArch:      noarch
 %{summary}.
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version} -p1
 
 # Documentation later with %%doc
 mv 'ABOUT ME' AUTHORS
@@ -136,7 +151,11 @@ rm -rf external_libraries/tc-play
  -DREUSEMOUNTPOINT=false \
  -DUDEVSUPPORT=true \
  -DNOGUI=false \
+%if %{with use_qt6}
+ -DBUILD_WITH_QT6=true \
+%else
  -DQT5=true \
+%endif
  -DHOMEMOUNTPREFIX=false \
  -DNOGNOME=false \
  -DNOKDE=false \
@@ -199,9 +218,53 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop
 %doc docs/README docs/*.jpg
 
 %changelog
+* Sun Aug 02 2026 Filipe Rosset <rosset.filipe@gmail.com> - 7.1.1-1
+- Update to 7.1.1
+- Resolves: rhbz#2480347
+- Resolves: rhbz#2505401
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Dec 10 2024 Ian McInerney <ian.s.mcinerney@ieee.org> - 7.1.0-1
+- Update to upstream 7.1.0 (fixes rhbz#2330000, rhbz#2331292)
+- Update license string with final SPDX expression
+
+* Wed Nov 06 2024 Ian McInerney <ian.s.mcinerney@ieee.org> - 7.0.0-2
+- Switch to QT6 for new lxqt-wallet version 4.0.0 update
+- Spec file cleanup
+
+* Sun Sep 01 2024 Ian McInerney <ian.s.mcinerney@ieee.org> - 7.0.0-1
+- Update to upstream 7.0.0 (fixes rhbz#2307507)
+- License audit and update to SPDX license expressions (fixes rhbz#2118200)
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Sun Aug 14 2022 Ian McInerney <ian.s.mcinerney@ieee.org> - 6.2.0-1
 - Update to version 6.2.0 (fixes rhbz#2088941)
 
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild