diff --git a/.gitignore b/.gitignore index 033757f..e2081cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /SiriKali-1.3.2.tar.xz +/SiriKali-1.3.3.tar.xz diff --git a/6dad4d1feb4f4f2f98ab4c02114cafd560cb61c0.patch b/6dad4d1feb4f4f2f98ab4c02114cafd560cb61c0.patch deleted file mode 100644 index ac463d3..0000000 --- a/6dad4d1feb4f4f2f98ab4c02114cafd560cb61c0.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 6dad4d1feb4f4f2f98ab4c02114cafd560cb61c0 Mon Sep 17 00:00:00 2001 -From: ink -Date: Sat, 13 Jan 2018 20:07:24 +0300 -Subject: [PATCH] fix a build issue when lxqt_wallet internal library is - completely missing - ---- - src/cryfscreateoptions.cpp | 2 +- - src/gocryptfscreateoptions.cpp | 2 +- - src/keydialog.cpp | 2 +- - src/siritask.h | 2 +- - src/walletconfig.cpp | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/cryfscreateoptions.cpp b/src/cryfscreateoptions.cpp -index 31ed227..1fc925d 100644 ---- a/src/cryfscreateoptions.cpp -+++ b/src/cryfscreateoptions.cpp -@@ -21,7 +21,7 @@ - #include "ui_cryfscreateoptions.h" - - #include "utility.h" --#include "task.h" -+#include "task.hpp" - - cryfscreateoptions::cryfscreateoptions( QWidget * parent, - std::function< void( const QStringList& ) > function ) : -diff --git a/src/gocryptfscreateoptions.cpp b/src/gocryptfscreateoptions.cpp -index 07c64f5..34b9b2f 100644 ---- a/src/gocryptfscreateoptions.cpp -+++ b/src/gocryptfscreateoptions.cpp -@@ -21,7 +21,7 @@ - #include "ui_gocryptfscreateoptions.h" - - #include "utility.h" --#include "task.h" -+#include "task.hpp" - - gocryptfscreateoptions::gocryptfscreateoptions( QWidget * parent, - std::function< void( const QStringList& ) > function ) : -diff --git a/src/keydialog.cpp b/src/keydialog.cpp -index e99ae9e..1720e4b 100644 ---- a/src/keydialog.cpp -+++ b/src/keydialog.cpp -@@ -29,7 +29,7 @@ - - #include "options.h" - #include "dialogmsg.h" --#include "task.h" -+#include "task.hpp" - #include "utility.h" - #include "lxqt_wallet.h" - #include "utility2.h" -diff --git a/src/siritask.h b/src/siritask.h -index c3942cd..f4c4373 100644 ---- a/src/siritask.h -+++ b/src/siritask.h -@@ -21,7 +21,7 @@ - #define ZULUMOUNTTASK_H - - #include "volumeinfo.h" --#include "task.h" -+#include "task.hpp" - #include "utility.h" - #include "favorites.h" - #include -diff --git a/src/walletconfig.cpp b/src/walletconfig.cpp -index e793e02..9dd9f27 100644 ---- a/src/walletconfig.cpp -+++ b/src/walletconfig.cpp -@@ -25,7 +25,7 @@ - #include "tablewidget.h" - #include "walletconfiginput.h" - #include "utility.h" --#include "task.h" -+#include "task.hpp" - - #include - #include diff --git a/ef54268108f0f04e5e1c8aaffd2bf4bdcca4d087.patch b/ef54268108f0f04e5e1c8aaffd2bf4bdcca4d087.patch deleted file mode 100644 index 91e1f73..0000000 --- a/ef54268108f0f04e5e1c8aaffd2bf4bdcca4d087.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ef54268108f0f04e5e1c8aaffd2bf4bdcca4d087 Mon Sep 17 00:00:00 2001 -From: ink -Date: Sat, 13 Jan 2018 19:34:26 +0300 -Subject: [PATCH] add "sirikali.appdata.xml" file - ---- - CMakeLists.txt | 2 ++ - src/sirikali.appdata.xml | 39 +++++++++++++++++++++++++++++++++++++++ - 2 files changed, 41 insertions(+) - create mode 100644 src/sirikali.appdata.xml - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c29fe5..afd70c3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -350,6 +350,8 @@ install( FILES translations/de_DE.qm DESTINATION ${CMAKE_INSTALL_DATADIR}/sirika - install( FILES src/sirikali.1.gz DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1/ ) - install( FILES src/sirikali.pkexec.1.gz DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1/ ) - -+install( FILES src/sirikali.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo/ ) -+ - endif() - - if( NOT APPLE ) -diff --git a/src/sirikali.appdata.xml b/src/sirikali.appdata.xml -new file mode 100644 -index 0000000..172810c ---- /dev/null -+++ b/src/sirikali.appdata.xml -@@ -0,0 +1,39 @@ -+ -+ -+ -+sirikali.desktop -+CC0-1.0 -+SiriKali -+Manage user encrypted directories -+ -+

Sirikali provides a Qt/C++ GUI front end to cryfs,gocryptfs,securefs and encfs, -+allowing the user to create, mount, and unmount encrypted volumes.

-+

It works well together with cloud services like Dropbox, iCloud, OneDrive and others.

-+ -+https://mhogomchungu.github.io/sirikali/ -+https://github.com/mhogomchungu/sirikali/issues -+ -+ sirikali -+ -+GPL-2.0 -+Francis Banyikwa -+mhogomchungu_AT_gmail.com -+sirikali -+ -+ -+ https://raw.githubusercontent.com/mhogomchungu/sirikali/master/images/Screenshot_20160810_215609.png -+ Manage encrypted directories -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/sirikali.spec b/sirikali.spec index 3da8d33..c43cba5 100644 --- a/sirikali.spec +++ b/sirikali.spec @@ -20,17 +20,14 @@ %global srcurl https://github.com/mhogomchungu/%{name} Name: sirikali -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.3.3 +Release: 1%{?dist} Summary: GUI front end to encfs,cryfs,gocryptfs and securefs -License: GPLv2+ +# generally GPLv2+, BSD for tasks and NetworkAccessManager folders +License: GPLv2+ and BSD URL: http://mhogomchungu.github.io/%{name} Source0: %{srcurl}/releases/download/%{version}/%{srcname}-%{version}.tar.xz -# src/siritask.h:24:10: fatal error: task.h: No such file or directory -Patch0: %{srcurl}/commit/6dad4d1feb4f4f2f98ab4c02114cafd560cb61c0.patch -# add appdata -Patch1: %{srcurl}/commit/ef54268108f0f04e5e1c8aaffd2bf4bdcca4d087.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -56,6 +53,9 @@ Recommends: fuse-encfs %prep %autosetup -p1 -n%{srcname}-%{version} +# collect licenses +cp -p src/3rdParty/tasks/LICENSE LICENSE-tasks +cp -p src/3rdParty/NetworkAccessManager/LICENSE LICENSE-NetworkAccessManager # unbundle pushd src/3rdParty rm -rv json* lxqt_wallet @@ -80,7 +80,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %files -f %{name}.lang -%license LICENSE COPYRIGHT GPLv* +%license COPYRIGHT LICENSE* GPLv* %doc README.md ABOUT* changelog %{_bindir}/%{name}* %{_datadir}/applications/%{name}.desktop @@ -95,6 +95,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Tue Feb 13 2018 Raphael Groner - 1.3.3-1 +- new version +- drop upstream patches, due to incl. +- add license breakdown for 3rdParty folders + * Wed Feb 07 2018 Raphael Groner - 1.3.2-2 - drop obsolete scriptlets - drop explicit file permission diff --git a/sources b/sources index c3778cb..d415626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SiriKali-1.3.2.tar.xz) = 6c7bb1fc724e1fc534688f5e03d77bc6923c5f914c9420048b572da1267dcba3e56a318493c1a5a8d0e0c49358fd30bc9181a40ccb8627ba0bba90b0445d6323 +SHA512 (SiriKali-1.3.3.tar.xz) = 90350f33783c9152159511436172e235ac1ca12d2773a5ec50b5323c7a3f34fc8f2377397cf7da0cc09fdf20c9c4a5ef6dd8beca48934967879ee517360c8086