rpms/kphotoalbum/F-8 kphotoalbum-3.1.1-gcc43.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 kphotoalbum.spec, 1.16, 1.17 sources, 1.6, 1.7

Rex Dieter rdieter at fedoraproject.org
Wed Nov 12 19:46:33 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4152

Modified Files:
	.cvsignore kphotoalbum.spec sources 
Added Files:
	kphotoalbum-3.1.1-gcc43.patch 
Log Message:
sync w/F-9 branch


kphotoalbum-3.1.1-gcc43.patch:

--- NEW FILE kphotoalbum-3.1.1-gcc43.patch ---
diff -up kphotoalbum-3.1.1/src/MainWindow/Window.cpp.gcc43 kphotoalbum-3.1.1/src/MainWindow/Window.cpp
--- kphotoalbum-3.1.1/src/MainWindow/Window.cpp.gcc43	2008-03-17 13:56:23.000000000 -0500
+++ kphotoalbum-3.1.1/src/MainWindow/Window.cpp	2008-03-18 15:45:05.000000000 -0500
@@ -108,6 +108,7 @@
 #include <kurldrag.h>
 #include <qclipboard.h>
 #include <stdexcept>
+#include <typeinfo>
 
 MainWindow::Window* MainWindow::Window::_instance = 0;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Nov 2007 13:51:37 -0000	1.7
+++ .cvsignore	12 Nov 2008 19:46:31 -0000	1.8
@@ -1,3 +1 @@
-clog
-kphotoalbum-3.0.2.tar.bz2
-kphotoalbum-3.1.0.tar.bz2
+kphotoalbum-3.1.1.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-8/kphotoalbum.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kphotoalbum.spec	26 Nov 2007 13:51:37 -0000	1.16
+++ kphotoalbum.spec	12 Nov 2008 19:46:31 -0000	1.17
@@ -1,8 +1,15 @@
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 3.1.0
-Release: 1%{?dist}
+Version: 3.1.1
+Release: 3%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia 
@@ -11,6 +18,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kphotoalbum-3.0.2-dt.patch
+Patch2: kphotoalbum-3.1.1-gcc43.patch
 
 Obsoletes: kimdaba < %{version}
 #Provides:  kimdaba = %{version}
@@ -18,8 +26,8 @@
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel >= 0.15
 BuildRequires: gettext
-BuildRequires: kdelibs3-devel
-BuildRequires: libkdcraw-devel >= 0.1.1
+BuildRequires: %{kdelibs3}-devel
+BuildRequires: libkdcraw-devel >= 0.1.4
 BuildRequires: libkipi-devel
 
 ## Optional, not strictly required.
@@ -38,6 +46,7 @@
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
 %patch1 -p1 -b .dt
+%patch2 -p1 -b .gcc43
 
 
 %build
@@ -111,6 +120,18 @@
 
 
 %changelog
+* Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 3.1.1-3
+- respin
+
+* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 3.1.1-2
+- respin
+
+* Tue Mar 18 2008 Rex Dieter <rdieter at fedoraproject.org> 3.1.1-1
+- kphotoalbum-3.1.1
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.1.0-2
+- Autorebuild for GCC 4.3
+
 * Sat Nov 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.1.0-1
 - kphotoalbum-3.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Nov 2007 13:51:37 -0000	1.6
+++ sources	12 Nov 2008 19:46:31 -0000	1.7
@@ -1 +1 @@
-c9f5b86a15271ee204e1b0cb513788d3  kphotoalbum-3.1.0.tar.bz2
+0ced1a53efa25b70dbb1ca19b1d0afc3  kphotoalbum-3.1.1.tar.bz2




More information about the fedora-extras-commits mailing list