rpms/beagle/F-8 beagle-0.3.8-desktop-parser.patch, NONE, 1.1 beagle.spec, 1.108, 1.109

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/beagle/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.3.8-desktop-parser.patch 
Log Message:
fix desktop file parser

beagle-0.3.8-desktop-parser.patch:

--- NEW FILE beagle-0.3.8-desktop-parser.patch ---
diff -upNr beagle-0.3.8.orign/Filters/FilterDesktop.cs beagle-0.3.8/Filters/FilterDesktop.cs
--- beagle-0.3.8.orign/Filters/FilterDesktop.cs	2007-11-27 02:50:09.000000000 +0100
+++ beagle-0.3.8/Filters/FilterDesktop.cs	2008-07-25 19:29:48.000000000 +0200
@@ -69,18 +69,22 @@ namespace Beagle.Filters {
 				Error ();
 				return;
 			}
+			
+			String line;
 
-			if (reader.ReadLine () != "[Desktop Entry]") {
-				Logger.Log.Error ("Could not filter file: No desktop entry");
-				reader.Close ();
-				Error ();
-				return;
+			while ((line = reader.ReadLine ()) != null)  {
+				if (line.Length != 0 && line != "[Desktop Entry]") {
+					Logger.Log.Error ("Could not filter file: No desktop entry");
+					reader.Close ();
+					Error ();
+					return;
+				}
+				if (line == "[Desktop Entry]") break;
 			}
-			
+
 			// desktop files must have a name
 			bool have_name = false;
 			
-			String line;
 			while ((line = reader.ReadLine ()) != null)  {
 				string [] sline = line.Split ('=');
 				if (sline.Length != 2)



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-8/beagle.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- beagle.spec	11 Feb 2008 08:45:19 -0000	1.108
+++ beagle.spec	10 Aug 2008 10:57:38 -0000	1.109
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.18
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 # see COPYING for details
@@ -47,6 +47,8 @@
 Patch6: beagle-0.2.15.1-libdir.patch
 #http://bugzilla.gnome.org/show_bug.cgi?id=509487
 Patch7: beagle-0.2.18-doc-extractor.patch
+Patch8: beagle-0.3.8-desktop-parser.patch
+
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 # no mono on s390 for now: s390 s390x 
@@ -114,7 +116,7 @@
 %patch5 -p1 -b .runuser
 %patch6 -p1 -b .libdir
 %patch7 -p1 -b .doc
-
+%patch8 -p1 -b .desktop-parser
 
 %build
 autoconf
@@ -337,6 +339,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Sun Aug 10 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.2.18-6
+- Fix desktop file parser (GNOME #544607)
+
 * Mon Feb 11 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.2.18-5
 - Replace doc-extractor fix with upstream version (GNOME #509487)