From ab181812d9f2951ce42d39be6c2c20b830b6f1dc Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc@gmail.com>
Date: Sun, 22 Oct 2017 09:38:42 -0400
Subject: [PATCH] Update to 2.2.2 Fix desktop file names Added BR on
 libappstream-glib Install appdata file

---
 .gitignore     |  1 +
 keepassxc.spec | 21 ++++++++++++++++++---
 sources        |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ae12c17..ff11dba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /keepassxc-2.1.4-src.tar.xz
 /keepassxc-2.2.0-src.tar.xz
 /keepassxc-2.2.1-src.tar.xz
+/keepassxc-2.2.2-src.tar.xz
diff --git a/keepassxc.spec b/keepassxc.spec
index d52539d..fa06169 100644
--- a/keepassxc.spec
+++ b/keepassxc.spec
@@ -1,5 +1,5 @@
 Name:           keepassxc
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 Summary:        Cross-platform password manager
 License:        Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain
@@ -18,6 +18,7 @@ BuildRequires:  libyubikey-devel
 BuildRequires:  qt5-qtx11extras-devel
 BuildRequires:  ykpers-devel
 BuildRequires:  zlib-devel
+BuildRequires:  libappstream-glib
 
 %description
 KeePassXC is a community fork of KeePassX
@@ -41,6 +42,10 @@ information can be considered as quite safe.
 %prep
 %setup -n %{name}-%{version}
 
+# get rid of icon tag in appdata file
+# icon tag is not allowed in desktop appdata file
+sed -i '/\<icon/d' share/linux/org.%{name}.appdata.xml
+
 %build
 mkdir build
 cd build
@@ -64,7 +69,7 @@ desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original \
     --add-mime-type application/x-keepassxc \
-    %{buildroot}%{_datadir}/applications/%{name}.desktop
+    %{buildroot}%{_datadir}/applications/org.%{name}.desktop
  
 # Associate KDB* files
 cat > x-keepassxc.desktop << EOF
@@ -79,6 +84,9 @@ EOF
 install -D -m 644 -p x-keepassxc.desktop \
     %{buildroot}%{_datadir}/mimelnk/application/x-keepassxc.desktop
 
+#install appdata files
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{name}.appdata.xml
+
 %find_lang keepassx --with-qt
 
 %check
@@ -105,13 +113,20 @@ desktop-file-validate %{_datadir}/applications/keepassxc.desktop &> /dev/null ||
 %{_bindir}/keepassxc
 %{_bindir}/keepassxc-cli
 %{_datadir}/keepassxc
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/org.%{name}.desktop
+%{_datadir}/metainfo/org.%{name}.appdata.xml
 %{_datadir}/mimelnk
 %{_datadir}/mime/packages/*.xml
 %{_datadir}/icons/hicolor/*/*/*keepassxc*
 %{_libdir}/%{name}
 
 %changelog
+* Sun Oct 22 2017 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.2.2-1
+- Update to 2.2.2
+- Fix desktop file names
+- Added BR on libappstream-glib
+- Install appdata file
+
 * Mon Oct 02 2017 Germano Massullo <germano.massullo@gmail.com> - 2.2.1-1
 - 2.2.1 release
 
diff --git a/sources b/sources
index 44883ac..7e233cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepassxc-2.2.1-src.tar.xz) = 7aadb1fba476dadda74515fcd2da425a244824655b4da3e8a17ac0904855667105e9951d4b1cdf3edde4230a32ebd5fa55bf1eb83ed95e1d4983aca03a99c0c4
+SHA512 (keepassxc-2.2.2-src.tar.xz) = 27fc1416de550b4ac7ddec0f61d765cdf8a5d6c695edd9c4db222959672daebc2d8882abcd816bf3b569c95e1aa2728c152d7d5ca9457654cf66594856f3e1f9