mihkel pushed to qdigidoc (master). "New upstream release (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Mar 28 18:52:45 UTC 2015
>From 2794e2d0523bab8d7881610a1fe3309134258a9e Mon Sep 17 00:00:00 2001
From: Mihkel Vain <mihkel at fedoraproject.org>
Date: Sat, 28 Mar 2015 20:52:36 +0200
Subject: New upstream release
- Project moved to github
- Drop unneeded patches
- Drop qdigidoccrypto man page - there is no such binary anymore
diff --git a/.gitignore b/.gitignore
index 879cf1e..630bea3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/qdigidoc-3.8.1.1250.tar.gz
/qdigidoc-3.9.0.1297.tar.gz
/qdigidoc-3.9.1.1369.tar.gz
+/qdigidoc-3.10.0.tar.gz
diff --git a/0001-fix-cmake-flags.patch b/0001-fix-cmake-flags.patch
deleted file mode 100644
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/0002-add-qdigidoccrypto-man-to-cmake-list.patch b/0002-add-qdigidoccrypto-man-to-cmake-list.patch
deleted file mode 100644
index 1ad9143..0000000
--- a/0002-add-qdigidoccrypto-man-to-cmake-list.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur crypto_orig/CMakeLists.txt crypto/CMakeLists.txt
---- crypto_orig/CMakeLists.txt 2014-07-03 22:24:26.620619451 +0300
-+++ crypto/CMakeLists.txt 2014-07-03 22:10:47.403850062 +0300
-@@ -60,6 +60,8 @@
- )
-
- if(UNIX AND NOT APPLE)
-+ configure_file( qdigidoccrypto.1.cmake qdigidoccrypto.1 )
-+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qdigidoccrypto.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
- install( FILES qdigidoc-crypto.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
- install( FILES qdigidoc-crypto.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages )
- foreach(RES 16 22 32 48 128)
diff --git a/0003-add-qdigidoccrypto-manpage.patch b/0003-add-qdigidoccrypto-manpage.patch
deleted file mode 100644
index acea9ae..0000000
--- a/0003-add-qdigidoccrypto-manpage.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e1286ee50309328f521148a1d011dd82f59e8c8b Mon Sep 17 00:00:00 2001
-From: Mihkel Vain <mihkel at fedoraproject.org>
-Date: Sun, 12 Jan 2014 17:56:11 +0200
-Subject: [PATCH] add qdigidoccrypto manpage
-
----
- idkaart/qdigidoc/crypto/qdigidoccrypto.1.cmake | 8 ++++++++
- 1 file changed, 8 insertions(+)
- create mode 100644 idkaart/qdigidoc/crypto/qdigidoccrypto.1.cmake
-
-diff --git a/idkaart/qdigidoc/crypto/qdigidoccrypto.1.cmake b/idkaart/qdigidoc/crypto/qdigidoccrypto.1.cmake
-new file mode 100644
-index 0000000..b63f6cc
---- /dev/null
-+++ b/idkaart/qdigidoc/crypto/qdigidoccrypto.1.cmake
-@@ -0,0 +1,8 @@
-+.\" Manpage for qdigidoccrypto
-+.TH qdigidoccrypto 1 "${BUILD_DATE}" "${VERSION}" "qdigidoccrypto man page"
-+.SH NAME
-+qdigidoccrypto \- Qt based UI application for encrypting and decrypting documents
-+.SH SYNOPSIS
-+qdigidoccrypto [FILES]
-+.SH SEE ALSO
-+cdigidoc(1), digidoc-tool(1), qdigidocclient(1), qesteidutil(1)
---
-1.8.4.2
-
diff --git a/qdigidoc-client.appdata.xml b/qdigidoc-client.appdata.xml
deleted file mode 100644
index 60909e8..0000000
--- a/qdigidoc-client.appdata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Mihkel Vain <mihkel at fedoraproject.org> -->
-<application>
- <id type="desktop">qdigidoc-client.desktop</id>
- <metadata_license>CC0</metadata_license>
- <project_license>LGPL-2.0+</project_license>
- <name>QDigiDoc</name>
- <summary>Estonian digital signature application</summary>
- <description>
- <p>
- ID-software allows you to use your ID-card electronically – use
- private and governmental e-services, digitally sign documents
- and encrypt documents for safe transfer. During ID-software
- installation 3 programs are installed into your computer:
- ID-card utility, DigiDoc3 client and DigiDoc3 crypto.
- </p>
- <p>
- DigiDoc3 Client is a programme that can be used to sign digitally with
- ID-card and Mobile-ID, check the validity of digital signatures and
- open and save documents inside the signature container. Digitally
- signed containers are files with .bdoc or .ddoc extensions.
- </p>
- <p>
- DigiDoc3 Crypto enables you to secure files for safe transfer using
- your ID-card and to view secured documents (decrypt). Securing or
- encrypting enables you to protect sensitive information from other
- people in the short term. The ID-card’s authentication certificate is
- used for encryption. A secure container file will be created upon
- encryption with the extension .cdoc.
- </p>
- </description>
- <screenshots>
- <screenshot type="default">http://mihkel.fedorapeople.org/esteid/qdigidocclient.png</screenshot>
- <screenshot>http://mihkel.fedorapeople.org/esteid/qdigidoccrypto.png</screenshot>
- </screenshots>
- <url type="homepage">http://www.id.ee/</url>
- <updatecontact>mihkel_at_fedoraproject.org</updatecontact>
-</application>
diff --git a/qdigidoc.spec b/qdigidoc.spec
index 586c596..04f659f 100644
--- a/qdigidoc.spec
+++ b/qdigidoc.spec
@@ -1,15 +1,10 @@
Name: qdigidoc
-Version: 3.9.1.1369
-Release: 2%{?dist}
+Version: 3.10.0
+Release: 1%{?dist}
Summary: Estonian digital signature application
License: LGPLv2+
-URL: http://www.ria.ee
-Source0: https://installer.id.ee/media/sources/%{name}-%{version}.tar.gz
-Source1: %{name}-client.appdata.xml
-Patch0: 0001-fix-cmake-flags.patch
-Patch1: 0002-add-qdigidoccrypto-man-to-cmake-list.patch
-Patch2: 0003-add-qdigidoccrypto-manpage.patch
-
+URL: https://github.com/open-eid/qdigidoc
+Source0: https://github.com/open-eid/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -20,7 +15,7 @@ BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: qt5-qttools-devel
BuildRequires: pcsc-lite-devel >= 1.7
-BuildRequires: appdata-tools
+BuildRequires: libappstream-glib
Requires: hicolor-icon-theme
# Dynamically loaded library
Requires: opensc%{?_isa}
@@ -33,12 +28,17 @@ BDoc, DDoc, and CDoc container formats. These file formats are widespread in
Estonia where they are used for storing legally binding digital signatures.
+%package nautilus
+Summary: Nautilus extension for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: nautilus-python
+
+%description nautilus
+The %{name}-nautilus package contains the %{name} extension for the
+nautilus file manager.
+
%prep
%setup -q
-%patch0 -p1
-%patch1 -p0
-%patch2 -p3
-
%build
%{cmake} . \
@@ -62,9 +62,9 @@ make install DESTDIR=%{buildroot}
desktop-file-validate %{buildroot}/%{_datadir}/applications/qdigidoc-client.desktop
desktop-file-validate %{buildroot}/%{_datadir}/applications/qdigidoc-crypto.desktop
-mkdir -p %{buildroot}%{_datadir}/appdata/
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
-appdata-validate --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
+%find_lang nautilus-qdigidoc
%post
update-desktop-database &> /dev/null || :
@@ -84,19 +84,25 @@ fi
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
%files
-%doc COPING README crypto/crypto-RELEASE-NOTES.txt client/client-RELEASE-NOTES.txt
+%doc AUTHORS COPING LICENSE.LGPL LICENSE.LGPL.rtf README.md CONTRIBUTING.md crypto/crypto-RELEASE-NOTES.txt client/client-RELEASE-NOTES.txt
%{_bindir}/*
%{_datadir}/applications/*.desktop
%{_datadir}/mime/packages/*.xml
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/appdata/*.appdata.xml
%{_mandir}/man1/qdigidocclient.1*
-%{_mandir}/man1/qdigidoccrypto.1*
+%files nautilus -f nautilus-qdigidoc.lang
+%{_datadir}/nautilus-python/extensions/*
%changelog
+* Sat Mar 28 2015 Mihkel Vain <mihkel at fedoraproject.org> - 3.10.0-1
+- New upstream release
+- Project moved to github
+- Drop unneeded patches
+- Drop qdigidoccrypto man page - there is no such binary anymore
+
* Tue Nov 18 2014 Dan Horák <dan[at]danny.cz> - 3.9.1.1369-2
- enable internal crash handler only on supported arches
diff --git a/sources b/sources
index 9b6c88c..6dd6832 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e965c146aa787f94b876dffce4f29190 qdigidoc-3.9.1.1369.tar.gz
+20b4f9969acb192382004172455e8332 qdigidoc-3.10.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qdigidoc.git/commit/?h=master&id=2794e2d0523bab8d7881610a1fe3309134258a9e
More information about the scm-commits
mailing list