rpms/digikam/F-8 digikam-missing-photos.patch, NONE, 1.1 digikam.spec, 1.43, 1.44

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13098

Modified Files:
	digikam.spec 
Added Files:
	digikam-missing-photos.patch 
Log Message:
* Mon Jul 07 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.3-2
- Don't lose some photos during import (#448235)


digikam-missing-photos.patch:

--- NEW FILE digikam-missing-photos.patch ---
--- digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp	2007-12-22 18:19:47.000000000 +0100
+++ digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp.new	2008-07-07 00:42:14.000000000 +0200
@@ -370,7 +370,7 @@
 
                 KURL tempURL(dest);
                 tempURL = tempURL.upURL();
-                tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid()));
+                tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid()).prepend(file));
                 QString temp = tempURL.path();
     
                 bool result = d->camera->downloadItem(folder, file, tempURL.path());
@@ -410,7 +410,7 @@
 
                         KURL tempURL2(dest);
                         tempURL2 = tempURL2.upURL();
-                        tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid()));
+                        tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid()).prepend(file));
                         temp = tempURL2.path();
 
                         if (!jpegConvert(tempURL.path(), tempURL2.path(), file, losslessFormat))


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-8/digikam.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- digikam.spec	29 Dec 2007 20:47:28 -0000	1.43
+++ digikam.spec	17 Jul 2008 16:58:11 -0000	1.44
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -9,6 +9,8 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         digikam-missing-photos.patch
+
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	kdelibs-devel
@@ -47,6 +49,8 @@
 %prep
 %setup -q
 
+%patch0 -p1
+
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -133,6 +137,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jul 07 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.3-2
+- Don't lose some photos during import (#448235)
+
 * Sat Dec 22 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.3-1
 - Update to 0.9.3
 - BR: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2