From 1cee3e8886835b6829436f3013c962622712c96c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 30 Jan 2018 13:06:00 +0100 Subject: [PATCH 01/38] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- zulucrypt.spec | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index d2c8981..33f05a4 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -24,7 +24,7 @@ Name: zulucrypt Version: 5.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt GUI front end to cryptsetup # major license is GPLv3+ (but GPLv2+ for some source files) @@ -187,26 +187,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop ########################################################################################### -%post -/usr/bin/update-desktop-database &> /dev/null || : -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null ||: ; - -%postun -/usr/bin/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null ; - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: ; -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: ; - -# rpmlint does not like -p option for a subpackage -%post libs -/sbin/ldconfig - -%postun libs -/sbin/ldconfig +%ldconfig_scriptlets libs ########################################################################################### %files -f %{name}.lang @@ -251,6 +232,9 @@ fi ########################################################################################### %changelog +* Tue Jan 30 2018 Igor Gnatenko - 5.4.0-2 +- Remove obsolete scriptlets + * Tue Jan 09 2018 Raphael Groner - 5.4.0-1 - new version - add support for mime From 047711cae39281d6f4b43ad77cedda29a6ba3cab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:32:54 +0000 Subject: [PATCH 02/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 33f05a4..981e9f2 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -24,7 +24,7 @@ Name: zulucrypt Version: 5.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt GUI front end to cryptsetup # major license is GPLv3+ (but GPLv2+ for some source files) @@ -232,6 +232,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop ########################################################################################### %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 5.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 30 2018 Igor Gnatenko - 5.4.0-2 - Remove obsolete scriptlets From 99f57ce4930b52e976110da6a44db337f135c746 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:53:46 +0000 Subject: [PATCH 03/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 981e9f2..029b5fb 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -24,7 +24,7 @@ Name: zulucrypt Version: 5.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Qt GUI front end to cryptsetup # major license is GPLv3+ (but GPLv2+ for some source files) @@ -232,6 +232,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop ########################################################################################### %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 5.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 5.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 53f7ae26d3d5a4813ecb099dbe50a46fbeb77d1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:15:44 +0000 Subject: [PATCH 04/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 029b5fb..4ffa0e2 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -24,7 +24,7 @@ Name: zulucrypt Version: 5.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt GUI front end to cryptsetup # major license is GPLv3+ (but GPLv2+ for some source files) @@ -232,6 +232,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop ########################################################################################### %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 5.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 5.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 3ba8e644e07860ea01afda39bf7efd5f33880ab8 Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Tue, 7 May 2019 13:00:03 +0200 Subject: [PATCH 05/38] add explicit BR: pkgconfig(uuid) as needed with util-linux 2.34 --- zulucrypt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 4ffa0e2..c44a9fe 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -24,7 +24,7 @@ Name: zulucrypt Version: 5.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Qt GUI front end to cryptsetup # major license is GPLv3+ (but GPLv2+ for some source files) @@ -53,6 +53,7 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(devmapper) BuildRequires: pkgconfig(blkid) +BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(pwquality) BuildRequires: pkgconfig(libcryptsetup) @@ -232,6 +233,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop ########################################################################################### %changelog +* Tue May 07 2019 Raphael Groner - 5.4.0-6 +- add explicit BR: pkgconfig(uuid) as needed with util-linux 2.34 + * Sun Feb 03 2019 Fedora Release Engineering - 5.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c13228289c3710ce869b6095681729e8b84fb550 Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Tue, 7 May 2019 13:05:42 +0200 Subject: [PATCH 06/38] bump to v5.5.0, rhbz#1705063 --- zulucrypt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index c44a9fe..067192d 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -23,8 +23,8 @@ %global srcurl https://github.com/mhogomchungu/%{srcname} Name: zulucrypt -Version: 5.4.0 -Release: 6%{?dist} +Version: 5.5.0 +Release: 1%{?dist} Summary: Qt GUI front end to cryptsetup # major license is GPLv3+ (but GPLv2+ for some source files) @@ -233,6 +233,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop ########################################################################################### %changelog +* Tue May 07 2019 Raphael Groner - 5.5.0-1 +- new version + * Tue May 07 2019 Raphael Groner - 5.4.0-6 - add explicit BR: pkgconfig(uuid) as needed with util-linux 2.34 From 74136f4e6fd0d58bfcf3790dd5660ec42b7c6574 Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Tue, 7 May 2019 13:09:25 +0200 Subject: [PATCH 07/38] upload new sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 968e2fb..1e2a731 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zulucrypt-5.1.0.tar.gz /zulucrypt-5.2.0.tar.gz /zulucrypt-5.4.0.tar.gz +/zulucrypt-5.5.0.tar.gz diff --git a/sources b/sources index ac9802c..cf1ebc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zulucrypt-5.4.0.tar.gz) = 0d7f2dffa0f801be0b844cbdead5afb1ab9af7c89262daa5f90f52c26c7e66056ee1aaa0ba4681b2e43847e563f45d5c15916d21e5d6a80901ab238fd2cb0f4b +SHA512 (zulucrypt-5.5.0.tar.gz) = 14c2b3e9659b6cfdc1233be90fcef19fb11566d8ca974a9b1b3df795cbe0746dc9dac6b9496c22e23dbeeeabab48131b7716dfb14dacdfc075fe8be03efb5ac2 From 31b9c05620aaf6f8a8b6dc44c3e7b36ed2c91748 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:05:45 +0000 Subject: [PATCH 08/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 067192d..023a934 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -24,7 +24,7 @@ Name: zulucrypt Version: 5.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt GUI front end to cryptsetup # major license is GPLv3+ (but GPLv2+ for some source files) @@ -233,6 +233,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop ########################################################################################### %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 5.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue May 07 2019 Raphael Groner - 5.5.0-1 - new version From 701192ee113663730a092998b4e5edc16fa29f79 Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Fri, 13 Sep 2019 19:47:50 +0200 Subject: [PATCH 09/38] bump to v5.6.0, rhbz#1743072 --- .gitignore | 1 + sources | 2 +- zulucrypt.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1e2a731..ea061e5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /zulucrypt-5.2.0.tar.gz /zulucrypt-5.4.0.tar.gz /zulucrypt-5.5.0.tar.gz +/zulucrypt-5.6.0.tar.gz diff --git a/sources b/sources index cf1ebc3..f0794a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zulucrypt-5.5.0.tar.gz) = 14c2b3e9659b6cfdc1233be90fcef19fb11566d8ca974a9b1b3df795cbe0746dc9dac6b9496c22e23dbeeeabab48131b7716dfb14dacdfc075fe8be03efb5ac2 +SHA512 (zulucrypt-5.6.0.tar.gz) = 62d708eaf9535901150a012239f0b046189acc788f4362b925a6a73a02cc4f4705316ae36aba3671f0f077fad7ec0ebb903f3fa5e17d253626db345c7f267f91 diff --git a/zulucrypt.spec b/zulucrypt.spec index 023a934..22a6082 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -23,8 +23,8 @@ %global srcurl https://github.com/mhogomchungu/%{srcname} Name: zulucrypt -Version: 5.5.0 -Release: 2%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Qt GUI front end to cryptsetup # major license is GPLv3+ (but GPLv2+ for some source files) @@ -233,6 +233,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop ########################################################################################### %changelog +* Fri Sep 13 2019 Raphael Groner - 5.6.0-1 +- new version + * Sat Jul 27 2019 Fedora Release Engineering - 5.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 55d4af56932271f7a0e272c29cf6625a0dcfa8c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Nov 2019 21:46:16 +0100 Subject: [PATCH 10/38] * Mon Nov 18 2019 Fabian Affolter - 5.7.0-1 - Update to latest upstream release 5.7.0 --- .gitignore | 1 + sources | 2 +- zulucrypt.spec | 77 ++++++++++++++++---------------------------------- 3 files changed, 26 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index ea061e5..e030ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /zulucrypt-5.4.0.tar.gz /zulucrypt-5.5.0.tar.gz /zulucrypt-5.6.0.tar.gz +/zulucrypt-5.7.0.tar.gz diff --git a/sources b/sources index f0794a7..fefde54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zulucrypt-5.6.0.tar.gz) = 62d708eaf9535901150a012239f0b046189acc788f4362b925a6a73a02cc4f4705316ae36aba3671f0f077fad7ec0ebb903f3fa5e17d253626db345c7f267f91 +SHA512 (zulucrypt-5.7.0.tar.gz) = 360c0f91e1fabaefa9d90a254098a62c86961cbdae6e43366e1ef1b8c041c3ca880e84be4658029ec5b785708d4a5a7b781727a04e6c4fb8bbeaa012444e1791 diff --git a/zulucrypt.spec b/zulucrypt.spec index 22a6082..59a5aec 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -1,44 +1,24 @@ -# -# Spec file for package zuluCrypt -# -# Copyright © 2011-2015 Francis Banyikwa -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - %bcond_with bundle_lxqtwallet %bcond_without bundle_tcplay %global srcname zuluCrypt -%global srcurl https://github.com/mhogomchungu/%{srcname} Name: zulucrypt -Version: 5.6.0 +Version: 5.7.0 Release: 1%{?dist} Summary: Qt GUI front end to cryptsetup -# major license is GPLv3+ (but GPLv2+ for some source files) +# 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 -URL: https://mhogomchungu.github.io/%{srcname} -Source0: %{srcurl}/archive/%{version}/%{name}-%{version}.tar.gz +URL: https://mhogomchungu.github.io/zuluCrypt +Source0: https://github.com/mhogomchungu/zuluCrypt/archive/%{version}/%{name}-%{version}.tar.gz -# polkit policy stolen from debian, https://github.com/marciosouza20/zulucrypt +# polkit policy stolen from Debian, https://github.com/marciosouza20/zulucrypt Source10: zulucrypt-gui.policy Source11: zulumount-gui.policy - BuildRequires: gcc gcc-c++ BuildRequires: kf5-rpm-macros @@ -61,7 +41,7 @@ BuildRequires: libgcrypt-devel BuildRequires: desktop-file-utils -# upstream: 'extended my "personal" copy of the library in incompatible ways' +# upstream: 'extended the "personal" copy of the library in incompatible ways' %if %{with bundle_tcplay} Provides: bundled(tcplay) = 2.0 %else @@ -87,15 +67,11 @@ Requires: shared-mime-info Suggests: ecryptfs-simple %endif - %description -zuluCrypt is a front end to cryptsetup. -It makes it easier to use cryptsetup by providing -a Qt-based GUI and a simpler to use CLI frontend -to cryptsetup. -It does the same thing truecrypt does but without -licensing problems or requiring a user to setup -sudo for it or presenting root's password. +zuluCrypt is a front end to cryptsetup. It makes it easier to use cryptsetup +by providing a Qt-based GUI and a simpler to use CLI frontend to cryptsetup. +It does the same thing truecrypt does but without licensing problems or +requiring a user to setup sudo for it or presenting root's password. This package contains the applications. %package console @@ -103,18 +79,17 @@ Summary: Console tools of %{name} Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description console -This package contains the console (CLI) frontends of -zuluCrypt. Those got split into an own subpackage to -provide possible independence from Qt as some minimum. +This package contains the console (CLI) frontends of zuluCrypt. Those got +split into an own subpackage to provide possible independence from Qt as some +minimum. %package libs Summary: Library for %{name} %description libs -This package contains libraries that provide higher -level access to cryptsetup API and provide -mounting/unmounting API to easy opening and closing -of volume. +This package contains libraries that provide higher level access to +cryptsetup API and provide mounting/unmounting API to easy opening and +closing of volume. %package devel Summary: Development files for %{name} @@ -131,17 +106,16 @@ BuildArch: noarch %description doc %{summary}. -########################################################################################### %prep -%autosetup -n%{srcname}-%{version} +%autosetup -n %{srcname}-%{version} -# documentation later with %%doc +# Documentation later with %%doc mv 'ABOUT ME' AUTHORS sed -i /docs/d CMakeLists.txt -# drop rpath, https://fedoraproject.org/wiki/Packaging:Guidelines#Beware_of_Rpath +# Drop rpath, https://fedoraproject.org/wiki/Packaging:Guidelines#Beware_of_Rpath # better use CMAKE_SKIP_INSTALL_RPATH=ON, https://fedorahosted.org/fpc/ticket/641 #find . -name CMakeLists.txt |xargs sed -i /INSTALL_RPATH/d -# handle zuluSafe as a GUI application, binary needs Qt +# Handle zuluSafe as a GUI application, binary needs Qt sed -i -r 's:(zuluSafe)-cli:\1:g' CMakeLists.txt zuluSafe/CMakeLists.txt zuluSafe-cli.1 mv zuluSafe-cli.1 zuluSafe.1 @@ -172,7 +146,6 @@ pushd %{_target_platform} popd %make_build -C %{_target_platform} - %install %make_install -C %{_target_platform} %find_lang %{name} --with-qt --all-name @@ -182,21 +155,17 @@ popd %endif install -p -m0644 -t %{buildroot}%{_datadir}/polkit-1/actions -D %{SOURCE10} %{SOURCE11} - %check desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop - -########################################################################################### %ldconfig_scriptlets libs -########################################################################################### %files -f %{name}.lang %{_bindir}/zuluCrypt-gui %{_bindir}/zuluMount-gui %{_bindir}/zuluPolkit %{_bindir}/zuluSafe -# specific GUI plugins stored to libdir, need Qt +# Specific GUI plugins stored to libdir, need Qt %{_libdir}/%{srcname}/ %{_datadir}/applications/zulu*.desktop %{_datadir}/icons/hicolor/*/apps/zulu*.png @@ -231,8 +200,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/*.pdf %doc docs/README docs/*.jpg images/*.jpeg -########################################################################################### %changelog +* Mon Nov 18 2019 Fabian Affolter - 5.7.0-1 +- Update to latest upstream release 5.7.0 + * Fri Sep 13 2019 Raphael Groner - 5.6.0-1 - new version From 70eb86266584a7dd8712a261b04f1951bc3ff006 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Nov 2019 21:56:41 +0100 Subject: [PATCH 11/38] Update files section --- zulucrypt.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 59a5aec..bb340e9 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -150,7 +150,7 @@ popd %make_install -C %{_target_platform} %find_lang %{name} --with-qt --all-name %if 0%{?rhel} -# explicitly create folders in epel, install does not know target option +# Explicitly create folders in epel, install does not know target option #mkdir -p %{buildroot}%{_datadir}/polkit-1/actions %endif install -p -m0644 -t %{buildroot}%{_datadir}/polkit-1/actions -D %{SOURCE10} %{SOURCE11} @@ -198,7 +198,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %files doc %license COPYING GPLv* LICENSE %doc docs/*.pdf -%doc docs/README docs/*.jpg images/*.jpeg +%doc docs/README docs/*.jpg %changelog * Mon Nov 18 2019 Fabian Affolter - 5.7.0-1 From 48cdc5801b94a954c4273537ab4fc6fed6af6405 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:24:35 +0000 Subject: [PATCH 12/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index bb340e9..2832697 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -5,7 +5,7 @@ Name: zulucrypt Version: 5.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -201,6 +201,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 5.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Nov 18 2019 Fabian Affolter - 5.7.0-1 - Update to latest upstream release 5.7.0 From 39c501c3d319314bb9b2ebaed16c8ebb47f49110 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Feb 2020 17:24:28 +0100 Subject: [PATCH 13/38] * Tue Feb 04 2020 Fabian Affolter - 5.7.1-1 - Update to latest upstream release 5.7.1 (rhbz#1798062) --- .gitignore | 1 + sources | 2 +- zulucrypt.spec | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e030ee8..b620822 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /zulucrypt-5.5.0.tar.gz /zulucrypt-5.6.0.tar.gz /zulucrypt-5.7.0.tar.gz +/zulucrypt-5.7.1.tar.gz diff --git a/sources b/sources index fefde54..89a676a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zulucrypt-5.7.0.tar.gz) = 360c0f91e1fabaefa9d90a254098a62c86961cbdae6e43366e1ef1b8c041c3ca880e84be4658029ec5b785708d4a5a7b781727a04e6c4fb8bbeaa012444e1791 +SHA512 (zulucrypt-5.7.1.tar.gz) = 34ab5953925d29098b2b93aa1ff05ecc3ddfab81d45aa2af8723db04c75199857f49d50a97d8354b26022473aae02f89d28c857a99f747a1debd455973d7decc diff --git a/zulucrypt.spec b/zulucrypt.spec index 2832697..2ed9a1b 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -1,11 +1,10 @@ %bcond_with bundle_lxqtwallet %bcond_without bundle_tcplay - %global srcname zuluCrypt Name: zulucrypt -Version: 5.7.0 -Release: 2%{?dist} +Version: 5.7.1 +Release: 1%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -201,6 +200,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Tue Feb 04 2020 Fabian Affolter - 5.7.1-1 +- Update to latest upstream release 5.7.1 (rhbz#1798062) + * Fri Jan 31 2020 Fedora Release Engineering - 5.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 44ddc8396b28d8b46821a53c7ee1d58d59f92e80 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 19:22:41 +0200 Subject: [PATCH 14/38] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- zulucrypt.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 2ed9a1b..f3955c2 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + %bcond_with bundle_lxqtwallet %bcond_without bundle_tcplay %global srcname zuluCrypt @@ -128,8 +130,6 @@ rm -rf external_libraries/tc-play %build -mkdir -p %{_target_platform} -pushd %{_target_platform} %{cmake_kf5} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ @@ -141,12 +141,11 @@ pushd %{_target_platform} -DNOGNOME=false \ -DNOKDE=false \ -DUSE_POLKIT=true \ - .. -popd -%make_build -C %{_target_platform} + %{nil} +%cmake_build %install -%make_install -C %{_target_platform} +%cmake_install %find_lang %{name} --with-qt --all-name %if 0%{?rhel} # Explicitly create folders in epel, install does not know target option From 4d7b5ce08e91627a9ceb2618d82e164cb22a94d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:28:22 +0000 Subject: [PATCH 15/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index f3955c2..33823d8 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -6,7 +6,7 @@ Name: zulucrypt Version: 5.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -199,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Feb 04 2020 Fabian Affolter - 5.7.1-1 - Update to latest upstream release 5.7.1 (rhbz#1798062) From 65d5aac2cf77758873308b40076d05875f79a657 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:46:51 +0000 Subject: [PATCH 16/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 33823d8..cf35565 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -6,7 +6,7 @@ Name: zulucrypt Version: 5.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -199,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 5.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 5.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c017c6ae37ddcc2621d1ee3c673bb549f1bf819f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Mar 2021 15:47:07 +0100 Subject: [PATCH 17/38] * Wed Feb 24 2021 Fabian Affolter - 6.0.0-1 - Update to latest upstream release 6.0.0 (#1922201) --- .gitignore | 1 + sources | 2 +- zulucrypt.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b620822..d8cd3b1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /zulucrypt-5.6.0.tar.gz /zulucrypt-5.7.0.tar.gz /zulucrypt-5.7.1.tar.gz +/zulucrypt-6.0.0.tar.gz diff --git a/sources b/sources index 89a676a..bc5b8ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zulucrypt-5.7.1.tar.gz) = 34ab5953925d29098b2b93aa1ff05ecc3ddfab81d45aa2af8723db04c75199857f49d50a97d8354b26022473aae02f89d28c857a99f747a1debd455973d7decc +SHA512 (zulucrypt-6.0.0.tar.gz) = 9607d8d4a0211a96c4a7bdaaf24faa08ef2a6e592cf326b5b15da61b2cec3cacf3a6a2d1fde9161a3a6116e5b3d7019712f877745ba36614487c3c619d005708 diff --git a/zulucrypt.spec b/zulucrypt.spec index cf35565..1afddda 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -5,8 +5,8 @@ %global srcname zuluCrypt Name: zulucrypt -Version: 5.7.1 -Release: 3%{?dist} +Version: 6.0.0 +Release: 1%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -35,6 +35,8 @@ BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(devmapper) BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(ossp-uuid) +#BuildRequires: pkgconfig(lxqt-wallet) >= 2.0.0 BuildRequires: pkgconfig(pwquality) BuildRequires: pkgconfig(libcryptsetup) @@ -199,6 +201,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Wed Feb 24 2021 Fabian Affolter - 6.0.0-1 +- Update to latest upstream release 6.0.0 (#1922201) + * Thu Jan 28 2021 Fedora Release Engineering - 5.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a20f55e1b0afd71ab26a107697c67ffd2e101be2 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Tue, 30 Mar 2021 15:12:05 +0100 Subject: [PATCH 18/38] Bump version information for lxqt-wallet --- zulucrypt.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 1afddda..fb077e5 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -6,7 +6,7 @@ Name: zulucrypt Version: 6.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -36,7 +36,6 @@ BuildRequires: pkgconfig(devmapper) BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(ossp-uuid) -#BuildRequires: pkgconfig(lxqt-wallet) >= 2.0.0 BuildRequires: pkgconfig(pwquality) BuildRequires: pkgconfig(libcryptsetup) @@ -52,9 +51,10 @@ Provides: bundled(tcplay) = 2.0 %endif %if %{with bundle_lxqtwallet} -Provides: bundled(lxqt-wallet) = 2.0.0 +# Version 6.0.0 bundles lxqt-wallet 3.2.0 +Provides: bundled(lxqt-wallet) = 3.2.0 %else -BuildRequires: pkgconfig(lxqt-wallet) >= 2.0.0 +BuildRequires: pkgconfig(lxqt-wallet) >= 3.2.0 %endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -73,7 +73,7 @@ Suggests: ecryptfs-simple %description zuluCrypt is a front end to cryptsetup. It makes it easier to use cryptsetup by providing a Qt-based GUI and a simpler to use CLI frontend to cryptsetup. -It does the same thing truecrypt does but without licensing problems or +It does the same thing truecrypt does but without licensing problems or requiring a user to setup sudo for it or presenting root's password. This package contains the applications. @@ -201,6 +201,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Tue Mar 30 2021 Ian McInerney - 6.0.0-2 +- Bump minimum version of lxqt-wallet required and bundled + * Wed Feb 24 2021 Fabian Affolter - 6.0.0-1 - Update to latest upstream release 6.0.0 (#1922201) From af0c22f752a9de78db17f66d96a03297badf7815 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Mon, 12 Apr 2021 21:59:59 +0100 Subject: [PATCH 19/38] Rebuild for lxqt-wallet soname bump --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index fb077e5..bfb88fd 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -6,7 +6,7 @@ Name: zulucrypt Version: 6.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -201,6 +201,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Mon Apr 12 2021 Ian McInerney - 6.0.0-3 +- Rebuild due to lxqt-wallet soname bump (fixes rhbz#1948408) + * Tue Mar 30 2021 Ian McInerney - 6.0.0-2 - Bump minimum version of lxqt-wallet required and bundled From 7f09718f6ac4fe7ca78c4581a8c7e2cebac26549 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:23:41 +0000 Subject: [PATCH 20/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index bfb88fd..5c07156 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -6,7 +6,7 @@ Name: zulucrypt Version: 6.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -201,6 +201,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 6.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Apr 12 2021 Ian McInerney - 6.0.0-3 - Rebuild due to lxqt-wallet soname bump (fixes rhbz#1948408) From 084a214046887a707e22214cdf5bb63b37f7c61c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:57:31 +0000 Subject: [PATCH 21/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 5c07156..4a0793f 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -6,7 +6,7 @@ Name: zulucrypt Version: 6.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -201,6 +201,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 6.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 6.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8ce3e06011ccc045149c30392954ddc341219f30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 14:01:34 +0000 Subject: [PATCH 22/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 4a0793f..7142dd6 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -6,7 +6,7 @@ Name: zulucrypt Version: 6.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -201,6 +201,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 6.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 6.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c2e3924f82b176c7fcdaefaa38dfd54a8f87fa33 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Sun, 14 Aug 2022 23:56:38 +0100 Subject: [PATCH 23/38] Update to upstream 6.2.0 version --- .gitignore | 1 + sources | 2 +- zulucrypt.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d8cd3b1..55fd93e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /zulucrypt-5.7.0.tar.gz /zulucrypt-5.7.1.tar.gz /zulucrypt-6.0.0.tar.gz +/zulucrypt-6.2.0.tar.gz diff --git a/sources b/sources index bc5b8ad..19ab622 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zulucrypt-6.0.0.tar.gz) = 9607d8d4a0211a96c4a7bdaaf24faa08ef2a6e592cf326b5b15da61b2cec3cacf3a6a2d1fde9161a3a6116e5b3d7019712f877745ba36614487c3c619d005708 +SHA512 (zulucrypt-6.2.0.tar.gz) = 3a2d738da2f97fd51d3c2508e07a9081d3bc9384703b944408c5f9ed25f3a5999bd4aa0841129f74cc5a8aded9a81beb9f4dd25ba720da1e449bac330d905bdc diff --git a/zulucrypt.spec b/zulucrypt.spec index 7142dd6..063b0be 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -1,12 +1,10 @@ -%undefine __cmake_in_source_build - %bcond_with bundle_lxqtwallet %bcond_without bundle_tcplay %global srcname zuluCrypt Name: zulucrypt -Version: 6.0.0 -Release: 6%{?dist} +Version: 6.2.0 +Release: 1%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -51,7 +49,7 @@ Provides: bundled(tcplay) = 2.0 %endif %if %{with bundle_lxqtwallet} -# Version 6.0.0 bundles lxqt-wallet 3.2.0 +# 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 @@ -201,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sun Aug 24 2022 Ian McInerney - 6.2.0-1 +- Update to version 6.2.0 (fixes rhbz#2088941) + * Sat Jul 23 2022 Fedora Release Engineering - 6.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 83ad0d57880ebaee4d5d6a58714166024d0ffd4e Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Mon, 15 Aug 2022 00:05:36 +0100 Subject: [PATCH 24/38] Fix changelog date mistake --- zulucrypt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 063b0be..92ffeaa 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -199,7 +199,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog -* Sun Aug 24 2022 Ian McInerney - 6.2.0-1 +* Sun Aug 14 2022 Ian McInerney - 6.2.0-1 - Update to version 6.2.0 (fixes rhbz#2088941) * Sat Jul 23 2022 Fedora Release Engineering - 6.0.0-6 From 8d895c6b744a35ffccde073e793182ab0f0035b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:22:17 +0000 Subject: [PATCH 25/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 92ffeaa..2ce4cae 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -4,7 +4,7 @@ Name: zulucrypt Version: 6.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -199,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 6.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Aug 14 2022 Ian McInerney - 6.2.0-1 - Update to version 6.2.0 (fixes rhbz#2088941) From a06f874015df2c7b13088c89392cec8bea29619b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:48:33 +0000 Subject: [PATCH 26/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 2ce4cae..e621568 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -4,7 +4,7 @@ Name: zulucrypt Version: 6.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -199,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 6.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 6.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4b01bd279b5adb1041808ca4a1cbe5cab687eeb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:19:41 +0000 Subject: [PATCH 27/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index e621568..13ef532 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -4,7 +4,7 @@ Name: zulucrypt Version: 6.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -199,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 6.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 6.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ad6859c42a414af697c209b7a7ab8dda8fb6aeab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:58:31 +0000 Subject: [PATCH 28/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 13ef532..11ebf2b 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -4,7 +4,7 @@ Name: zulucrypt Version: 6.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt GUI front end to cryptsetup # Major license is GPLv3+ (but GPLv2+ for some source files) @@ -199,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 6.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 6.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b100676ff9a31772934230ff0cffc1de47515a6a Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Sun, 1 Sep 2024 04:43:07 +0100 Subject: [PATCH 29/38] Update to upstream 7.0.0 and SPDX identifiers --- .gitignore | 1 + sources | 2 +- zulucrypt.spec | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 55fd93e..19bf9e3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /zulucrypt-5.7.1.tar.gz /zulucrypt-6.0.0.tar.gz /zulucrypt-6.2.0.tar.gz +/zulucrypt-7.0.0.tar.gz diff --git a/sources b/sources index 19ab622..c4e008f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zulucrypt-6.2.0.tar.gz) = 3a2d738da2f97fd51d3c2508e07a9081d3bc9384703b944408c5f9ed25f3a5999bd4aa0841129f74cc5a8aded9a81beb9f4dd25ba720da1e449bac330d905bdc +SHA512 (zulucrypt-7.0.0.tar.gz) = bf445897b88381da3db56277b08d71e4d61fc4006aa7741a96caeb802012f7ec492e20e41c24b71cd67eaabf2318fe3ebcbcc48b7f193eda615aa5fe29870dc6 diff --git a/zulucrypt.spec b/zulucrypt.spec index 11ebf2b..e53e141 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -3,14 +3,16 @@ %global srcname zuluCrypt Name: zulucrypt -Version: 6.2.0 -Release: 5%{?dist} +Version: 7.0.0 +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 +# Still waiting on https://gitlab.com/fedora/legal/fedora-license-data/-/issues/561 to get an SPDX ID for another part of tcplay +License: GPL-3.0-or-later AND GPL-2.0-or-later AND BSD-2-clause AND BSD-3-clause AND LicenseRef-CRC32 URL: https://mhogomchungu.github.io/zuluCrypt Source0: https://github.com/mhogomchungu/zuluCrypt/archive/%{version}/%{name}-%{version}.tar.gz @@ -199,6 +201,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sun Sep 01 2024 Ian McInerney - 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 - 6.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 32d3db92e918157a989eb5d46f6838edc4d7940f Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Wed, 6 Nov 2024 17:49:49 +0000 Subject: [PATCH 30/38] Switch to QT6 and use LXQT 4.0 --- zulucrypt.spec | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index e53e141..e578f4e 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -1,10 +1,11 @@ +%bcond_without use_qt6 %bcond_with bundle_lxqtwallet %bcond_without bundle_tcplay %global srcname zuluCrypt Name: zulucrypt Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt GUI front end to cryptsetup # More details available in the copyright file in the source tarball. @@ -20,16 +21,33 @@ Source0: https://github.com/mhogomchungu/zuluCrypt/archive/%{version}/%{n Source10: zulucrypt-gui.policy Source11: zulumount-gui.policy +# Fix targets for QT6 builds (https://github.com/mhogomchungu/zuluCrypt/pull/218) +Patch0: qt6_cmake.patch + +# Fix include file naming for lxqt 4.0 (https://github.com/mhogomchungu/zuluCrypt/pull/219) +Patch1: lxqt_header.patch + 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) @@ -50,11 +68,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} @@ -110,7 +129,7 @@ BuildArch: noarch %{summary}. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version} -p1 # Documentation later with %%doc mv 'ABOUT ME' AUTHORS @@ -138,7 +157,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 \ @@ -201,6 +224,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog + +* Wed Nov 06 2024 Ian McInerney - 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 - 7.0.0-1 - Update to upstream 7.0.0 (fixes rhbz#2307507) - License audit and update to SPDX license expressions (fixes rhbz#2118200) From b644c0099df52f58bf7c931848f982aacaeef53b Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Wed, 6 Nov 2024 17:50:21 +0000 Subject: [PATCH 31/38] Add forgotten patches to make the build work with lxqt 4.0 and QT6 --- lxqt_header.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++ qt6_cmake.patch | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 lxqt_header.patch create mode 100644 qt6_cmake.patch diff --git a/lxqt_header.patch b/lxqt_header.patch new file mode 100644 index 0000000..7efad00 --- /dev/null +++ b/lxqt_header.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 68e706a9..ab573d55 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -380,6 +380,12 @@ if( NOT NOGUI ) + include_directories( ${LXQT_WALLET_INCLUDEDIR} ) + link_directories( ${LXQT_WALLET_LIBDIR} ) + ++ # lxqt-wallet 4.0.0 renamed a header from "lxqtwallet.h" to "lxqt-wallet.h", ++ # so this is needed to choose the right header to include when compiling. ++ if( LXQT_WALLET_VERSION VERSION_GREATER "4.0.0" ) ++ add_compile_definitions( LXQT_WALLET_HYPHEN_HEADER ) ++ endif() ++ + message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "lxqt wallet support will be provided by an external libary" ) + message( STATUS "---------------------------------------------------------------------------" ) +diff --git a/plugins/network_key/network_key.h b/plugins/network_key/network_key.h +index eda2f8b2..d2a95a92 100644 +--- a/plugins/network_key/network_key.h ++++ b/plugins/network_key/network_key.h +@@ -37,7 +37,12 @@ + + #include "../../zuluCrypt-cli/pluginManager/libzuluCryptPluginManager.h" + #include "../../zuluCrypt-cli/utility/socket/socket.h" ++ ++#ifdef LXQT_WALLET_HYPHEN_HEADER ++#include "lxqt-wallet.h" ++#else + #include "lxqtwallet.h" ++#endif + + #define BUFFER_SIZE 1024 + +diff --git a/zuluCrypt-gui/cryptfiles.cpp b/zuluCrypt-gui/cryptfiles.cpp +index 3e466112..02b8845b 100644 +--- a/zuluCrypt-gui/cryptfiles.cpp ++++ b/zuluCrypt-gui/cryptfiles.cpp +@@ -38,7 +38,12 @@ + #include "utility.h" + #include "openvolume.h" + #include "dialogmsg.h" ++ ++#ifdef LXQT_WALLET_HYPHEN_HEADER ++#include "lxqt-wallet.h" ++#else + #include "lxqtwallet.h" ++#endif + + #include "plugin.h" + diff --git a/qt6_cmake.patch b/qt6_cmake.patch new file mode 100644 index 0000000..df8bc44 --- /dev/null +++ b/qt6_cmake.patch @@ -0,0 +1,39 @@ +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 051853d9..9a38745d 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -26,16 +26,20 @@ set( CMAKE_CXX_EXTENSIONS OFF) + if(BUILD_WITH_QT6) + + add_library( plugin STATIC mainwindow.h mainwindow.ui mainwindow.cpp ) ++ ++ TARGET_LINK_LIBRARIES( plugin sharedObject ${Qt6Widgets_LIBRARIES} ${Qt6Core_LIBRARIES} ) + else() + QT5_WRAP_UI( UI mainwindow.ui ) + QT5_WRAP_CPP( MOC mainwindow.h ) + + add_library( plugin STATIC ${MOC} ${UI} mainwindow.cpp ) ++ ++ TARGET_LINK_LIBRARIES( plugin sharedObject ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ) + endif() + + set_target_properties( plugin PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64 -Wextra -Wall -s -fPIC -pthread -pedantic " ) + +-TARGET_LINK_LIBRARIES( plugin sharedObject ${Qt5Widgets_LIBRARIES} ${QtCore_LIBRARIES} zuluCryptPluginManager ${blkid} ) ++TARGET_LINK_LIBRARIES( plugin sharedObject zuluCryptPluginManager ${blkid} ) + + add_subdirectory( gpg ) + add_subdirectory( keykeyfile ) +diff --git a/plugins/keydialog-qt/CMakeLists.txt b/plugins/keydialog-qt/CMakeLists.txt +index f23a2b50..69ddf9e4 100644 +--- a/plugins/keydialog-qt/CMakeLists.txt ++++ b/plugins/keydialog-qt/CMakeLists.txt +@@ -17,7 +17,7 @@ else() + QT5_ADD_RESOURCES( ICON icon.qrc ) + + add_executable( keydialog-qt ${ICON} ${MOC} ${UI} main.cpp mainwindow.cpp ) +- TARGET_LINK_LIBRARIES( keydialog-qt sharedObject ${Qt5Widgets_LIBRARIES} ${QtCore_LIBRARIES} zuluCryptPluginManager ${blkid} ) ++ TARGET_LINK_LIBRARIES( keydialog-qt sharedObject ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} zuluCryptPluginManager ${blkid} ) + #set_target_properties( keydialog-qt PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}" ) + set_target_properties( keydialog-qt PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64 -Wall -s -fPIE -pthread -pedantic " ) + endif() From 55a27abde73518f67ef7baef656590a71d57a236 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Tue, 10 Dec 2024 16:19:40 +0000 Subject: [PATCH 32/38] Update to 7.1.0 --- .gitignore | 1 + lxqt_header.patch | 51 ----------------------------------------------- qt6_cmake.patch | 39 ------------------------------------ sources | 1 + zulucrypt.spec | 17 +++++++--------- 5 files changed, 9 insertions(+), 100 deletions(-) delete mode 100644 lxqt_header.patch delete mode 100644 qt6_cmake.patch diff --git a/.gitignore b/.gitignore index 19bf9e3..fa954e2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /zulucrypt-6.0.0.tar.gz /zulucrypt-6.2.0.tar.gz /zulucrypt-7.0.0.tar.gz +/zulucrypt-7.1.0.tar.gz diff --git a/lxqt_header.patch b/lxqt_header.patch deleted file mode 100644 index 7efad00..0000000 --- a/lxqt_header.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 68e706a9..ab573d55 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -380,6 +380,12 @@ if( NOT NOGUI ) - include_directories( ${LXQT_WALLET_INCLUDEDIR} ) - link_directories( ${LXQT_WALLET_LIBDIR} ) - -+ # lxqt-wallet 4.0.0 renamed a header from "lxqtwallet.h" to "lxqt-wallet.h", -+ # so this is needed to choose the right header to include when compiling. -+ if( LXQT_WALLET_VERSION VERSION_GREATER "4.0.0" ) -+ add_compile_definitions( LXQT_WALLET_HYPHEN_HEADER ) -+ endif() -+ - message( STATUS "---------------------------------------------------------------------------" ) - message( STATUS "lxqt wallet support will be provided by an external libary" ) - message( STATUS "---------------------------------------------------------------------------" ) -diff --git a/plugins/network_key/network_key.h b/plugins/network_key/network_key.h -index eda2f8b2..d2a95a92 100644 ---- a/plugins/network_key/network_key.h -+++ b/plugins/network_key/network_key.h -@@ -37,7 +37,12 @@ - - #include "../../zuluCrypt-cli/pluginManager/libzuluCryptPluginManager.h" - #include "../../zuluCrypt-cli/utility/socket/socket.h" -+ -+#ifdef LXQT_WALLET_HYPHEN_HEADER -+#include "lxqt-wallet.h" -+#else - #include "lxqtwallet.h" -+#endif - - #define BUFFER_SIZE 1024 - -diff --git a/zuluCrypt-gui/cryptfiles.cpp b/zuluCrypt-gui/cryptfiles.cpp -index 3e466112..02b8845b 100644 ---- a/zuluCrypt-gui/cryptfiles.cpp -+++ b/zuluCrypt-gui/cryptfiles.cpp -@@ -38,7 +38,12 @@ - #include "utility.h" - #include "openvolume.h" - #include "dialogmsg.h" -+ -+#ifdef LXQT_WALLET_HYPHEN_HEADER -+#include "lxqt-wallet.h" -+#else - #include "lxqtwallet.h" -+#endif - - #include "plugin.h" - diff --git a/qt6_cmake.patch b/qt6_cmake.patch deleted file mode 100644 index df8bc44..0000000 --- a/qt6_cmake.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index 051853d9..9a38745d 100644 ---- a/plugins/CMakeLists.txt -+++ b/plugins/CMakeLists.txt -@@ -26,16 +26,20 @@ set( CMAKE_CXX_EXTENSIONS OFF) - if(BUILD_WITH_QT6) - - add_library( plugin STATIC mainwindow.h mainwindow.ui mainwindow.cpp ) -+ -+ TARGET_LINK_LIBRARIES( plugin sharedObject ${Qt6Widgets_LIBRARIES} ${Qt6Core_LIBRARIES} ) - else() - QT5_WRAP_UI( UI mainwindow.ui ) - QT5_WRAP_CPP( MOC mainwindow.h ) - - add_library( plugin STATIC ${MOC} ${UI} mainwindow.cpp ) -+ -+ TARGET_LINK_LIBRARIES( plugin sharedObject ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ) - endif() - - set_target_properties( plugin PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64 -Wextra -Wall -s -fPIC -pthread -pedantic " ) - --TARGET_LINK_LIBRARIES( plugin sharedObject ${Qt5Widgets_LIBRARIES} ${QtCore_LIBRARIES} zuluCryptPluginManager ${blkid} ) -+TARGET_LINK_LIBRARIES( plugin sharedObject zuluCryptPluginManager ${blkid} ) - - add_subdirectory( gpg ) - add_subdirectory( keykeyfile ) -diff --git a/plugins/keydialog-qt/CMakeLists.txt b/plugins/keydialog-qt/CMakeLists.txt -index f23a2b50..69ddf9e4 100644 ---- a/plugins/keydialog-qt/CMakeLists.txt -+++ b/plugins/keydialog-qt/CMakeLists.txt -@@ -17,7 +17,7 @@ else() - QT5_ADD_RESOURCES( ICON icon.qrc ) - - add_executable( keydialog-qt ${ICON} ${MOC} ${UI} main.cpp mainwindow.cpp ) -- TARGET_LINK_LIBRARIES( keydialog-qt sharedObject ${Qt5Widgets_LIBRARIES} ${QtCore_LIBRARIES} zuluCryptPluginManager ${blkid} ) -+ TARGET_LINK_LIBRARIES( keydialog-qt sharedObject ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} zuluCryptPluginManager ${blkid} ) - #set_target_properties( keydialog-qt PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}" ) - set_target_properties( keydialog-qt PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64 -Wall -s -fPIE -pthread -pedantic " ) - endif() diff --git a/sources b/sources index c4e008f..87bf278 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (zulucrypt-7.0.0.tar.gz) = bf445897b88381da3db56277b08d71e4d61fc4006aa7741a96caeb802012f7ec492e20e41c24b71cd67eaabf2318fe3ebcbcc48b7f193eda615aa5fe29870dc6 +SHA512 (zulucrypt-7.1.0.tar.gz) = 488c491e7ad1f06e1cd5a682d2abab6fbf459aade6204d189ac6f0b8466c872f14ceb8c569592623b3fa7e7604800e4d584725b36c5acb94ca484abc71b97283 diff --git a/zulucrypt.spec b/zulucrypt.spec index e578f4e..3e01ed5 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -4,16 +4,16 @@ %global srcname zuluCrypt Name: zulucrypt -Version: 7.0.0 -Release: 2%{?dist} +Version: 7.1.0 +Release: 1%{?dist} Summary: Qt GUI front end to cryptsetup # 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 -# Still waiting on https://gitlab.com/fedora/legal/fedora-license-data/-/issues/561 to get an SPDX ID for another part of tcplay -License: GPL-3.0-or-later AND GPL-2.0-or-later AND BSD-2-clause AND BSD-3-clause AND LicenseRef-CRC32 +# 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,12 +21,6 @@ Source0: https://github.com/mhogomchungu/zuluCrypt/archive/%{version}/%{n Source10: zulucrypt-gui.policy Source11: zulumount-gui.policy -# Fix targets for QT6 builds (https://github.com/mhogomchungu/zuluCrypt/pull/218) -Patch0: qt6_cmake.patch - -# Fix include file naming for lxqt 4.0 (https://github.com/mhogomchungu/zuluCrypt/pull/219) -Patch1: lxqt_header.patch - BuildRequires: gcc gcc-c++ BuildRequires: kf5-rpm-macros @@ -224,6 +218,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Tue Dec 10 2024 Ian McInerney - 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 - 7.0.0-2 - Switch to QT6 for new lxqt-wallet version 4.0.0 update From d2bf879e130db48b6307655caa2a89392e4e0d60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:54:07 +0000 Subject: [PATCH 33/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 3e01ed5..13b5a03 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -5,7 +5,7 @@ Name: zulucrypt Version: 7.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt GUI front end to cryptsetup # More details available in the copyright file in the source tarball. @@ -218,6 +218,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 7.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Dec 10 2024 Ian McInerney - 7.1.0-1 - Update to upstream 7.1.0 (fixes rhbz#2330000, rhbz#2331292) - Update license string with final SPDX expression From d852107084bae3a89056486598d0e79b0a913eca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:21:41 +0000 Subject: [PATCH 34/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 13b5a03..0a07337 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -5,7 +5,7 @@ Name: zulucrypt Version: 7.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt GUI front end to cryptsetup # More details available in the copyright file in the source tarball. @@ -218,6 +218,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 7.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 7.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 522aaa6045444ed1c96d0416da199359285923d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:11:50 +0000 Subject: [PATCH 35/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 0a07337..0cb9e4b 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -5,7 +5,7 @@ Name: zulucrypt Version: 7.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Qt GUI front end to cryptsetup # More details available in the copyright file in the source tarball. @@ -218,6 +218,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 7.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 7.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4af6546d646c0b80f69631ef4d465971359bd589 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:44:27 +0000 Subject: [PATCH 36/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zulucrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zulucrypt.spec b/zulucrypt.spec index 0cb9e4b..412c0f1 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -5,7 +5,7 @@ Name: zulucrypt Version: 7.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt GUI front end to cryptsetup # More details available in the copyright file in the source tarball. @@ -218,6 +218,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 7.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 7.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 1dc4a181ac9ebe5fe3815358ce8842b8434d24fd Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 1 Aug 2026 22:30:16 -0300 Subject: [PATCH 37/38] Update to 7.1.1 Resolves: rhbz#2480347 Resolves: rhbz#2505401 --- .gitignore | 1 + sources | 3 +-- zulucrypt.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fa954e2..6c56ed8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /zulucrypt-6.2.0.tar.gz /zulucrypt-7.0.0.tar.gz /zulucrypt-7.1.0.tar.gz +/zulucrypt-7.1.1.tar.gz diff --git a/sources b/sources index 87bf278..1b7262d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (zulucrypt-7.0.0.tar.gz) = bf445897b88381da3db56277b08d71e4d61fc4006aa7741a96caeb802012f7ec492e20e41c24b71cd67eaabf2318fe3ebcbcc48b7f193eda615aa5fe29870dc6 -SHA512 (zulucrypt-7.1.0.tar.gz) = 488c491e7ad1f06e1cd5a682d2abab6fbf459aade6204d189ac6f0b8466c872f14ceb8c569592623b3fa7e7604800e4d584725b36c5acb94ca484abc71b97283 +SHA512 (zulucrypt-7.1.1.tar.gz) = 4531e6f9ccafc18341d65fcc9b0fd185ccd9f8c21ffe5eee9048efd045ce2233352f477f1c7fd97775931cfd636e0284a897ba79272b14bd27eec7464a39b5a2 diff --git a/zulucrypt.spec b/zulucrypt.spec index 412c0f1..8bccf44 100644 --- a/zulucrypt.spec +++ b/zulucrypt.spec @@ -4,8 +4,8 @@ %global srcname zuluCrypt Name: zulucrypt -Version: 7.1.0 -Release: 5%{?dist} +Version: 7.1.1 +Release: 1%{?dist} Summary: Qt GUI front end to cryptsetup # More details available in the copyright file in the source tarball. @@ -218,6 +218,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/zulu*.desktop %doc docs/README docs/*.jpg %changelog +* Sun Aug 02 2026 Filipe Rosset - 7.1.1-1 +- Update to 7.1.1 +- Resolves: rhbz#2480347 +- Resolves: rhbz#2505401 + * Fri Jul 17 2026 Fedora Release Engineering - 7.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From c1c849423d84b90fe60a56c651842387d0ed52e2 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 1 Aug 2026 22:30:48 -0300 Subject: [PATCH 38/38] simplify .gitignore file Signed-off-by: Filipe Rosset --- .gitignore | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6c56ed8..2d636a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +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-7.0.0.tar.gz -/zulucrypt-7.1.0.tar.gz -/zulucrypt-7.1.1.tar.gz +/zulucrypt-*.tar.gz