From 581ef6a6d4bc5b8cd70a25419c64f00dc4ce487a Mon Sep 17 00:00:00 2001
From: Adam Miller <maxamillion@fedoraproject.org>
Date: Aug 19 2016 19:40:06 +0000
Subject: update to latest upstream, resolve 1 year 4 month old BZ#1017450


---

diff --git a/.gitignore b/.gitignore
index 8eb770c..f838b72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /bamf-0.5.0.tar.gz
+/bamf-0.5.1.tar.gz
diff --git a/bamf-0.5.0-fix_retval.patch b/bamf-0.5.0-fix_retval.patch
deleted file mode 100644
index 89b779c..0000000
--- a/bamf-0.5.0-fix_retval.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'src/bamf-application.c'
---- src/bamf-application.c	2013-08-08 12:48:26 +0000
-+++ src/bamf-application.c	2014-02-14 06:44:55 +0000
-@@ -470,7 +470,7 @@
-                                GFile **out_desktop_file, GFile **out_icon_file,
-                                GCancellable *cancellable)
- {
--  g_return_val_if_fail (out_desktop_file, NULL);
-+  g_return_val_if_fail (out_desktop_file, FALSE);
- 
-   if (!apps_dir)
-     {
-
diff --git a/bamf-0.5.0-fix_retval_2.patch b/bamf-0.5.0-fix_retval_2.patch
deleted file mode 100644
index 37cfcf5..0000000
--- a/bamf-0.5.0-fix_retval_2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'src/bamf-legacy-window-test.c'
---- src/bamf-legacy-window-test.c	2013-08-08 12:32:39 +0000
-+++ src/bamf-legacy-window-test.c	2014-01-07 19:15:14 +0000
-@@ -427,7 +427,7 @@
-   g_return_if_fail (BAMF_IS_LEGACY_WINDOW_TEST (window));
-   BamfLegacyWindowTest *self = BAMF_LEGACY_WINDOW_TEST (window);
- 
--  return g_hash_table_insert (self->hints, g_strdup (name), g_strdup (value));
-+  g_hash_table_insert (self->hints, g_strdup (name), g_strdup (value));
- }
- 
- static char *
-
diff --git a/bamf.spec b/bamf.spec
index 625ad4e..b5ae9ed 100644
--- a/bamf.spec
+++ b/bamf.spec
@@ -1,7 +1,7 @@
 Summary:        Application matching framework
 Name:           bamf
-Version:        0.5.0
-Release:        7%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 # Library bits are LGPLv2 or LGPLv3 (but not open-ended LGPLv2+);
 # non-lib bits are GPLv3.
 # pbrobinson points out that three files in the lib are actually
@@ -13,10 +13,6 @@ License:        GPLv2 or GPLv3
 Group:          System Environment/Libraries
 URL:            https://launchpad.net/bamf
 Source0:        http://launchpad.net/bamf/0.5/%{version}/+download/%{name}-%{version}.tar.gz
-# https://bugs.launchpad.net/bamf/+bug/1280110
-Patch0:         bamf-0.5.0-fix_retval.patch
-# revision 589.1.1, merged in revision 590
-Patch1:		bamf-0.5.0-fix_retval_2.patch
 
 BuildRequires:  vala-tools
 BuildRequires:  gtk-doc
@@ -71,9 +67,6 @@ package contains the bamf daemon and supporting data.
 
 %prep
 %setup -q
-%patch0 -p0 -b .fix_retval
-%patch1 -p0 -b .fix_retval_2
-
 
 %build
 %configure --disable-static --disable-webapps --enable-gtk-doc
@@ -111,6 +104,10 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Aug 19 2016 Adam Miller <maxamillion@fedoraproject.org> - 0.5.1-1
+- Update to latest upstream (BZ#1017540)
+- Remove patches that were merged upstream
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 13036b2..6bbf2ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d039bcbfc7da874fefa09703e3cf4e6  bamf-0.5.0.tar.gz
+1a5b82819273adcc3e6ad6556c7dc90a  bamf-0.5.1.tar.gz