Hello community, here is the log from the commit of package f-spot checked in at Mon Sep 3 18:49:49 CEST 2007. -------- --- GNOME/f-spot/f-spot.changes 2007-08-09 19:24:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/f-spot/f-spot.changes 2007-09-03 18:27:56.312339000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 3 13:45:26 CEST 2007 - lewing@suse.de + +- Fix for bnc #304124 (Importing specific jpg files causes error) + +------------------------------------------------------------------- New: ---- f-spot-bnc304124.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.D18523/_old 2007-09-03 18:49:45.000000000 +0200 +++ /var/tmp/diff_new_pack.D18523/_new 2007-09-03 18:49:45.000000000 +0200 @@ -20,7 +20,7 @@ Autoreqprov: on Requires: dcraw Version: 0.4.0 -Release: 4 +Release: 17 Summary: GNOME Photo Management Application URL: http://www.gnome.org/projects/f-spot/ Source: %{name}-%{version}.tar.bz2 @@ -28,6 +28,7 @@ Patch1: %{name}-libexif-so.patch Patch2: %{name}-configure.patch Patch3: fix-desktop-file.diff +Patch4: %{name}-bnc304124.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core nautilus-cd-burner dbus-1-x11 libgphoto2 Provides: %{name}-devel = %{version}-%{release} @@ -59,6 +60,7 @@ %patch1 -p1 %patch2 %patch3 +%patch4 %build autoreconf -f -i @@ -104,6 +106,8 @@ %files lang -f %{name}.lang %changelog +* Mon Sep 03 2007 - lewing@suse.de +- Fix for bnc #304124 (Importing specific jpg files causes error) * Thu Aug 09 2007 - maw@suse.de - Fix up the -lang subpackage. * Tue Aug 07 2007 - mauro@suse.de ++++++ f-spot-bnc304124.patch ++++++ Index: src/XmpTagsImporter.cs =================================================================== --- src/XmpTagsImporter.cs (revision 3318) +++ src/XmpTagsImporter.cs (revision 3319) @@ -153,13 +153,17 @@ foreach (Statement stmt in store) { //StatementList list = null; + System.Console.WriteLine ("processing {0}", stmt); switch (stmt.Predicate.Uri) { case Caption: case Headline: if (!descriptions.Contains (stmt.Predicate.Uri)) { - string caption = (GetTextField (stmt.Object as Literal)).Trim (); - if ((caption != null) && (caption.Length > 0) ) + string caption = GetTextField (stmt.Object as Literal); + if (caption != null) + caption = caption.Trim (); + + if ((caption != null) && (caption.Length > 0)) descriptions.Add (stmt.Predicate.Uri, caption); } break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org