pingou pushed to guake (f22). "Update to 0.6.0 with a new patch for the desktop files"

[notifications at fedoraproject.org]

>From c5d43f12ae2b31daa473e9c054910a213edd1491 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Sun, 19 Apr 2015 12:04:50 +0200
Subject: Update to 0.6.0 with a new patch for the desktop files


diff --git a/.gitignore b/.gitignore
index fcd4642..2044c27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ guake-0.4.2.tar.gz
 /guake-0.5.0.tar.gz
 /guake-guake-0.5.0.tar.gz
 /guake-0.5.2.tar.gz
+/guake-0.6.0.tar.gz
diff --git a/0001-Make-the-desktop-file-valid.patch b/0001-Make-the-desktop-file-valid.patch
new file mode 100644
index 0000000..a02d724
--- /dev/null
+++ b/0001-Make-the-desktop-file-valid.patch
@@ -0,0 +1,52 @@
+From 596da1850144379dae0e0ba2a28e9affaaeb8847 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves Chibon <pingou at pingoured.fr>
+Date: Sun, 19 Apr 2015 11:54:07 +0200
+Subject: [PATCH] Make the desktop file valid
+
+---
+ data/guake-prefs.desktop.in | 6 +++---
+ data/guake.desktop.in       | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/data/guake-prefs.desktop.in b/data/guake-prefs.desktop.in
+index d1fb90f..bb61bfc 100644
+--- a/data/guake-prefs.desktop.in
++++ b/data/guake-prefs.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Guake Preferences
+-_Comment=Configure your Guake sessions
++Name=Guake Preferences
++Comment=Configure your Guake sessions
+ TryExec=guake-prefs
+ Exec=guake-prefs
+ Icon=guake-prefs
+@@ -10,4 +10,4 @@ Type=Application
+ StartupNotify=true
+ Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
+ X-Desktop-File-Install-Version=0.15
+-_Keywords=Terminal;Utility;
++Keywords=Terminal;Utility;
+diff --git a/data/guake.desktop.in b/data/guake.desktop.in
+index b8404fd..67011aa 100644
+--- a/data/guake.desktop.in
++++ b/data/guake.desktop.in
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Guake Terminal
+-_Comment=Use the command line in a Quake-like terminal
++Name=Guake Terminal
++Comment=Use the command line in a Quake-like terminal
+ TryExec=guake
+ Exec=guake
+ Icon=guake
+ Type=Application
+ Categories=GNOME;GTK;System;Utility;TerminalEmulator;
+ StartupNotify=true
+-_Keywords=Terminal;Utility;
++Keywords=Terminal;Utility;
+-- 
+2.1.0
+
diff --git a/guake.spec b/guake.spec
index 0ebbafb..6a8004d 100644
--- a/guake.spec
+++ b/guake.spec
@@ -1,15 +1,15 @@
 Name:           guake
-Version:        0.5.2
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        Drop-down terminal for GNOME
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.guake.org/
-#Source0:        https://github.com/Guake/guake/archive/guake-%{version}.tar.gz
+#Source0:        https://github.com/Guake/guake/archive/%{version}.tar.gz
 Source0:        guake-%{version}.tar.gz
 Patch5:         0001-Remove-vte-check-in-the-configure.ac.patch
-Patch6:         fix_resize_mouse.patch
+Patch7:         0001-Make-the-desktop-file-valid.patch
 
 # Not used here -- official release --
 #Source0:        %{name}-%{version}.20090321git.tar.gz
@@ -45,10 +45,13 @@ and press again to hide.
 sed -i -e '/^#!\//, 1d' src/guake/notifier.py
 
 %patch5 -p1 -b .
-%patch6 -p1 -b .
+%patch7 -p1 -b .
 
 ./autogen.sh
 
+cat data/guake.desktop.in
+cat data/guake.desktop
+
 # Enables to pass the configure without problem concerning python vte library
 sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure
 sed -i -e "s|include <glib/gtypes.h>|include <glib.h>|" src/guake/globalhotkeys/keybinder.h
@@ -109,6 +112,9 @@ killall gconfd-2 > /dev/null || :
 %{_datadir}/icons/hicolor/*/apps/%{name}*.png
 
 %changelog
+* Sun Apr 19 2015 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.6.0-1
+- Update to upstream's 0.6.0
+
 * Tue Jan 20 2015 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.5.2-1
 - Update to upstream's 0.5.2
 - Backport patch from upstream to fix resizing the window with the mouse
diff --git a/sources b/sources
index 196dda4..cd003c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b026aa8811cb73fbb8abb3649c79bde3  guake-0.5.0.tar.gz
+86502b6a8e12d42d74e6da7eaa403877  guake-0.6.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/guake.git/commit/?h=f22&id=c5d43f12ae2b31daa473e9c054910a213edd1491