Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit beagle
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 29 Mar 2007 22:26:18 +0200
  • Message-id: <20070329202618.5346C67817D@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package beagle
checked in at Thu Mar 29 22:26:18 CEST 2007.

--------
--- GNOME/beagle/beagle.changes 2007-03-20 20:42:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/beagle/beagle.changes  2007-03-29 22:22:57.995464000 +0200
@@ -1,0 +2,6 @@
+Thu Mar 29 22:15:33 CEST 2007 - joeshaw@xxxxxxx
+
+- Add a patch to handle empty OpenOffice documents.  (bnc #259031)
+- Add unzip to BuildRequires
+
+-------------------------------------------------------------------
libbeagle.changes: same change

New:
----
  beagle-empty-ooo-file.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ beagle.spec ++++++
--- /var/tmp/diff_new_pack.FC9080/_old  2007-03-29 22:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.FC9080/_new  2007-03-29 22:25:12.000000000 +0200
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           beagle
-BuildRequires:  art-sharp2 desktop-data dos2unix epiphany epiphany-devel evolution-sharp gconf-sharp2 glade-sharp2 gmime-devel gnome-sharp2 gsf-sharp intltool librsvg-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser shared-mime-info sqlite2-devel tango-icon-theme update-desktop-files wv-devel xorg-x11-devel xorg-x11-libs zip
+BuildRequires:  art-sharp2 desktop-data dos2unix epiphany epiphany-devel evolution-sharp gconf-sharp2 glade-sharp2 gmime-devel gnome-sharp2 gsf-sharp intltool librsvg-devel mono-basic mono-data-sqlite mono-devel perl-XML-Parser shared-mime-info sqlite2-devel tango-icon-theme unzip update-desktop-files wv-devel xorg-x11-devel xorg-x11-libs zip
 BuildRequires:  libexif-devel
 %define prefix   /usr
 %define sysconfdir /etc/
@@ -19,13 +19,14 @@
 Group:          Productivity/Other
 Autoreqprov:    on
 Version:        0.2.16.3
-Release:        2
+Release:        4
 Summary:        Desktop Search Application
 URL:            http://beagle-project.org
 Source:         %{name}-%{version}.tar.gz
 Patch1:         %{name}-firefox-makefile.patch
 Patch2:         beagle-no-gui-autostart.patch
 Patch3:         beagle-log-level-warn.patch
+Patch5:         beagle-empty-ooo-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Prereq:         /usr/sbin/groupadd /usr/sbin/useradd
 Requires:       mono-core >= 1.1.13.5
@@ -252,6 +253,7 @@
 %patch1
 %patch2
 %patch3
+%patch5
 
 %build
 intltoolize --copy --force --automake
@@ -389,6 +391,9 @@
 %{prefix}/%_lib/beagle/Backends/ThunderbirdBackends.dll*
 
 %changelog
+* Thu Mar 29 2007 - joeshaw@xxxxxxx
+- Add a patch to handle empty OpenOffice documents.  (bnc #259031)
+- Add unzip to BuildRequires
 * Tue Mar 20 2007 - joeshaw@xxxxxxx
 - Specify the gtk-doc directory in the libbeagle-doc package, to
   fix the build.

++++++ libbeagle.spec ++++++
--- /var/tmp/diff_new_pack.FC9080/_old  2007-03-29 22:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.FC9080/_new  2007-03-29 22:25:12.000000000 +0200
@@ -23,7 +23,7 @@
 Group:          Development/Libraries/GNOME
 Autoreqprov:    on
 Version:        0.2.16.3
-Release:        2
+Release:        5
 Summary:        Beagle C interface
 URL:            http://www.gnome.org/projects/beagle/
 Source:         beagle-%{version}.tar.gz
@@ -120,6 +120,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Mar 29 2007 - joeshaw@xxxxxxx
+- Add a patch to handle empty OpenOffice documents.  (bnc #259031)
+- Add unzip to BuildRequires
 * Tue Mar 20 2007 - joeshaw@xxxxxxx
 - Specify the gtk-doc directory in the libbeagle-doc package, to
   fix the build.

++++++ beagle-empty-ooo-file.patch ++++++
Index: Filters/FilterOpenOffice.cs
===================================================================
--- Filters/FilterOpenOffice.cs (revision 3611)
+++ Filters/FilterOpenOffice.cs (working copy)
@@ -427,9 +427,8 @@
 
                private void ExtractMetadata (XmlReader reader)
                {
-                       do {
-                               reader.Read ();
-                       } while (reader.Depth < 2);
+                       while (reader.Read () && reader.Depth < 2)
+                               ;
 
                        while (reader.Depth >= 2) {
                                if (reader.Depth != 2 || reader.NodeType != XmlNodeType.Element) {


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >