rpms/beagle/devel beagle-0.3.8-category-crash.patch, NONE, 1.1 beagle-0.3.8-libgnome-desktop-soname.patch, NONE, 1.1 beagle.spec, 1.152, 1.153

[Adel Gadllah]

Author: drago01

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

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.3.8-category-crash.patch 
	beagle-0.3.8-libgnome-desktop-soname.patch 
Log Message:
fix bug 556243

beagle-0.3.8-category-crash.patch:

--- NEW FILE beagle-0.3.8-category-crash.patch ---
--- trunk/beagle/search/Beagle.Search/GroupView.cs	(original)
+++ trunk/beagle/search/Beagle.Search/GroupView.cs	Thu Aug 14 02:02:21 2008
@@ -179,12 +179,14 @@
 			}
 		}

-		private void OnCategoryToggle (ScopeType catScope)
+		private void OnCategoryToggle (ScopeType category_scope)
 		{
 			// we're not using the set function cause we directly
 			// close/open the expander in Category.cs
-			scope = scope ^ catScope;
-			CategoryToggled (catScope);
+			scope = scope ^ category_scope;
+			
+			if (CategoryToggled != null)
+				CategoryToggled (category_scope);
 		}
 	}
 }


beagle-0.3.8-libgnome-desktop-soname.patch:

--- NEW FILE beagle-0.3.8-libgnome-desktop-soname.patch ---
diff -upNr beagle-0.3.8.orign/search/Beagle.Search.Tiles/Application.cs beagle-0.3.8/search/Beagle.Search.Tiles/Application.cs
--- beagle-0.3.8.orign/search/Beagle.Search.Tiles/Application.cs	2008-02-10 21:24:20.000000000 +0100
+++ beagle-0.3.8/search/Beagle.Search.Tiles/Application.cs	2008-11-08 18:33:57.000000000 +0100
@@ -17,13 +17,13 @@ namespace Beagle.Search.Tiles {
 			AddSupportedFlavor (new HitFlavor (null, null, "application/x-desktop"));
 		}
 
-		[DllImport ("libgnome-desktop-2.so.2")]
+		[DllImport ("libgnome-desktop-2.so.7")]
 		static extern IntPtr gnome_desktop_item_new_from_uri (string uri, int flags, IntPtr error);
 
-		[DllImport ("libgnome-desktop-2.so.2")]
+		[DllImport ("libgnome-desktop-2.so.7")]
 		static extern string gnome_desktop_item_get_string (IntPtr ditem, string attr);
 
-		[DllImport ("libgnome-desktop-2.so.2")]
+		[DllImport ("libgnome-desktop-2.so.7")]
 		static extern void gnome_desktop_item_unref (IntPtr ditem);
 
 		IntPtr ditem;
@@ -157,7 +157,7 @@ namespace Beagle.Search.Tiles {
 				base.LoadIcon (image, size);
 		}
 
-		[DllImport ("libgnome-desktop-2.so.2")]
+		[DllImport ("libgnome-desktop-2.so.7")]
 		static extern int gnome_desktop_item_launch (IntPtr ditem, IntPtr file_list, int flags, IntPtr error);
 
 		public override void Open ()


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- beagle.spec	2 Nov 2008 13:28:54 -0000	1.152
+++ beagle.spec	8 Nov 2008 18:38:16 -0000	1.153
@@ -1,6 +1,6 @@
 Name:		beagle
 Version:	0.3.8
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -58,7 +58,9 @@
 Patch7: beagle-0.3.8-typo-fix.patch
 Patch8: beagle-0.3.8-epiphany.patch
 Patch9: beagle-0.3.8-desktop-parser.patch
-
+Patch10: beagle-0.3.8-libgnome-desktop-soname.patch
+#svn commit r4855
+Patch11: beagle-0.3.8-category-crash.patch
 # Mono is not available on these arches 
 ExcludeArch: s390 s390x sparc64 ppc64
 
@@ -83,6 +85,7 @@
 Summary:	Beagle search system user interface for GNOME
 Group:		User Interface/Desktops
 Requires:	beagle = %{version}-%{release}
+Requires:	gnome-desktop >= 2.24.0
 Obsoletes:	beagle-gui < 0.3.3-9
 Provides:	beagle-gui = 0.3.3-9
 
@@ -148,6 +151,8 @@
 %patch7 -p1 -b .typo
 %patch8 -p1 -b .epiphany
 %patch9 -p1 -b .desktop-parser
+%patch10 -p1 -b .gnome-desktop
+%patch11 -p1 -b .category-crash
 
 %build
 autoconf
@@ -339,6 +344,10 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sat Nov 08 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-12
+- Use new libgnome-desktop
+- Backport fix for RH #556243
+
 * Sun Nov 02 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-11
 - Revert last change