[gshutdown] glib fixes.

[Jon Ciesla]

commit fc3f2e845a547e8b4279f22d733520d84154d9dc
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Aug 1 11:16:19 2012 -0500

    glib fixes.

 gshutdown-0.2-glib.patch |  102 ++++++++++++++++++++++++++++++++++++++++++++++
 gshutdown.spec           |    8 +++-
 2 files changed, 108 insertions(+), 2 deletions(-)
---
diff --git a/gshutdown-0.2-glib.patch b/gshutdown-0.2-glib.patch
new file mode 100644
index 0000000..2064684
--- /dev/null
+++ b/gshutdown-0.2-glib.patch
@@ -0,0 +1,102 @@
+diff -Naur gshutdown-0.2.orig/src/detectwm.h gshutdown-0.2/src/detectwm.h
+--- gshutdown-0.2.orig/src/detectwm.h	2007-04-14 18:33:39.000000000 -0400
++++ gshutdown-0.2/src/detectwm.h	2012-07-26 17:31:10.897204758 -0400
+@@ -21,7 +21,7 @@
+ #ifndef __GSHUTDOWN_WMDETECT__
+ #define __GSHUTDOWN_WMDETECT__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ gchar *detect_window_manager();
+ 
+diff -Naur gshutdown-0.2.orig/src/main.c gshutdown-0.2/src/main.c
+--- gshutdown-0.2.orig/src/main.c	2007-06-24 09:03:38.000000000 -0400
++++ gshutdown-0.2/src/main.c	2012-07-26 17:31:28.721313304 -0400
+@@ -21,7 +21,7 @@
+ #include <stdlib.h>
+ #include <signal.h>
+ #include <sys/wait.h>
+-#include <glib/gutils.h> /* g_atexit() */
++#include <glib.h> /* g_atexit() */
+ #include "main.h"
+ #include "gui.h"
+ #include "misc.h"
+diff -Naur gshutdown-0.2.orig/src/misc.c gshutdown-0.2/src/misc.c
+--- gshutdown-0.2.orig/src/misc.c	2007-04-14 18:33:39.000000000 -0400
++++ gshutdown-0.2/src/misc.c	2012-07-26 17:31:37.063365054 -0400
+@@ -20,12 +20,7 @@
+ 
+ #include <unistd.h> /* X_OK */
+ #include <stdlib.h>
+-#include <glib/gstdio.h> 
+-#include <glib/gstrfuncs.h>   /* g_strdup_printf */
+-#include <glib/gmem.h>        /* g_free */
+-#include <glib/gutils.h>      /* g_getenv */
+-#include <glib/gfileutils.h>  /* g_file_test() */
+-#include <glib/gshell.h>      /* g_shell_parse_argv */
++#include <glib.h> 
+ #include "config.h"
+ #include "misc.h"
+ #include "main.h"
+diff -Naur gshutdown-0.2.orig/src/misc.h gshutdown-0.2/src/misc.h
+--- gshutdown-0.2.orig/src/misc.h	2007-04-14 18:33:39.000000000 -0400
++++ gshutdown-0.2/src/misc.h	2012-07-26 17:31:14.890227639 -0400
+@@ -20,7 +20,7 @@
+ #ifndef __GSHUTDOWN_MISC__
+ #define __GSHUTDOWN_MISC__
+ 
+-#include <glib/gtypes.h>      /* gchar */
++#include <glib.h>      /* gchar */
+ 
+ /* Return a data file path. e.g: gshutdown.glade */
+ gchar *data_path(gchar *filename);
+diff -Naur gshutdown-0.2.orig/src/timer.c gshutdown-0.2/src/timer.c
+--- gshutdown-0.2.orig/src/timer.c	2007-05-19 07:30:38.000000000 -0400
++++ gshutdown-0.2/src/timer.c	2012-07-26 17:31:47.236428555 -0400
+@@ -18,7 +18,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include "timer.h"
+ #include "values.h"
+ #include "gui.h"
+diff -Naur gshutdown-0.2.orig/src/timer.h gshutdown-0.2/src/timer.h
+--- gshutdown-0.2.orig/src/timer.h	2007-04-14 18:33:39.000000000 -0400
++++ gshutdown-0.2/src/timer.h	2012-07-26 17:31:19.380254673 -0400
+@@ -21,7 +21,7 @@
+ #ifndef __GSHUTDOWN_TIMER__
+ #define __GSHUTDOWN_TIMER__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ guint time_left();
+ gboolean timer_notify();
+diff -Naur gshutdown-0.2.orig/src/values.c gshutdown-0.2/src/values.c
+--- gshutdown-0.2.orig/src/values.c	2007-04-14 18:33:40.000000000 -0400
++++ gshutdown-0.2/src/values.c	2012-07-26 17:31:53.540468680 -0400
+@@ -20,8 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <glib/gkeyfile.h>
+-#include <glib/gfileutils.h> /* g_build_path */
++#include <glib.h>
+ #include "values.h"
+ #include "gui.h"
+ #include "detectwm.h"
+diff -Naur gshutdown-0.2.orig/src/values.h gshutdown-0.2/src/values.h
+--- gshutdown-0.2.orig/src/values.h	2007-05-19 07:42:54.000000000 -0400
++++ gshutdown-0.2/src/values.h	2012-07-26 17:31:23.534280881 -0400
+@@ -21,7 +21,7 @@
+ #ifndef __GSHUTDOWN_VALUES__
+ #define __GSHUTDOWN_VALUES__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include "action.h"
+ 
+ typedef enum {
diff --git a/gshutdown.spec b/gshutdown.spec
index 48226b6..8a6d60e 100644
--- a/gshutdown.spec
+++ b/gshutdown.spec
@@ -1,6 +1,6 @@
 Name:		gshutdown
 Version:	0.2        
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	GShutDown is an advanced shut down utility for GNOME
 
 Group:		Applications/System
@@ -14,6 +14,7 @@ BuildRequires:	libnotify-devel, glib2-devel, gettext
 
 Patch0: gshutdown-0.2.libnotify-api.patch
 Patch1: gshutdown-0.2.explicitlink.patch
+Patch2: gshutdown-0.2-glib.patch
 
 %description
 GShutdown is an advanced shutdown utility which
@@ -25,7 +26,7 @@ Also can be use under Xfce and KDE.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libnotify-api
 %patch1 -p1 -b .explicitlink
-
+%patch2 -p1 -b .glib
 
 %build
 %configure
@@ -69,6 +70,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Wed Aug 01 2012 Jon Ciesla <limburgher at gmail.com> - 0.2-12
+- Tom Lane's glib fixes for libpng15 rebuild, BZ 843648.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild