rpms/beagle/F-9 beagle-0.3.8-desktop-parser.patch, NONE, 1.1 beagle.spec, 1.143, 1.144
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Sun Aug 10 11:34:56 UTC 2008
- Previous message (by thread): rpms/ibus/devel ibus.spec, NONE, 1.1 import.log, NONE, 1.1 xinput-ibus, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/ibus-m17n/devel ibus-m17n.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: drago01
Update of /cvs/pkgs/rpms/beagle/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20601
Modified Files:
beagle.spec
Added Files:
beagle-0.3.8-desktop-parser.patch
Log Message:
fix 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/F-9/beagle.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- beagle.spec 24 Jul 2008 12:36:16 -0000 1.143
+++ beagle.spec 10 Aug 2008 11:34:26 -0000 1.144
@@ -1,6 +1,6 @@
Name: beagle
Version: 0.3.8
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Beagle Search Infrastructure
Group: User Interface/Desktops
# see COPYING for details
@@ -53,6 +53,7 @@
Patch5: beagle-0.2.15.1-libdir.patch
Patch6: beagle-monodoc.patch
Patch7: beagle-0.3.8-typo-fix.patch
+Patch8: beagle-0.3.8-desktop-parser.patch
# Mono is not available on these arches
ExcludeArch: s390 s390x sparc64 ppc64
@@ -145,6 +146,7 @@
%patch5 -p1 -b .libdir
%patch6 -p1 -b .monodoc
%patch7 -p1 -b .typo
+%patch8 -p1 -b .desktop-parser
%build
autoconf
@@ -265,18 +267,34 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README
%{_sysconfdir}/cron.daily/*
%{_sysconfdir}/beagle
-%{_bindir}/
+%{_bindir}/beagled
+%{_bindir}/blocate
+%{_bindir}/beagle-config
+%{_bindir}/beagle-doc-extractor
+%{_bindir}/beagle-extract-content
+%{_bindir}/beagle-index-info
+%{_bindir}/beagle-info
+%{_bindir}/beagle-ping
+%{_bindir}/beagle-query
+%{_bindir}/beagle-shutdown
+%{_bindir}/beagle-static-query
+%{_bindir}/beagle-status
%{_sbindir}/*
%{_libdir}/beagle/
%exclude %{_libdir}/beagle/Backends/Thunder*
%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*
+%exclude %{_libdir}/beagle/Beagle.Search.*
%{_datadir}/beagle
%{_mandir}/*/*
%dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
@@ -306,6 +324,7 @@
%{_libdir}/beagle/ImLogViewer.exe*
%{_libdir}/beagle/Settings.exe*
%{_libdir}/beagle/libbeagleuiglue*
+%{_libdir}/beagle/Beagle.Search.*
%{_datadir}/applications/*
%files evolution
@@ -320,6 +339,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-3
- Fix dir ownership
- Previous message (by thread): rpms/ibus/devel ibus.spec, NONE, 1.1 import.log, NONE, 1.1 xinput-ibus, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/ibus-m17n/devel ibus-m17n.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list