rpms/emerald/devel emerald-0.2.1-no_wnck_modal.patch, NONE, 1.1 emerald.spec, 1.9, 1.10

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/emerald/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv645

Modified Files:
	emerald.spec 
Added Files:
	emerald-0.2.1-no_wnck_modal.patch 
Log Message:
Fix up build with latest libwnck

emerald-0.2.1-no_wnck_modal.patch:

--- NEW FILE emerald-0.2.1-no_wnck_modal.patch ---
diff -Naurp emerald-0.2.1.orig/src/main.c emerald-0.2.1/src/main.c
--- emerald-0.2.1.orig/src/main.c	2007-03-17 15:29:38.000000000 -0400
+++ emerald-0.2.1/src/main.c	2007-06-11 15:01:25.000000000 -0400
@@ -3781,7 +3781,6 @@ static void action_menu_map(WnckWindow *
 		return;
 	case WNCK_WINDOW_NORMAL:
 	case WNCK_WINDOW_DIALOG:
-	case WNCK_WINDOW_MODAL_DIALOG:
 	case WNCK_WINDOW_TOOLBAR:
 	case WNCK_WINDOW_MENU:
 	case WNCK_WINDOW_UTILITY:


Index: emerald.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/devel/emerald.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- emerald.spec	5 Jun 2007 03:59:49 -0000	1.9
+++ emerald.spec	11 Jun 2007 19:04:15 -0000	1.10
@@ -3,11 +3,12 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Themeable window decorator and compositing manager for Beryl
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
+Patch1:         emerald-0.2.1-no_wnck_modal.patch
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 .wnck
 # Should only have one Exec line in a desktop file...
 perl -pi -e 's|Exec=emerald-theme-manager -i||g' misc/emerald-theme-manager.desktop
 # Death to rpaths...
@@ -109,6 +111,9 @@
 %{_libdir}/libemeraldengine.so
 
 %changelog
+* Mon Jun 11 2007 Jarod Wilson <jwilson at redhat.com> 0.2.1-2
+- Fix up build against latest libwnck
+
 * Mon Jun 04 2007 Jarod Wilson <jwilson at redhat.com> 0.2.1-1
 - beryl 0.2.1