From 19f5f47f3e126067bbf29ccb7ee4561d57c62193 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Apr 13 2017 13:04:38 +0000
Subject: Update to latest upstream release, 2.0.5.

Fix icon install location, fixes BZ#1440477.

---

diff --git a/.gitignore b/.gitignore
index 57cca31..4611ce2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /cqrlog-2.0.1.tar.gz
 /cqrlog-2.0.2.tar.gz
 /cqrlog-2.0.4.tar.gz
+/cqrlog-2.0.5.tar.gz
diff --git a/cqrlog.spec b/cqrlog.spec
index e849f32..14b879d 100644
--- a/cqrlog.spec
+++ b/cqrlog.spec
@@ -1,5 +1,5 @@
 Name:		cqrlog
-Version:	2.0.4
+Version:	2.0.5
 Release:	1%{?dist}
 Summary:	An amateur radio contact logging program
 
@@ -7,7 +7,7 @@ License:	GPLv2
 URL:		http://www.cqrlog.com/
 Source0:	https://github.com/ok2cqr/cqrlog/archive/v%{version}/%{name}-%{version}.tar.gz
 
-Patch0:         cqrlog-2.0.4-install.patch
+Patch0:         cqrlog-2.0.5-install.patch
 Patch1:         cqrlog-1.9.1-desktop.patch
 Patch2:         cqrlog-1.9.1-build.patch
 
@@ -59,11 +59,12 @@ make %{?_smp_mflags}
 
 desktop-file-validate %{buildroot}%{_datadir}/applications/cqrlog.desktop
 
-# As of 2.0.4 cqrlog puts icons in both /usr/share/icons and /usr/share/pixmaps
-# incorrectly fix it here.
-mv %{buildroot}%{_datadir}/icons/cqrlog \
-   %{buildroot}%{_datadir}/icons/hicolor
-rm -rf %{buildroot}%{_datadir}/pixmaps
+# Fix icon location
+for size in 32 48 64 128 256; do
+    mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/
+    mv images/icon/${size}x${size}/%{name}.png \
+    %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/
+done
 
 for file in $(find %{buildroot}%{_datadir}/%{name} -name "*.txt"); do
     sed -i 's/\r//' $file
@@ -93,11 +94,15 @@ fi
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/cqrlog.1.gz
 
 
 %changelog
+* Mon Mar 13 2017 Richard Shaw <hobbes1069@gmail.com> - 2.0.5-1
+- Update to latest upstream release, 2.0.5.
+- Fix icon install location, fixes BZ#1440477.
+
 * Tue Jan 17 2017 Richard Shaw <hobbes1069@gmail.com> - 2.0.4-1
 - Update to latest upstream release.
 
diff --git a/sources b/sources
index d22338e..4c862d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cqrlog-2.0.4.tar.gz) = 439236aec08c8088e7f039a8999c7ef45fdf35ca21251168943d8f113140a1ee985c1e1c5fec1877e43007d6c81ed20350075ffe4433ee18b210668e8a13b671
+SHA512 (cqrlog-2.0.5.tar.gz) = daa63936f172e75ee01554bde7d5f9dde478ac18c7a81bedd6bad860275cd3e5e93b56de6183b80a991de56877e7f6d29d9aea5aa17fc2151939ebc0699aa329