From c6b7229e984c1d03d3d1e1541b8c46785a56cc69 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Mar 30 2010 18:21:23 +0000
Subject: - crash on startup in RatingWidget (kde#232628)


---

diff --git a/digikam-1.2.0-kde232628.patch b/digikam-1.2.0-kde232628.patch
new file mode 100644
index 0000000..02d4cce
--- /dev/null
+++ b/digikam-1.2.0-kde232628.patch
@@ -0,0 +1,11 @@
+--- 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 a082ebd..46aa57d 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,7 +1,7 @@
 
 Name:	 digikam
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -14,7 +14,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: upstream me
 Source1: digikam-import.desktop
 
-BuildRequires: cmake
+## upstream patches
+# http://bugs.kde.org/232628
+Patch100: digikam-1.2.0-kde232628.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: glib2-devel
@@ -80,6 +83,8 @@ needed to develop applications using %{name}.
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch100 -p4 -b .kde232628
+
 
 %build
 
@@ -161,6 +166,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 30 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.2.0-2
+- crash on startup in RatingWidget (kde#232628)
+
 * Mon Mar 29 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.2.0-1
 - digikam-1.2.0