commit 9f1c45608aee40633c73144c87108a3fe44b69b3
Author: Elan Ruusamäe <[email protected]>
Date: Mon Feb 23 01:05:56 2015 +0200
up to 3.9.1.1369
desktop.patch | 10 +++++-----
qdigidoc.spec | 22 ++++++++++++++--------
2 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/qdigidoc.spec b/qdigidoc.spec
index c00f2c9..85adc91 100644
--- a/qdigidoc.spec
+++ b/qdigidoc.spec
@@ -1,20 +1,20 @@
%define qtver 4.4.0
Summary: Estonian digital signature application
Name: qdigidoc
-Version: 0.4.1
-Release: 2
+Version: 3.9.1.1369
+Release: 0.1
License: LGPL v2+
Group: X11/Applications
-URL: http://code.google.com/p/esteid/
-Source0: http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: a4bb53bcd00a4b1914c028e3bd2b3872
+Source0: https://installer.id.ee/media/sources/%{name}-%{version}.tar.gz
+# Source0-md5: e965c146aa787f94b876dffce4f29190
Patch0: desktop.patch
+Patch1: 0001-fix-cmake-flags.patch
+URL: http://www.ria.ee/
BuildRequires: QtWebKit-devel >= %{qtver}
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: libdigidoc-devel
-BuildRequires: libdigidocpp-devel
+BuildRequires: libdigidocpp-devel >= 3.9
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: qt4-build >= %{qtver}
@@ -23,6 +23,7 @@ BuildRequires: rpmbuild(macros) >= 1.596
Requires(post,postun): gtk-update-icon-cache
Requires: desktop-file-utils
Requires: hicolor-icon-theme
+Requires: libdigidocpp >= 3.9
Requires: shared-mime-info
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,11 +55,16 @@ This package contains the qdigidoc extension for Konqueror.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
install -d build
cd build
-%cmake ..
+%cmake \
+%ifarch %{arm} %{ix86} %{x8664}
+ -DBREAKPAD=ON \
+%endif
+ ..
%{__make}
%install
diff --git a/desktop.patch b/desktop.patch
index 1373da8..806c7a6 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,12 +1,12 @@
---- qdigidoc-0.4.0/client/qdigidoc-client.desktop~ 2009-11-03
13:29:39.000000000 +0200
-+++ qdigidoc-0.4.0/client/qdigidoc-client.desktop 2011-01-06
00:09:02.240053414 +0200
+--- 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
@@ -9,5 +9,5 @@
- Name[et]=DigiDoc3 klient
- Name[ru]=DigiDoc3 клиент
+ Name[et]=DigiDoc klient
+ Name[ru]=DigiDoc клиент
-Categories=Qt;Office;
+Categories=Qt;Office;Security;Utility;
- MimeType=application/x-bdoc;application/x-ddoc;application/x-p12d;
+
MimeType=application/vnd.bdoc-1.0;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 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qdigidoc.git/commitdiff/9f1c45608aee40633c73144c87108a3fe44b69b3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
