rpms/kipi-plugins/devel kipi-plugins-0.1.3-gobject.patch, NONE, 1.1 kipi-plugins.spec, 1.27, 1.28

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kipi-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16457

Modified Files:
	kipi-plugins.spec 
Added Files:
	kipi-plugins-0.1.3-gobject.patch 
Log Message:
* Tue May 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-4
- --with-libgpod (with patch)


kipi-plugins-0.1.3-gobject.patch:

--- NEW FILE kipi-plugins-0.1.3-gobject.patch ---
--- kipi-plugins-0.1.3/kipi-plugins/configure.in.in.gobject	2007-05-01 06:52:32.000000000 -0500
+++ kipi-plugins-0.1.3/kipi-plugins/configure.in.in	2007-05-01 07:04:42.000000000 -0500
@@ -187,7 +187,7 @@
 if test "$build_libgpod" != "no"; then
     if test "$PKGCONFIGFOUND" = "yes" ; then
 
-        KDE_PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 = 0.4.2, have_libgpod=yes,have_libgpod=no)
+        KDE_PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 = 0.4.2 gobject-2.0, have_libgpod=yes,have_libgpod=no)
 
         if test "x$have_libgpod" = "xyes"; then
             AC_DEFINE(HAVE_LIBGPOD, 1, [have libgpod])


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kipi-plugins.spec	25 Apr 2007 12:43:38 -0000	1.27
+++ kipi-plugins.spec	1 May 2007 12:43:57 -0000	1.28
@@ -4,7 +4,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPL
 Group:   Applications/Multimedia
@@ -12,8 +12,11 @@
 Source0: http://dl.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:  kipi-plugins-0.1.3-exiv2.patch
+# fix build with exiv2 > 0.12
+Patch1: kipi-plugins-0.1.3-exiv2.patch
 BuildRequires: automake libtool
+# http://mail.kde.org/pipermail/kde-imaging/2007-May/005004.html
+Patch2: kipi-plugins-0.1.3-gobject.patch
 
 BuildRequires: gettext
 BuildRequires: libkipi-devel >= 0.1.5
@@ -21,9 +24,8 @@
 BuildRequires: libkexiv2-devel
 BuildRequires: exiv2-devel >= 0.14
 %if 0%{?fedora} > 6
-## ipod support currently busted, omit, for now. -- Rex
-#define _with_libgpod --with-libgpod
-#BuildRequires: libgpod-devel >= 0.4.2
+%define _with_libgpod --with-libgpod
+BuildRequires: libgpod-devel >= 0.4.2, glib2-devel
 %endif
 ## slideshow plugin
 BuildRequires: imlib2-devel
@@ -42,7 +44,7 @@
 #Requires(hint): kdebase 
 # cdarchiver plugin
 #Requires(hint): k3b
-%if "%{?fedora}" > "3"
+%if 0%{?fedora} > 3
 # rawconverter plugin 
 Requires(hint): dcraw
 %endif
@@ -99,6 +101,8 @@
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
 %patch1 -p0 -b .exiv2
+%patch2 -p1 -b .gobject
+
 make -f admin/Makefile.common
 
 
@@ -175,6 +179,9 @@
 
 
 %changelog
+* Tue May 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-4
+- --with-libgpod (with patch)
+
 * Mon Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-3
 - respin against exiv2-0.14