- rel 1; builds

diff --git a/build.patch b/build.patch
new file mode 100644 (file)
index 0000000..d2a05c0
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,65 @@
+diff -ur qdigidoc-3.13.6/crypto.org/MainWindow.cpp qdigidoc-3.13.6/crypto/MainWindow.cpp
+--- qdigidoc-3.13.6/crypto.org/MainWindow.cpp  2018-04-06 13:46:51.000000000 +0200
++++ qdigidoc-3.13.6/crypto/MainWindow.cpp      2018-09-28 06:38:13.427880748 +0200
+@@ -37,6 +37,8 @@
+ #include <QtNetwork/QSslKey>
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QProgressBar>
++#include <QtWidgets/QButtonGroup>
++#include <QtWidgets/QActionGroup>
+ #include <QtWidgets/QProgressDialog>
+ 
+ #if QT_VERSION < 0x050700
+Only in qdigidoc-3.13.6/crypto: MainWindow.cpp~
+diff -ur qdigidoc-3.13.6/crypto.org/MainWindow.h qdigidoc-3.13.6/crypto/MainWindow.h
+--- qdigidoc-3.13.6/crypto.org/MainWindow.h    2018-04-06 13:46:51.000000000 +0200
++++ qdigidoc-3.13.6/crypto/MainWindow.h        2018-09-28 06:45:43.480974477 +0200
+@@ -23,6 +23,8 @@
+ 
+ class CKey;
+ class CryptoDoc;
++class QActionGroup;
++class QButtonGroup;
+ 
+ namespace Crypto {
+ 
+Only in qdigidoc-3.13.6/crypto: MainWindow.h~
+diff -ur qdigidoc-3.13.6/client.org/Application.cpp qdigidoc-3.13.6/client/Application.cpp
+--- qdigidoc-3.13.6/client.org/Application.cpp 2018-04-06 13:46:51.000000000 +0200
++++ qdigidoc-3.13.6/client/Application.cpp     2018-09-28 06:47:13.603600046 +0200
+@@ -57,6 +57,8 @@
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QProgressBar>
+ #include <QtWidgets/QProgressDialog>
++#include <QtWidgets/QButtonGroup>
++#include <QtWidgets/QActionGroup>
+ 
+ #if defined(Q_OS_MAC)
+ #include <common/MacMenuBar.h>
+Only in qdigidoc-3.13.6/client: Application.cpp~
+diff -ur qdigidoc-3.13.6/client.org/MainWindow.cpp qdigidoc-3.13.6/client/MainWindow.cpp
+--- qdigidoc-3.13.6/client.org/MainWindow.cpp  2018-04-06 13:46:51.000000000 +0200
++++ qdigidoc-3.13.6/client/MainWindow.cpp      2018-09-28 06:49:05.776881320 +0200
+@@ -46,6 +46,8 @@
+ #include <QtPrintSupport/QPrintPreviewDialog>
+ #include <QtWidgets/QCompleter>
+ #include <QtWidgets/QMessageBox>
++#include <QtWidgets/QButtonGroup>
++#include <QtWidgets/QActionGroup>
+ 
+ const int MainWindow::SIGNATURE_COL_HDR_WIDTH = 274;
+ 
+Only in qdigidoc-3.13.6/client: MainWindow.cpp~
+diff -ur qdigidoc-3.13.6/client.org/MainWindow.h qdigidoc-3.13.6/client/MainWindow.h
+--- qdigidoc-3.13.6/client.org/MainWindow.h    2018-04-06 13:46:51.000000000 +0200
++++ qdigidoc-3.13.6/client/MainWindow.h        2018-09-28 06:48:07.425174425 +0200
+@@ -25,6 +25,8 @@
+ 
+ class DigiDoc;
+ class QPrinter;
++class QActionGroup;
++class QButtonGroup;
+ 
+ class MainWindow: public QWidget, private Ui::MainWindow
+ {
+Only in qdigidoc-3.13.6/client: MainWindow.h~

diff --git a/desktop.patch b/desktop.patch
index efa1b8172621a0ee1431d452803a355181e96fbe..9fea6c4f13382d1561c9f3c08756a35649c842e0 100644 (file)
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,12 +1,12 @@
 --- qdigidoc-3.12.6/client/qdigidoc-client.desktop~    2017-02-14 18:27:20.000000000 +0200
 +++ qdigidoc-3.12.6/client/qdigidoc-client.desktop     2017-09-18 23:34:58.220714103 +0300
-@@ -9,5 +9,5 @@
+@@ -9,5 +9,5 @@ Name=DigiDoc Client
  Name[et]=DigiDoc klient
  Name[ru]=DigiDoc клиент
  
 -Categories=Qt;Office;
 +Categories=Qt;Office;Security;Utility;
- MimeType=application/vnd.etsi.asic-e+zip;application/x-ddoc;application/x-p12d;
+ MimeType=application/vnd.etsi.asic-e+zip;application/vnd.etsi.asic-s+zip;application/x-ddoc;application/vnd.lt.archyvai.adoc-2008;application/x-p12d;
 --- qdigidoc-0.4.0/crypto/qdigidoc-crypto.desktop~     2009-11-03 13:29:39.000000000 +0200
 +++ qdigidoc-0.4.0/crypto/qdigidoc-crypto.desktop      2011-01-06 00:09:25.949079741 +0200
 @@ -9,5 +9,5 @@

diff --git a/qdigidoc.spec b/qdigidoc.spec
index 3ac03974b679cbd80a502599d6335af687dd58a0..73fd0eca44512db77c75a80ecb7e12d46ea49919 100644 (file)
--- a/qdigidoc.spec
+++ b/qdigidoc.spec
@@ -2,7 +2,7 @@
 Summary:       Estonian digital signature application
 Name:          qdigidoc
 Version:       3.13.6
-Release:       0.1
+Release:       1
 License:       LGPL v2+
 Group:         X11/Applications
 Source0:       https://github.com/open-eid/qdigidoc/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@ Source7:      EE.xml
 # Source7-md5: e15d2f875b47365970ced4697843e7c1
 Patch0:                desktop.patch
 Patch1:                sandbox-compilation.patch
+Patch2:                build.patch
 URL:           https://github.com/open-eid/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5Gui-devel >= %{qtver}
@@ -83,6 +84,7 @@ cp %{SOURCE7} build/client
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cd build
@@ -124,8 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/*.desktop
 %{_iconsdir}/hicolor/*/*/*.png
 %{_datadir}/mime/packages/*.xml
-%{_datadir}/appdata/qdigidoc-client.appdata.xml
-%{_datadir}/appdata/qdigidoc-cypto.appdata.xml
 
 %files -n nautilus-%{name} -f nautilus-qdigidoc.lang
 %defattr(644,root,root,755)

diff --git a/sandbox-compilation.patch b/sandbox-compilation.patch
index 968ab502b65c54ecb544cc8bbf3937bdf60dcd12..f3ae9a87ca820e8ebb60851cc39783e13649f2f0 100644 (file)
--- a/sandbox-compilation.patch
+++ b/sandbox-compilation.patch
@@ -1,33 +1,23 @@
-diff -Naur qdigidoc-3.12.2_orig/client/CMakeLists.txt qdigidoc-3.12.2_patched/client/CMakeLists.txt
---- qdigidoc-3.12.2_orig/client/CMakeLists.txt 2016-07-10 10:42:40.000000000 +0300
-+++ qdigidoc-3.12.2_patched/client/CMakeLists.txt      2016-07-10 13:00:07.208755715 +0300
+--- qdigidoc-3.13.6/client/CMakeLists.txt~     2018-04-06 13:46:51.000000000 +0200
++++ qdigidoc-3.13.6/client/CMakeLists.txt      2018-09-28 07:17:41.967953862 +0200
 @@ -1,14 +1,5 @@
  set_app_name( PROGNAME qdigidocclient )
  
 -add_executable( TSLDownload TSLDownload.cpp )
 -target_link_libraries( TSLDownload Qt5::Network )
 -add_custom_command(
--      OUTPUT TSL.qrc tl-mp.xml EE.xml
+-      OUTPUT TSL.qrc
 -      DEPENDS TSLDownload
--      COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" EE
+-      COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" ${TSL_URL} ${TSL_INCLUDE}
 -      WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin
 -)
 -
  add_definitions( -DPKCS11_MODULE="${PKCS11_MODULE}" )
  include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${OPENSSL_INCLUDE_DIR} )
  
-@@ -58,6 +49,7 @@
-       Qt5::PrintSupport
-       ${LIBDIGIDOCPP_LIBRARY}
-       ${ADDITIONAL_LIBRARIES}
-+      pthread
- )
- 
- if( APPLE )
-diff -Naur qdigidoc-3.12.2_orig/common/CMakeLists.txt qdigidoc-3.12.2_patched/common/CMakeLists.txt
---- qdigidoc-3.12.2_orig/common/CMakeLists.txt 2016-07-10 10:42:42.000000000 +0300
-+++ qdigidoc-3.12.2_patched/common/CMakeLists.txt      2016-07-10 13:02:48.969572573 +0300
-@@ -19,13 +19,8 @@
+--- qdigidoc-3.13.6/common/CMakeLists.txt~     2018-04-06 13:46:52.000000000 +0200
++++ qdigidoc-3.13.6/common/CMakeLists.txt      2018-09-28 07:18:09.855454319 +0200
+@@ -16,13 +16,8 @@ if( CONFIG_URL )
        endif()
        add_definitions( -DCONFIG_URL="${CONFIG_URL}" )
        list( APPEND SOURCES Configuration.cpp )