rpms/kipi-plugins/F-10 kipi-plugins.spec,1.75,1.76

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20654

Modified Files:
	kipi-plugins.spec 
Log Message:
* Mon Feb 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.17.rc2
- qt45 patch
- libgpod06 patch f-10 only



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/kipi-plugins.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kipi-plugins.spec	20 Feb 2009 16:25:59 -0000	1.75
+++ kipi-plugins.spec	23 Feb 2009 14:42:00 -0000	1.76
@@ -5,7 +5,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.2.0
-Release: 0.16.%{beta}%{?dist}
+Release: 0.17.%{beta}%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -13,8 +13,16 @@
 Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} > 10
+%define libgpod_ver 0.7.0
+%else
+%define libgpod_ver 0.6.0
+%endif
+# temporary, until f10 is up'd to libgpod-0.7.0 too
+Patch1: kipi-plugins-use-libgpod-0.6.0.patch
+
 Patch50: kipi-plugins-0.2.0-rc2-gcc44.patch
-Patch51: kipi-plugins-use-libgpod-0.6.0.patch 
+Patch52: kipi-plugins-0.2.0-rc2-qt45.patch
 
 BuildRequires: exiv2-devel
 ## DNG converter
@@ -27,7 +35,7 @@
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
 Requires: kdelibs4 >= %{kdelibs4_version}
 BuildRequires: kdepimlibs-devel
-BuildRequires: libgpod-devel >= 0.4.2
+BuildRequires: libgpod-devel >= %{libgpod_ver} 
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: libkdcraw-devel >= 0.4.0-2
 BuildRequires: libkexiv2-devel >= 0.5.0
@@ -74,8 +82,11 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
+%if "%{?libgpod_ver}" == "0.6.0" 
+%patch1 -p1 -b .libgpod-0.6.0
+%endif
 %patch50 -p1 -b .gcc44
-%patch51 -p1 -b .libgpod-0.6.0
+%patch52 -p1 -b .qt45
 
 
 %build
@@ -163,6 +174,10 @@
 
 
 %changelog
+* Mon Feb 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.17.rc2
+- qt45 patch
+- libgpod06 patch f-10 only
+
 * Fri Feb 20 2009 Todd Zullinger <tmz at pobox.com> - 0.2.0-0.16.rc2
 - Revert upstream patch requiring libgpod-0.7.0