Hello community, here is the log from the commit of package f-spot for openSUSE:Factory checked in at 2013-01-10 11:04:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/f-spot (Old) and /work/SRC/openSUSE:Factory/.f-spot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "f-spot", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/f-spot/f-spot.changes 2012-02-27 18:35:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.f-spot.new/f-spot.changes 2013-01-10 11:04:33.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Jan 9 13:55:51 UTC 2013 - [email protected] + +- No longer require libgphoto2: The requirement is bogus, as since + version 0.7.0, f-spot no longer uses gphoto2 directly but + interfaces through gvfs. + +------------------------------------------------------------------- +Mon Jan 7 14:03:42 UTC 2013 - [email protected] + +- Add fspot-mono.patch to compile with new Mono +- Add flickrnet-3.0.patch to support Flickrnet 3.0 + +------------------------------------------------------------------- New: ---- flickrnet-3.0.patch fspot-mono.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.pXdr0C/_old 2013-01-10 11:04:35.000000000 +0100 +++ /var/tmp/diff_new_pack.pXdr0C/_new 2013-01-10 11:04:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package f-spot # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,10 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM f-spot-mono-recent-gtk-sharp.patch [email protected] -- Fix build with recent gtk-sharp, taken from git Patch2: f-spot-mono-recent-gtk-sharp.patch +# PATCH-FIX-UPSTREAM fspot-mono.patch [email protected] -- Add a workaround to compile with new Mono +Patch3: fspot-mono.patch +# PATCH-FIX-UPSTREAM flickrnet-3.0.patch [email protected] -- Add Flickrnet 3.0 API support +Patch4: flickrnet-3.0.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-screensaver @@ -53,7 +57,6 @@ Requires: brasero Requires: dbus-1-x11 Requires: dcraw -Requires: libgphoto2 Requires: mono-core Recommends: %{name}-lang Provides: %{name}-devel = %{version} @@ -74,6 +77,10 @@ %if 0%{?suse_version} >= 1140 %patch2 -p1 %endif +%patch3 -p1 +%if 0%{?suse_version} >= 1230 +%patch4 -p1 +%endif %build export CFLAGS="%{optflags} -fstack-protector -fno-strict-aliasing" ++++++ flickrnet-3.0.patch ++++++ diff -Naur f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs --- f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs 2010-12-19 14:34:42.000000000 +0100 +++ f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs 2011-11-28 14:23:08.000000000 +0100 @@ -124,9 +124,9 @@ do_export_flickr.Sensitive = true; auth_flickr.Sensitive = true; auth_label.Text = System.String.Format (Catalog.GetString ("Welcome {0} you are connected to {1}"), - auth.User.Username, + auth.User.UserName, current_service.Name); - auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.Username); + auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.UserName); used_bandwidth.Visible = !fr.Connection.PeopleGetUploadStatus().IsPro && fr.Connection.PeopleGetUploadStatus().BandwidthMax > 0; if (used_bandwidth.Visible) { @@ -326,7 +326,7 @@ progress_dialog.ProgressText = String.Format (Catalog.GetString ("Waiting for response {0} of {1}"), photo_index, selection.Count); } - progress_dialog.Fraction = (photo_index - 1.0 + (args.Bytes / (double) info.Length)) / (double) selection.Count; + progress_dialog.Fraction = (photo_index - 1.0 + (args.BytesSent / (double) info.Length)) / (double) selection.Count; } private class DateComparer : IComparer @@ -370,7 +370,7 @@ App.Instance.Database.Exports.Create ((photo as FSpot.Photo).Id, (photo as FSpot.Photo).DefaultVersionId, ExportStore.FlickrExportType, - auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id); + auth.User.UserId + ":" + auth.User.UserName + ":" + current_service.Name + ":" + id); } catch (System.Exception e) { progress_dialog.Message = String.Format (Catalog.GetString ("Error Uploading To {0}: {1}"), @@ -393,7 +393,7 @@ if (open && ids.Count != 0) { string view_url; if (current_service.Name == "Zooomr.com") - view_url = string.Format ("http://www.{0}/photos/{1}/";, current_service.Name, auth.User.Username); + view_url = string.Format ("http://www.{0}/photos/{1}/";, current_service.Name, auth.User.UserName); else { view_url = string.Format ("http://www.{0}/tools/uploader_edit.gne?ids";, current_service.Name); bool first = true; diff -Naur f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs --- f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs 2010-12-19 14:34:42.000000000 +0100 +++ f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs 2011-11-28 15:42:01.000000000 +0100 @@ -22,7 +22,7 @@ namespace FSpot.Exporters.Flickr { public class FlickrRemote { - public static Licenses licenses; + public static LicenseCollection licenses; private string frob; private string token; private Auth auth; @@ -62,28 +62,30 @@ get { return flickr; } } - public License[] GetLicenses () + public LicenseCollection GetLicenses () { // Licenses won't change normally in a user session if (licenses == null) { try { licenses = flickr.PhotosLicensesGetInfo(); } catch (FlickrNet.FlickrApiException e ) { - Log.Error (e.Code + ": " + e.Verbose ); + Log.Error (e.Code + ": " + e.OriginalMessage ); return null; } } - return licenses.LicenseCollection; + return licenses; } public ArrayList Search (string[] tags, int licenseId) { ArrayList photos_url = new ArrayList (); // Photos photos = flickr.PhotosSearchText (tags, licenseId); - Photos photos = flickr.PhotosSearch (tags); + PhotoSearchOptions options = new PhotoSearchOptions (); + options.Tags = string.Join(",", tags); + PhotoCollection photos = flickr.PhotosSearch (options); if (photos != null) { - foreach (FlickrNet.Photo photo in photos.PhotoCollection) { + foreach (FlickrNet.Photo photo in photos) { photos_url.Add (photo.ThumbnailUrl); } } @@ -94,10 +96,12 @@ public ArrayList Search (string tags, int licenseId) { ArrayList photos_url = new ArrayList (); - Photos photos = flickr.PhotosSearchText (tags, licenseId); + PhotoSearchOptions options = new PhotoSearchOptions (); + options.Tags = tags; + PhotoCollection photos = flickr.PhotosSearch (options); if (photos != null) { - foreach (FlickrNet.Photo photo in photos.PhotoCollection) { + foreach (FlickrNet.Photo photo in photos) { photos_url.Add (photo.ThumbnailUrl); } } @@ -126,7 +130,7 @@ return auth; } catch (FlickrNet.FlickrApiException ex) { - Log.Error ("Problems logging in to Flickr - " + ex.Verbose); + Log.Error ("Problems logging in to Flickr - " + ex.OriginalMessage); return null; } } ++++++ fspot-mono.patch ++++++ Index: f-spot-0.8.2/src/Clients/MainApp/FSpot/GroupSelector.cs =================================================================== --- f-spot-0.8.2.orig/src/Clients/MainApp/FSpot/GroupSelector.cs +++ f-spot-0.8.2/src/Clients/MainApp/FSpot/GroupSelector.cs @@ -431,7 +431,7 @@ namespace FSpot { bounds.Height = selector.background.Height; bounds.Y = selector.background.Y; bounds.X = selector.BoxX (item); - bounds.Width = Math.Max (selector.BoxX (item + 1) - bounds.X, 1); + bounds.Width = Math.Max (selector.BoxX (item + 1) - selector.BoxX (item), 1); if (item < 0 || item > selector.box_counts.Length - 1) return; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
