rpms/digikam/F-9 digikam-missing-photos.patch, NONE, 1.1 digikam.spec, 1.52, 1.53

[Marcin Garski (mgarski)]

Author: mgarski

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

Modified Files:
	digikam.spec 
Added Files:
	digikam-missing-photos.patch 
Log Message:
- Don't lose some photos during import (#448235)


digikam-missing-photos.patch:

--- NEW FILE digikam-missing-photos.patch ---
--- digikam/utilities/cameragui/cameracontroller.cpp    2008-03-03 16:23:48.000000000 +0200
+++ digikam/utilities/cameragui/cameracontroller.cpp    2008-03-03 17:06:28.000000000 +0200
@@ -471,7 +471,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());
@@ -511,7 +511,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-9/digikam.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- digikam.spec	14 Mar 2008 21:00:55 -0000	1.52
+++ digikam.spec	6 Jul 2008 22:54:06 -0000	1.53
@@ -3,7 +3,7 @@
 
 Name:		digikam
 Version:	0.9.3
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,6 +12,8 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		digikam-missing-photos.patch
+
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	kdelibs3-devel
@@ -50,6 +52,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
+%patch0 -p1
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -136,6 +139,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jul 07 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.3-4
+- Don't lose some photos during import (#448235)
+
 * Fri Mar 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
 - respin (for libkdcraw)