rpms/digikam/F-11 digikam-1.2.0-kde232628.patch, NONE, 1.1 digikam.spec, 1.94, 1.95

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31338

Modified Files:
	digikam.spec 
Added Files:
	digikam-1.2.0-kde232628.patch 
Log Message:
* Tue Mar 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-2
- crash on startup in RatingWidget (kde#232628)


digikam-1.2.0-kde232628.patch:
 ratingwidget.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE digikam-1.2.0-kde232628.patch ---
--- 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();
     }


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/digikam.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- digikam.spec	29 Mar 2010 21:49:07 -0000	1.94
+++ digikam.spec	1 Jun 2010 13:33:58 -0000	1.95
@@ -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
@@ -11,9 +11,13 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # digiKam not listed as a media handler for pictures in Nautilus (#516447)
+# 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
@@ -79,6 +83,8 @@ needed to develop applications using %{n
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch100 -p4 -b .kde232628
+
 
 %build
 
@@ -160,10 +166,15 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Mar 29 2010 Thomas Janssen <thomasj at fedoraproject.org> - 1.2.0-1
+* Tue Mar 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-2
+- crash on startup in RatingWidget (kde#232628)
+
+* Mon Mar 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-1
 - digikam-1.2.0
+
+* Mon Mar 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-3
 - -libs: drop extraneous deps
-- -devel: Requires: kdelibs4-devel
+- -devel: Req: kdelibs4-devel
 
 * Wed Feb 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-2
 - touch up marble-related deps