rpms/icewm/devel icewm-configure.patch, 1.1, 1.2 icewm.spec, 1.17, 1.18

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4018

Modified Files:
	icewm-configure.patch icewm.spec 
Log Message:
pkg-config --cflags gnome-desktop-2.0 doesn't implicitly include libgnomeui-2.0 anymore, so add it in explicitly

icewm-configure.patch:

Index: icewm-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icewm-configure.patch	15 Feb 2007 09:55:58 -0000	1.1
+++ icewm-configure.patch	6 Jan 2009 12:06:16 -0000	1.2
@@ -1,6 +1,16 @@
 --- icewm-1.2.30/configure.in.old	2007-01-16 16:12:51.000000000 +0200
 +++ icewm-1.2.30/configure.in	2007-01-16 16:13:31.000000000 +0200
-@@ -814,7 +814,7 @@
+@@ -820,15 +820,15 @@
+     
+       if test "${PKG_CONFIG}" != ""; then
+ 	GNOME_VER=2
+-	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
+-	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
++	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
++	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
+ 
+ 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
+ 
  	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
  	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
  	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
@@ -11,7 +21,17 @@
        if test "${GNOME2_CFLAGS}" = ""; then
 --- icewm-1.2.30/configure.old	2007-01-16 17:44:10.000000000 +0200
 +++ icewm-1.2.30/configure	2007-01-16 17:44:31.000000000 +0200
-@@ -12000,7 +12000,7 @@
+@@ -12564,7 +12564,8 @@
+       if test "${PKG_CONFIG}" != ""; then
+ 	GNOME_VER=2
+ 	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
+-	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
++	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
++	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -12575,7 +12576,7 @@
  	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
  	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
  	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- icewm.spec	5 Jan 2009 11:04:10 -0000	1.17
+++ icewm.spec	6 Jan 2009 12:06:16 -0000	1.18
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.36
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -199,6 +199,10 @@
 
 
 %changelog
+* Tue Jan 6 2009 Caolán McNamara <caolanm at redhat.com> - 1.2.36-3
+- pkg-config --cflags gnome-desktop-2.0 doesn't implicitly include
+  libgnomeui-2.0 anymore, so add it in explicitly
+
 * Mon Jan 5 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.36-2
 - Missing BR libgnomeui-devel. (devel)
 - Missing BR gnome-vfs2-devel. (devel)