rpms/beagle/devel beagle-0.3.8-desktop-parser.patch, NONE, 1.1 beagle.spec, 1.144, 1.145
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Sun Aug 10 10:49:18 UTC 2008
Author: drago01
Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10303
Modified Files:
beagle.spec
Added Files:
beagle-0.3.8-desktop-parser.patch
Log Message:
fix duplicate provides and 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/devel/beagle.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- beagle.spec 24 Jul 2008 12:34:29 -0000 1.144
+++ beagle.spec 10 Aug 2008 10:48:47 -0000 1.145
@@ -1,6 +1,6 @@
Name: beagle
Version: 0.3.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The Beagle Search Infrastructure
Group: User Interface/Desktops
# see COPYING for details
@@ -50,6 +50,7 @@
Patch6: beagle-monodoc.patch
Patch7: beagle-0.3.8-typo-fix.patch
Patch8: beagle-0.3.8-epiphany.patch
+Patch9: beagle-0.3.8-desktop-parser.patch
# Mono is not available on these arches
ExcludeArch: s390 s390x sparc64 ppc64
@@ -139,6 +140,7 @@
%patch6 -p1 -b .monodoc
%patch7 -p1 -b .typo
%patch8 -p1 -b .epiphany
+%patch9 -p1 -b .desktop-parser
%build
autoconf
@@ -270,6 +272,11 @@
%exclude %{_libdir}/beagle/Backends/Evolution*
%exclude %{_datadir}/beagle/beagle-thunderbird-update.sh
%exclude %{_libdir}/beagle/thunderbird/
+%exclude %{_libdir}/beagle/libbeagleuiglue*
+%exclude %{_libdir}/beagle/UiUtil.dll*
+%exclude %{_libdir}/beagle/ImLogViewer.exe*
+%exclude %{_libdir}/beagle/Settings.exe*
+%{_libdir}/beagle/Settings.exe*
%{_datadir}/beagle
%{_mandir}/*/*
%dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
@@ -313,6 +320,10 @@
%{_libdir}/pkgconfig/beagle*.pc
%changelog
+* Sun Aug 10 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-4
+- Fix duplicate provides
+- Fix desktop file parser (GNOME #544607)
+
* Thu Jul 24 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-4
- Fix build against new epiphany
- Remove versioned thunderbird requires
More information about the fedora-extras-commits
mailing list