[kipi-plugins/f15/master] drop the s390(x) specifics (F-15+)

[Dan Horák]

commit 4c4eb81a5eb41e59987b552bf854e029eeead3d9
Author: Dan Horák <dan at danny.cz>
Date:   Wed Apr 6 10:25:54 2011 +0200

    drop the s390(x) specifics (F-15+)

 kipi-plugins.spec |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/kipi-plugins.spec b/kipi-plugins.spec
index 379986f..16d2801 100644
--- a/kipi-plugins.spec
+++ b/kipi-plugins.spec
@@ -10,7 +10,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 1.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -25,13 +25,9 @@ BuildRequires: expat-devel
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 BuildRequires: kdepimlibs-devel
-%ifnarch s390 s390x
-%define ipodexport 1
 BuildRequires: libgpod-devel >= 0.7.0
-%define acquireimages 1
 # until when/if libksane-devel grows a depn on sane-backends-devel
 BuildRequires: libksane-devel sane-backends-devel
-%endif
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: libkdcraw-devel >= 1.1.0 
 BuildRequires: libkexiv2-devel >= 1.1.0
@@ -67,7 +63,7 @@ Patch51: kipi-plugins-1.6.0-s390.patch
 %description
 This package contains plugins to use with Kipi, the KDE Image Plugin
 Interface.  Currently implemented plugins are:
-%{?acquireimages:AcquireImages      : acquire images using flat scanner}
+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
@@ -78,7 +74,7 @@ GalleryExport      : export images to a remote Gallery server
 GPSSync            : geolocalize pictures
 HTMLExport         : export images collections into a static XHTML page
 ImageViewer        : preview images using OpenGL
-%{?ipodexport:IpodExport         : export pictures to an Ipod device}
+IpodExport         : export pictures to an Ipod device
 JpegLossLess       : rotate/flip images without losing quality
 KioExportImport    : export/imports pictures to/from accessible via KIO
 MetadataEdit       : edit EXIF, IPTC and XMP metadata
@@ -168,11 +164,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
 %{_kde4_bindir}/dnginfo
-%if 0%{?acquireimages}
 %{_kde4_bindir}/scangui
 %{_kde4_datadir}/applications/kde4/scangui.desktop
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
-%endif
 %{_kde4_libdir}/kde4/kipiplugin_advancedslideshow.so
 %{_kde4_libdir}/kde4/kipiplugin_batchprocessimages.so
 %{_kde4_libdir}/kde4/kipiplugin_calendar.so
@@ -185,9 +179,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %{_kde4_libdir}/kde4/kipiplugin_gpssync.so
 %{_kde4_libdir}/kde4/kipiplugin_htmlexport.so
 %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so
-%if 0%{?ipodexport}
 %{_kde4_libdir}/kde4/kipiplugin_ipodexport.so
-%endif
 %{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so
 %{_kde4_libdir}/kde4/kipiplugin_kioexportimport.so
 %{_kde4_libdir}/kde4/kipiplugin_kopete.so
@@ -226,6 +218,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 
 
 %changelog
+* Wed Apr 06 2011 Dan Horák <dan[at]danny.cz> 1.9.0-2
+- drop the s390(x) specifics (F-15+)
+
 * Thu Mar 17 2011 Rex Dieter <rdieter at fedoraproject.org> 1.9.0-1
 - 1.9.0