diff --git a/.cvsignore b/.cvsignore index 794443f..1fbee41 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -digikam-1.2.0.tar.bz2 +digikam-1.3.0.tar.bz2 diff --git a/digikam-1.2.0-kde232628.patch b/digikam-1.2.0-kde232628.patch deleted file mode 100644 index 02d4cce..0000000 --- a/digikam-1.2.0-kde232628.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:12 1109176 -+++ trunk/extragear/graphics/digikam/digikam/ratingwidget.cpp 2010/03/30 18:15:25 1109177 -@@ -165,7 +165,7 @@ - void RatingWidget::setFadingValue(int value) - { - d->fadingValue = value; -- if (d->fadingValue >= 255) -+ if (d->fadingValue >= 255 && d->fadingTimeLine) - { - d->fadingTimeLine->stop(); - } diff --git a/digikam.spec b/digikam.spec index 46aa57d..ed1d72a 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ Name: digikam -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -15,15 +15,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: digikam-import.desktop ## upstream patches -# http://bugs.kde.org/232628 -Patch100: digikam-1.2.0-kde232628.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: glib2-devel BuildRequires: gphoto2-devel -BuildRequires: libkdcraw-devel >= 0.4.0-2 -BuildRequires: libkexiv2-devel >= 0.5.0 +BuildRequires: libkdcraw-devel >= 1.1.0 +BuildRequires: libkexiv2-devel >= 1.1.0 BuildRequires: libkipi-devel >= 0.3.0 BuildRequires: liblqr-1-devel BuildRequires: jasper-devel @@ -83,8 +81,6 @@ needed to develop applications using %{name}. %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} -%patch100 -p4 -b .kde232628 - %build @@ -166,6 +162,9 @@ rm -rf %{buildroot} %changelog +* Tue Jun 08 2010 Rex Dieter - 1.3.0-1 +- digikam-1.3.0 + * Tue Mar 30 2010 Rex Dieter - 1.2.0-2 - crash on startup in RatingWidget (kde#232628) diff --git a/sources b/sources index 6e3fae3..0006456 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f68022008cf1650924cc8688f176572 digikam-1.2.0.tar.bz2 +25d09fdab2b2450c6c6075aab3377fce digikam-1.3.0.tar.bz2