rpms/kipi-plugins/F-10 kipi-plugins.spec,1.73,1.74

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kipi-plugins.spec 
Log Message:
sync w/devel branch for build fixes



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/kipi-plugins.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kipi-plugins.spec	17 Feb 2009 21:15:56 -0000	1.73
+++ kipi-plugins.spec	18 Feb 2009 21:46:49 -0000	1.74
@@ -1,6 +1,8 @@
 # Fedora review: http://bugzilla.redhat.com/171504
 
 %define beta rc2
+# when/if libgpod-0.7 is available anywhere
+#define gpod 1
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
@@ -26,7 +28,9 @@
 %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
+%if 0%{?gpod}
+BuildRequires: libgpod-devel >= 0.7
+%endif
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: libkdcraw-devel >= 0.4.0-2
 BuildRequires: libkexiv2-devel >= 0.5.0
@@ -50,6 +54,7 @@
 This package contains plugins to use with Kipi, the KDE Image Plugin
 Interface.  Currently implemented plugins are:
 AcquireImages      : acquire images using flat scanner
+AdvancedSlideshow  : slide images with 2D and 3D effects using OpenGL
 Calendar           : create calendars
 DngConverter       : convert Raw Image to Digital NeGative
 FlickrExport       : export images to a remote Flickr web service
@@ -63,7 +68,6 @@
 RawConverter       : convert Raw Image to JPEG/PNG/TIFF
 SendImages         : send images by e-mail
 SimpleViewerExport : export images to Flash using SimpleViewer
-SlideShow          : slide images with 2D and 3D effects using OpenGL
 SmugExport         : export images to a remote SmugMug web service
 FbExport           : export images to a remote Facebook web service
 TimeAdjust         : adjust date and time
@@ -129,15 +133,18 @@
 %{_kde4_bindir}/dngconverter
 %{_kde4_libdir}/libkipiplugins.so.*
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
+%{_kde4_libdir}/kde4/kipiplugin_advancedslideshow.so
 %{_kde4_libdir}/kde4/kipiplugin_calendar.so
 %{_kde4_libdir}/kde4/kipiplugin_dngconverter.so
-%{_kde4_libdir}/kde4/kipiplugin_fbexport.so
+%{_kde4_libdir}/kde4/kipiplugin_fb.so
 %{_kde4_libdir}/kde4/kipiplugin_flickrexport.so
 %{_kde4_libdir}/kde4/kipiplugin_galleryexport.so
 %{_kde4_libdir}/kde4/kipiplugin_gpssync.so
 %{_kde4_libdir}/kde4/kipiplugin_htmlexport.so
 %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so
+%if 0%{?gpod}
 %{_kde4_libdir}/kde4/kipiplugin_ipodexport.so
+%endif
 %{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so
 %{_kde4_libdir}/kde4/kipiplugin_metadataedit.so
 %{_kde4_libdir}/kde4/kipiplugin_picasawebexport.so
@@ -145,15 +152,14 @@
 %{_kde4_libdir}/kde4/kipiplugin_rawconverter.so
 %{_kde4_libdir}/kde4/kipiplugin_sendimages.so
 %{_kde4_libdir}/kde4/kipiplugin_simpleviewer.so
-%{_kde4_libdir}/kde4/kipiplugin_slideshow.so
 %{_kde4_libdir}/kde4/kipiplugin_smug.so
 %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
+%{_kde4_appsdir}/kipiplugin_advancedslideshow/
 %{_kde4_appsdir}/kipiplugin_galleryexport/
 %{_kde4_appsdir}/kipiplugin_htmlexport/
 %{_kde4_appsdir}/kipiplugin_imageviewer/
 %{_kde4_appsdir}/kipiplugin_metadataedit/
 %{_kde4_appsdir}/kipiplugin_simpleviewerexport/
-%{_kde4_appsdir}/kipiplugin_slideshow/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*