rpms/digikam/devel digikam-0.8.0-gcc41.patch, NONE, 1.1 digikam.spec, 1.11, 1.12

[Marcin Garski (mgarski)]

Author: mgarski

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

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.8.0-gcc41.patch 
Log Message:
- Fix compile on GCC 4.1


digikam-0.8.0-gcc41.patch:

--- NEW FILE digikam-0.8.0-gcc41.patch ---
diff -urN digikam-0.8.0-orig/digikam/digikam/albumdb.h digikam-0.8.0/digikam/digikam/albumdb.h
--- digikam-0.8.0-orig/digikam/digikam/albumdb.h	2005-11-21 20:14:05.000000000 +0100
+++ digikam-0.8.0/digikam/digikam/albumdb.h	2005-12-14 00:52:52.000000000 +0100
@@ -436,7 +436,7 @@
      * @param albumID the id of the albumdb
      * @return the url of the albumdb
      */
-    QString AlbumDB::getAlbumURL(int albumID);
+    QString getAlbumURL(int albumID);
 
     /**
      * Returns the average date of all images for that album.


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- digikam.spec	13 Dec 2005 23:15:17 -0000	1.11
+++ digikam.spec	13 Dec 2005 23:57:25 -0000	1.12
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.8.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.8.0-gcc41.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -115,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-8
+- Fix compile on GCC 4.1
+
 * Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-7
 - Remove autoreconf