[qdigidoc] Add appdata support

mihkel mihkel at fedoraproject.org
Sat Jul 5 18:50:24 UTC 2014


commit e8a959446316e3b2674f6b29d53f950bed150149
Author: Mihkel Vain <mihkel at fedoraproject.org>
Date:   Sat Jul 5 21:50:35 2014 +0300

    Add appdata support

 .gitignore    |    1 +
 qdigidoc.spec |   27 +++++++++++++++++++--------
 sources       |    2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f58c60..3b02439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /qdigidoc-0.4.0.tar.bz2
 /qdigidoc-0.4.1.tar.bz2
 /qdigidoc-3.8.1.1250.tar.gz
+/qdigidoc-client.appdata.xml
diff --git a/qdigidoc.spec b/qdigidoc.spec
index 8cf7bb1..0d5cdf4 100644
--- a/qdigidoc.spec
+++ b/qdigidoc.spec
@@ -1,10 +1,11 @@
 Name:           qdigidoc
-Version:        3.8.1.1250
-Release:        4%{?dist}
+Version:        3.9.0.1297
+Release:        2%{?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
@@ -19,6 +20,7 @@ BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  qt5-qttools-devel
 BuildRequires:  pcsc-lite-devel >= 1.7
+BuildRequires:  appdata-tools
 Requires:       hicolor-icon-theme
 # Dynamically loaded library
 Requires:       opensc%{?_isa}
@@ -32,19 +34,22 @@ Estonia where they are used for storing legally binding digital signatures.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
-%patch1 -p3
+%patch1 -p0
 %patch2 -p3
 
-# This is here as long as upstream fixes minidump.cc permissions
-chmod -x %{_builddir}/%{name}-%{version}/breakpad/google-breakpad/src/processor/minidump.cc
 
 %build
 %{cmake} .
 
 make %{?_smp_mflags}
 
+mv %{_builddir}/%{name}/client/{RELEASE-NOTES.txt,client-RELEASE-NOTES.txt}
+mv %{_builddir}/%{name}/crypto/{RELEASE-NOTES.txt,crypto-RELEASE-NOTES.txt}
+
+sed -i 's/\r$//' %{_builddir}/%{name}/client/client-RELEASE-NOTES.txt
+sed -i 's/\r$//' %{_builddir}/%{name}/crypto/crypto-RELEASE-NOTES.txt
 
 %install
 make install DESTDIR=%{buildroot} 
@@ -52,6 +57,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
 
 %post
 update-desktop-database &> /dev/null || :
@@ -71,17 +79,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%doc COPING README
+%doc COPING README 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*
 
 
-
 %changelog
+* Sat Jul  5 2014 Mihkel Vain <mihkel at fedoraproject.org> - 3.9.0.1297-2
+- Add appdata support
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.1.1250-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 957dfe2..d91ba5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-581c4d6c79ec447c5ed2fa6793390cbc  qdigidoc-3.8.1.1250.tar.gz
+f0d4026274f11878b0cf6fd5963d5101  qdigidoc-client.appdata.xml


More information about the scm-commits mailing list