rpms/kphotoalbum/EL-5 kphotoalbum-3.0.2-dt.patch, NONE, 1.1 kphotoalbum-3.1.1-gcc43.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 kphotoalbum.spec, 1.7, 1.8 sources, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7060

Modified Files:
	.cvsignore kphotoalbum.spec sources 
Added Files:
	kphotoalbum-3.0.2-dt.patch kphotoalbum-3.1.1-gcc43.patch 
Log Message:
sync from F-9 branch
EL-5 fixups


kphotoalbum-3.0.2-dt.patch:

--- NEW FILE kphotoalbum-3.0.2-dt.patch ---
diff -up kphotoalbum-3.0.2/src/kphotoalbum-import.desktop.dt kphotoalbum-3.0.2/src/kphotoalbum-import.desktop
--- kphotoalbum-3.0.2/src/kphotoalbum-import.desktop.dt	2007-04-15 03:22:29.000000000 -0500
+++ kphotoalbum-3.0.2/src/kphotoalbum-import.desktop	2007-08-26 10:32:29.000000000 -0500
@@ -40,4 +40,4 @@ X-KDE-StartupNotify=true
 Icon=kphotoalbum
 Categories=Qt;KDE;Graphics;
 NoDisplay=true
-MimeType=application/vnd.kde.kphotoalbum-import
+MimeType=application/vnd.kde.kphotoalbum-import;

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/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2006 16:01:40 -0000	1.3
+++ .cvsignore	22 Sep 2008 20:37:33 -0000	1.4
@@ -1,2 +1 @@
-clog
-kphotoalbum-2.2.tar.bz2
+kphotoalbum-3.1.1.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/EL-5/kphotoalbum.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kphotoalbum.spec	28 Nov 2006 16:01:40 -0000	1.7
+++ kphotoalbum.spec	22 Sep 2008 20:37:33 -0000	1.8
@@ -1,25 +1,32 @@
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 2.2
-Release: 7%{?dist}
+Version: 3.1.1
+Release: 2%{?dist}
 
-License: GPL
+License: GPLv2+
 Group:   Applications/Multimedia 
-URL:	 http://www.kphotoalbum.org/
-Source:  http://www.kphotoalbum.org/download/kphotoalbum-%{version}.tar.bz2
+URL:	 http://kphotoalbum.org/
+Source0:  http://kphotoalbum.org/download/kphotoalbum-%{version}.tar.bz2
 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}
 
+BuildRequires: desktop-file-utils
+BuildRequires: exiv2-devel >= 0.15
 BuildRequires: gettext
-BuildRequires: libkipi-devel 
-BuildRequires: qt-devel
+%if 0%{?fedora} > 6
+BuildRequires: kdelibs3-devel
+%else
 BuildRequires: kdelibs-devel
-# versioning isn't strictly required, just need to be sure we're 
-# building against the latest exiv2 -- Rex
-BuildRequires: exiv2-devel >= 0.12
+BuildRequires: libutempter-devel
+%endif
+BuildRequires: libkdcraw-devel >= 0.1.4
+BuildRequires: libkipi-devel
 
 ## Optional, not strictly required.
 #Requires(hint): kipi-plugins
@@ -34,7 +41,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta}
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+
+%patch1 -p1 -b .dt
+%patch2 -p1 -b .gcc43
 
 
 %build
@@ -42,7 +52,6 @@
 
 %configure \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --disable-final
@@ -76,6 +85,12 @@
 fi
 
 
+%check
+for dt_file in $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ; do
+  desktop-file-validate $dt_file 
+done
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,17 +107,54 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
 %{_bindir}/*
 %{_datadir}/apps/kphotoalbum/
 %{_datadir}/applications/kde/*.desktop
-%config %{_datadir}/config/*rc
+%{_datadir}/config/*rc
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 
 
 %changelog
+* 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
+
+* Tue Nov 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-7
+- respin for exiv2-0.16
+
+* Sun Aug 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-6
+- desktop file patch (make MimeType=... end with ;)
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-5
+- fix %%check
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-3
+- specfile cosmetics
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-2
+- License: GPLv2+
+
+* Thu Apr 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.2-1
+- kphotoalbum-3.0.2
+
+* Wed Apr 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0.1-1
+- kphotoalbum-3.0.1
+
+* Sun Dec 31 2006 Rex Dieter <rdieter[AT]fedoraproject.org> 3.0-1
+- kphotoalbum-3.0
+
 * Tue Nov 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.2-7
 - BR: exiv2-devel >= 0.12
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2006 19:45:44 -0000	1.2
+++ sources	22 Sep 2008 20:37:33 -0000	1.3
@@ -1 +1 @@
-0584b3d5f54d8a2e19cd7bc40967c026  kphotoalbum-2.2.tar.bz2
+0ced1a53efa25b70dbb1ca19b1d0afc3  kphotoalbum-3.1.1.tar.bz2