up to 3.12.6

diff --git a/0001-fix-cmake-flags.patch b/0001-fix-cmake-flags.patch
deleted file mode 100644 (file)
index cef3d54..0000000
--- a/0001-fix-cmake-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qdigidoc/breakpad/CMakeLists.txt
-===================================================================
---- qdigidoc/breakpad/CMakeLists.txt   (revision 112)
-+++ qdigidoc/breakpad/CMakeLists.txt   (working copy)
-@@ -34,7 +34,9 @@
-       add_definitions( -D_FILE_OFFSET_BITS=64 )
-       set( COMMON_FLAGS "-fno-exceptions -Wno-unused-parameter -Wno-missing-field-initializers" )
-       set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}" )
--      set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -fno-rtti -fno-threadsafe-statics" )
-+        # See https://code.google.com/p/google-breakpad/issues/detail?id=481#c5
-+        set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -fno-rtti -fno-threadsafe-statics -std=gnu++0x" )
-+              
- if( APPLE )
-       set( SOURCES ${SOURCES}
-               ${BREAKPAD_PATH}/client/mac/handler/exception_handler.cc

diff --git a/desktop.patch b/desktop.patch
index 806c7a632bb880cba37dff96e18948f9f2cf2862..efa1b8172621a0ee1431d452803a355181e96fbe 100644 (file)
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,12 +1,12 @@
---- qdigidoc-3.9.1.1369/client/qdigidoc-client.desktop~        2014-09-19 13:22:52.000000000 +0300
-+++ qdigidoc-3.9.1.1369/client/qdigidoc-client.desktop 2015-02-22 19:28:34.207509077 +0200
+--- 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 @@
  Name[et]=DigiDoc klient
  Name[ru]=DigiDoc клиент
  
 -Categories=Qt;Office;
 +Categories=Qt;Office;Security;Utility;
- MimeType=application/vnd.bdoc-1.0;application/vnd.etsi.asic-e+zip;application/x-ddoc;application/x-p12d;
+ MimeType=application/vnd.etsi.asic-e+zip;application/x-ddoc;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 85adc917835f7e472cf39f11b8f5656556a5a790..1595d58d528eca8f951d32714b85d2791c0c250b 100644 (file)
--- a/qdigidoc.spec
+++ b/qdigidoc.spec
@@ -1,15 +1,14 @@
 %define                qtver   4.4.0
 Summary:       Estonian digital signature application
 Name:          qdigidoc
-Version:       3.9.1.1369
-Release:       0.1
+Version:       3.12.6
+Release:       1
 License:       LGPL v2+
 Group:         X11/Applications
-Source0:       https://installer.id.ee/media/sources/%{name}-%{version}.tar.gz
-# Source0-md5: e965c146aa787f94b876dffce4f29190
+Source0:       https://github.com/open-eid/qdigidoc/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: b0a989d846f76901bc2951e17622fe12
 Patch0:                desktop.patch
-Patch1:                0001-fix-cmake-flags.patch
-URL:           http://www.ria.ee/
+URL:           https://github.com/open-eid/
 BuildRequires: QtWebKit-devel >= %{qtver}
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -55,14 +54,13 @@ This package contains the qdigidoc extension for Konqueror.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
 cd build
 %cmake \
 %ifarch %{arm} %{ix86} %{x8664}
-       -DBREAKPAD=ON \
+       -DBREAKPAD=OFF \
 %endif
        ..
 %{__make}
@@ -92,12 +90,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README
+%doc AUTHORS README.md CONTRIBUTING.md
 %attr(755,root,root) %{_bindir}/*
+%{_mandir}/man1/qdig*
 %{_desktopdir}/*.desktop
-%{_datadir}/mime/packages/*.xml
 %{_iconsdir}/hicolor/*/*/*.png
-%{_mandir}/man1/qdig*
+%{_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)