[gmrun/f15] - Multi-head fix.

[Gilboa Davara]

commit 2f1d2156fc47f0e507ccbef6e1447be2c4225070
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date:   Wed Nov 16 15:14:11 2011 +0200

    - Multi-head fix.

 gmrun-0.9.2-multihead.patch |   34 ++++++++++++++++++++++++++++++++++
 gmrun.spec                  |   29 ++++++++++++++++++++++++-----
 2 files changed, 58 insertions(+), 5 deletions(-)
---
diff --git a/gmrun-0.9.2-multihead.patch b/gmrun-0.9.2-multihead.patch
new file mode 100644
index 0000000..f34dab2
--- /dev/null
+++ b/gmrun-0.9.2-multihead.patch
@@ -0,0 +1,34 @@
+--- gmrun-0.9.2/src/main.cc.old	2011-11-16 15:06:39.421653557 +0200
++++ gmrun-0.9.2/src/main.cc	2011-11-16 15:06:41.709647512 +0200
+@@ -542,7 +542,6 @@
+   gtk_widget_set_name(win, "Msh_Run_Window");
+   gtk_window_set_title(GTK_WINDOW(win), "Execute program feat. completion");
+   gtk_window_set_policy(GTK_WINDOW(win), FALSE, FALSE, TRUE);
+-  // gtk_window_set_position(GTK_WINDOW(win), GTK_WIN_POS_CENTER);
+   gtk_container_set_border_width(GTK_CONTAINER(win), 4);
+   gtk_signal_connect(GTK_OBJECT(win), "destroy",
+                      GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+@@ -654,7 +653,10 @@
+   }
+   else
+   {
+-    gtk_widget_set_uposition(win, prefs_left, prefs_top);
++  	if ((prefs_top == -1) && (prefs_left == -1))
++		gtk_window_set_position(GTK_WINDOW(win), GTK_WIN_POS_CENTER);
++	else
++		gtk_widget_set_uposition(win, prefs_left, prefs_top);
+   }
+ 
+   gtk_widget_show(win);
+--- gmrun-0.9.2/config/gmrunrc.old	2011-11-16 15:06:20.717702968 +0200
++++ gmrun-0.9.2/config/gmrunrc	2011-11-16 15:06:31.805673674 +0200
+@@ -7,7 +7,8 @@
+ TermExec = ${Terminal} -e
+ AlwaysInTerm = ssh telnet ftp lynx mc vi vim pine centericq perldoc man
+ 
+-# Set window geometry (except height)
++# Set window geometry (except height).
++# Top / Left = -1: Center dialog box in the current screen.
+ Width = 400
+ Top = 100
+ Left = 200
diff --git a/gmrun.spec b/gmrun.spec
index faca649..869cb1d 100644
--- a/gmrun.spec
+++ b/gmrun.spec
@@ -1,8 +1,18 @@
 Name:			gmrun
 Version:		0.9.2
-Release:		23%{?dist}
+Release:		25%{?dist}
 Summary:		Lightweight "Run program" dialog box with search history and tab completion
 
+%if 0%{?rhel} != 0
+%if %{?rhel} <= 5
+%define new_version	0
+%else
+%define new_version	1
+%endif
+%else
+%define new_version 1
+%endif
+
 Group:			User Interface/Desktops
 License:		GPL+
 URL:			http://sourceforge.net/projects/gmrun
@@ -10,11 +20,12 @@ Source0:		http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version
 Patch0:			gmrun-gmrunrc.patch
 Patch1:			gmrun-0.9.2-gcc43.patch
 Patch2:			gmrun-0.9.2-mousewheel.patch
-%if 0%{?fedora} >= 11
+%if %{new_version} == 1
 Patch3:			gmrun-0.9.2-f12.patch
 %endif
+Patch4:			gmrun-0.9.2-multihead.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} >= 8
+%if %{new_version} == 1
 BuildRequires:	popt-devel
 %else
 BuildRequires:	popt
@@ -42,9 +53,10 @@ prefix.
 %patch0 -p1 -b .gmrunrc
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .mousewheel
-%if 0%{?fedora} >= 11
+%if %{new_version} == 1
 %patch3 -p1 -b .f12_support
 %endif
+%patch4 -p1 -b .multihead
 
 
 %build
@@ -69,12 +81,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 16 2011  Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-25
+- Multi-head fix. (#746187, initial patch by Jens Petersen)
+
+* Mon Jul 25 2011 Gilboa Davara <gilboad[AT]gmail.com> - 0.9.2-24
+- EL6 support.
+- Cleaner spec.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Wed Apr 28 2010 Gilboa Davara <gilboad at gmail.com> - 0.9.2-22
 - Replace man with man-pages-reader. (#582930)
-	
+
 * Fri Jan 22 2010 Gilboa Davara <gilboad at gmail.com> - 0.9.2-21
 - Make the F12 optional on F11 and above.