From 0bdcdfb73e7e11eafca046cff6a98d004d6ae9ed Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc@gmail.com>
Date: Sat, 16 Dec 2017 07:18:19 -0500
Subject: [PATCH] Adjust for changes in appdata and desktop filename change

---
 keepassxc.spec | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/keepassxc.spec b/keepassxc.spec
index ac89be6..1b14443 100644
--- a/keepassxc.spec
+++ b/keepassxc.spec
@@ -1,6 +1,6 @@
 Name:           keepassxc
 Version:        2.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform password manager
 License:        Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain
 URL:            http://www.keepassxc.org/
@@ -44,7 +44,8 @@ information can be considered as quite safe.
 
 # 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
+sed -i '/\<icon/d' share/linux/org.%{name}.KeePassXC.appdata.xml
+
 
 %build
 mkdir build
@@ -69,7 +70,7 @@ desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications \
     --delete-original \
     --add-mime-type application/x-keepassxc \
-    %{buildroot}%{_datadir}/applications/org.%{name}.desktop
+    %{buildroot}%{_datadir}/applications/org.%{name}.KeePassXC.desktop
  
 # Associate KDB* files
 cat > x-keepassxc.desktop << EOF
@@ -85,7 +86,7 @@ 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
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml
 
 %find_lang keepassx --with-qt
 
@@ -96,7 +97,7 @@ ctest -V %{?_smp_mflags}
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database &> /dev/null ||:
  
-%postun
+Page missing%postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -113,14 +114,17 @@ desktop-file-validate %{_datadir}/applications/keepassxc.desktop &> /dev/null ||
 %{_bindir}/keepassxc
 %{_bindir}/keepassxc-cli
 %{_datadir}/keepassxc
-%{_datadir}/applications/org.%{name}.desktop
-%{_datadir}/metainfo/org.%{name}.appdata.xml
+%{_datadir}/applications/org.%{name}.KeePassXC.desktop
+%{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml
 %{_datadir}/mimelnk
 %{_datadir}/mime/packages/*.xml
 %{_datadir}/icons/hicolor/*/*/*keepassxc*
 %{_libdir}/%{name}
 
 %changelog
+* Sat Dec 16 2017 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.2.4-2
+- Adjust for changes in appdata and desktop filename change
+
 * Thu Dec 14 2017 Germano Massullo <germano.massullo@gmail.com> - 2.2.4-1
 - 2.2.4 release
 - removed patch to fix typo in a XML tag