rpms/digikam/devel digikam-0.9.2-beta3-fix-exiv2-dep.patch, NONE, 1.1 digikam.spec, 1.34, 1.35

[Marcin Garski (mgarski)]

Author: mgarski

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26245

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.9.2-beta3-fix-exiv2-dep.patch 
Log Message:
- Fix broken compilation caused by Exiv2 dependency


digikam-0.9.2-beta3-fix-exiv2-dep.patch:

--- NEW FILE digikam-0.9.2-beta3-fix-exiv2-dep.patch ---
diff -urN digikam-0.9.2-beta3.orig/digikam/libs/widgets/metadata/makernotewidget.cpp digikam-0.9.2-beta3/digikam/libs/widgets/metadata/makernotewidget.cpp
--- digikam-0.9.2-beta3.orig/digikam/libs/widgets/metadata/makernotewidget.cpp	2007-06-03 19:24:42.000000000 +0200
+++ digikam-0.9.2-beta3/digikam/libs/widgets/metadata/makernotewidget.cpp	2007-06-06 00:59:07.000000000 +0200
@@ -22,13 +22,6 @@
  * 
  * ============================================================ */
 
-// C++ includes.
-
-#include <cstdlib>
-#include <cstdio>
-#include <cassert>
-#include <string>
-
 // Qt includes.
 
 #include <qmap.h>
@@ -38,12 +31,6 @@
 
 #include <klocale.h>
 
-// LibExiv2 includes.
-
-#include <exiv2/exif.hpp>
-#include <exiv2/tags.hpp>
-#include <exiv2/ifd.hpp>
-
 // Local includes.
 
 #include "ddebug.h"


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- digikam.spec	5 Jun 2007 21:48:41 -0000	1.34
+++ digikam.spec	5 Jun 2007 23:10:47 -0000	1.35
@@ -2,7 +2,7 @@
 
 Name:		digikam
 Version:	0.9.2
-Release:	0.1.%{alphatag}%{?dist}
+Release:	0.2.%{alphatag}%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,6 +12,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		digikam-0.9.2-beta3-desktop-utf8-fix.patch
+Patch1:		digikam-0.9.2-beta3-fix-exiv2-dep.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -52,6 +53,7 @@
 %setup -q -n %{name}-%{version}-%{alphatag}
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -128,6 +130,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Wed Jun 06 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.2.beta3
+- Fix broken compilation caused by Exiv2 dependency
+
 * Tue Jun 05 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.1.beta3
 - Update to version 0.9.2-beta3 (merge with digikamimageplugins)
 - Update description