rpms/digikam/devel digikam-0.9.2-kde#148930.patch, NONE, 1.1 digikam.spec, 1.39, 1.40

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.9.2-kde#148930.patch 
Log Message:
* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-4
- License: GPLv2+
- lcms patch (kde bug #148930)


digikam-0.9.2-kde#148930.patch:

--- NEW FILE digikam-0.9.2-kde#148930.patch ---
diff -up digikam-0.9.2-final/digikam/libs/lprof/lcmsprf.h.kde#148930 digikam-0.9.2-final/digikam/libs/lprof/lcmsprf.h
--- digikam-0.9.2-final/digikam/libs/lprof/lcmsprf.h.kde#148930	2007-06-13 13:06:04.000000000 -0500
+++ digikam-0.9.2-final/digikam/libs/lprof/lcmsprf.h	2007-08-29 07:13:38.000000000 -0500
@@ -69,6 +69,10 @@ typedef struct {
 
     } MATN,FAR* LPMATN;
 
+// See B.K.O #148930: compile with lcms v.1.17
+#if (LCMS_VERSION > 116)
+typedef LCMSBOOL BOOL;
+#endif
 
 LPMATN      cdecl MATNalloc(int Rows, int Cols);
 void        cdecl MATNfree (LPMATN mat);


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- digikam.spec	29 Aug 2007 05:04:15 -0000	1.39
+++ digikam.spec	29 Aug 2007 14:10:07 -0000	1.40
@@ -2,16 +2,18 @@
 
 Name:		digikam
 Version:	0.9.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
-License:	GPL
+License:	GPLv2+
 URL:		http://www.digikam.org/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{alphatag}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		digikam-0.9.2-beta3-desktop-utf8-fix.patch
+# http://bugs.kde.org/148930
+Patch148930: digikam-0.9.2-kde#148930.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -52,6 +54,7 @@
 %setup -q -n %{name}-%{version}-%{alphatag}
 
 %patch0 -p1
+%patch148930 -p1 -b .kde#148930
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -84,6 +87,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libdigikam.la
 
 # Create symlinks in pixmaps directory
+# FIXME: this shouldn't be necessary anymore -- Rex
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -sf ../icons/hicolor/48x48/apps/digikam.png \
 	$RPM_BUILD_ROOT%{_datadir}/pixmaps/digikam.png
@@ -137,6 +141,10 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-4
+- License: GPLv2+
+- lcms patch (kde bug #148930)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9.2-3
 - Rebuild for selinux ppc32 issue.