From 401cc5bdbe6256b7dfc1d0fd3cfba0bccc8de1a4 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Mon, 10 Jan 2011 12:03:06 +0000 Subject: [PATCH] - Up to 0.8.2 - Removed patch0, applied upstream Changed files: f-spot-taglib.patch -> 1.2 f-spot.spec -> 1.107 --- f-spot-taglib.patch | 47 --------------------------------------------- f-spot.spec | 8 +++----- 2 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 f-spot-taglib.patch diff --git a/f-spot-taglib.patch b/f-spot-taglib.patch deleted file mode 100644 index e2d48e6..0000000 --- a/f-spot-taglib.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c1ef435b47a111046b86a5df33d98829762dc3ab Mon Sep 17 00:00:00 2001 -From: Marek Habersack -Date: Wed, 15 Sep 2010 23:18:08 +0200 -Subject: [PATCH] All fields of a struct must be initialized before the constructor returns - ---- - src/TagLib/IFD/Entries/Rational.cs | 6 ++++-- - src/TagLib/IFD/Entries/SRational.cs | 6 ++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/TagLib/IFD/Entries/Rational.cs b/src/TagLib/IFD/Entries/Rational.cs -index e8a69c5..2113a9a 100644 ---- f-spot-0.8.0/lib/TagLib/TagLib/src/TagLib/IFD/Entries/Rational.cs~ -+++ f-spot-0.8.0/lib/TagLib/TagLib/src/TagLib/IFD/Entries/Rational.cs -@@ -62,8 +62,10 @@ namespace TagLib.IFD.Entries - /// - public Rational (uint numerator, uint denominator) - { -- Numerator = numerator; -- Denominator = denominator; -+ if (denominator == 0) -+ throw new ArgumentException ("denominator"); -+ this.numerator = numerator; -+ this.denominator = denominator; - } - - #endregion -diff --git a/src/TagLib/IFD/Entries/SRational.cs b/src/TagLib/IFD/Entries/SRational.cs -index f80dee8..59ca58a 100644 ---- f-spot-0.8.0/lib/TagLib/TagLib/src/TagLib/IFD/Entries/SRational.cs~ -+++ f-spot-0.8.0/lib/TagLib/TagLib/src/TagLib/IFD/Entries/SRational.cs -@@ -62,8 +62,10 @@ namespace TagLib.IFD.Entries - /// - public SRational (int numerator, int denominator) - { -- Numerator = numerator; -- Denominator = denominator; -+ if (denominator == 0) -+ throw new ArgumentException ("denominator"); -+ this.numerator = numerator; -+ this.denominator = denominator; - } - - #endregion --- -1.7.2.3 - diff --git a/f-spot.spec b/f-spot.spec index ae77a94..46a1d49 100644 --- a/f-spot.spec +++ b/f-spot.spec @@ -5,13 +5,12 @@ Summary: Personal photo manager Summary(pl.UTF-8): Menedżer prywatnych galerii fotograficznych Name: f-spot -Version: 0.8.0 -Release: 3 +Version: 0.8.2 +Release: 1 License: GPL Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.8/%{name}-%{version}.tar.bz2 -# Source0-md5: f7d52adbf280c972adccd66338e49f3d -Patch0: %{name}-taglib.patch +# Source0-md5: 3f2286835c9cdf44e50bc564d8e6b892 Patch1: %{name}-PixbufLoader.patch URL: http://www.gnome.org/projects/f-spot/ BuildRequires: GConf2-devel >= 2.14.0 @@ -71,7 +70,6 @@ Moduł F-Spot dla gnome-screensavera. %prep %setup -q -%patch0 -p1 %patch1 -p1 %build -- 2.43.0