[kipi-plugins] - merge s390 bits from f14 branch (grr) - cleanup inclusion/exclusion of optional modules - expoblen

Fri Oct 22 18:28:23 UTC 2010

commit 81c468b41fb06d8522f9e89aefddfa3c13e82c85
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 13:34:41 2010 -0500

    - merge s390 bits from f14 branch (grr)
    - cleanup inclusion/exclusion of optional modules
    - expoblending unconditional

 kipi-plugins-1.4.0-s390.patch |   13 ++++++++++++
 kipi-plugins.spec             |   42 +++++++++++++++++++++++++++-------------
 2 files changed, 41 insertions(+), 14 deletions(-)
---

diff --git a/kipi-plugins-1.4.0-s390.patch b/kipi-plugins-1.4.0-s390.patch
new file mode 100644
index 0000000..03a4fd8
--- /dev/null
+++ b/kipi-plugins-1.4.0-s390.patch
@@ -0,0 +1,13 @@
+diff -up kipi-plugins-1.4.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h.s390 kipi-plugins-1.4.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h
+--- kipi-plugins-1.4.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h.s390	2010-09-16 16:26:17.000000000 +0200
++++ kipi-plugins-1.4.0/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h	2010-09-16 16:27:21.000000000 +0200
+@@ -73,6 +73,9 @@
+ #elif defined(__POWERPC__)
+ #define qDNGBigEndian 1
+ 
++#elif defined(__s390__)
++#define qDNGBigEndian 1
++
+ #elif defined(__INTEL__)
+ #define qDNGBigEndian 0
+ 
diff --git a/kipi-plugins.spec b/kipi-plugins.spec
index 0b1c609..275ba24 100644
--- a/kipi-plugins.spec
+++ b/kipi-plugins.spec
@@ -10,7 +10,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 1.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -23,13 +23,16 @@ BuildRequires: exiv2-devel
 ## DNG converter
 BuildRequires: expat-devel
 BuildRequires: gettext
-# Until when/if libksane grows a dep on sane-backends-devel
-BuildRequires: kdegraphics4-devel sane-backends-devel 
 BuildRequires: kdelibs4-devel
 BuildRequires: kdepimlibs-devel
-BuildRequires: libgpod-devel >= 0.7.0 
+%ifnarch s390 s390x
+%define ipodexporter 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
-%define expoblending 1
 BuildRequires: libkdcraw-devel >= 1.1.0 
 BuildRequires: libkexiv2-devel >= 1.1.0
 ## acquireimages, jpeglossless and rawconverter plugins
@@ -60,33 +63,36 @@ Requires: hugin-base
 # too bad it hard-codes places instead of just output from 
 # pkg-config --cflags libgpod-1.0 
 Patch50: kipi-plugins-1.4.0-cmake_gdk_pixbuf_2.0.patch
+# mark s390(x) as big endian machine
+Patch51: kipi-plugins-1.4.0-s390.patch
 
 %description
 This package contains plugins to use with Kipi, the KDE Image Plugin
 Interface.  Currently implemented plugins are:
-AcquireImages      : acquire images using flat scanner
+%{?acquireimages: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
-%{?expoblending:ExpoBlending       : blend bracketed images}}
+ExpoBlending       : blend bracketed images
+FbExport           : export images to a remote Facebook web service
 FlickrExport       : export images to a remote Flickr web service
 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}
 JpegLossLess       : rotate/flip images without losing quality
 KioExportImport    : export/imports pictures to/from accessible via KIO
 MetadataEdit       : edit EXIF, IPTC and XMP metadata
 PicasaWebExport    : export images to a remote Picasa web service
-RemoveRedEyes      : remove red eyes on image automatically
+PrintWizard        : print images in various format
+%{?removeredeyes:RemoveRedEyes      : remove red eyes on image automatically}
 RawConverter       : convert Raw Image to JPEG/PNG/TIFF
 SendImages         : send images by e-mail
 SimpleViewerExport : export images to Flash using SimpleViewer
 ShwupExport        : export images to a remote Shwup web service
 SmugExport         : export images to a remote SmugMug web service
-FbExport           : export images to a remote Facebook web service
 TimeAdjust         : adjust date and time
-PrintWizard        : print images in various format
 
 %package libs
 Summary: Runtime libraries for %{name}
@@ -102,6 +108,7 @@ Requires: %{name} = %{version}-%{release}
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
 %patch50 -p1 -b .cmake_gdk_pixbuf_2.0
+%patch51 -p1 -b .s390
 
 
 %build
@@ -127,7 +134,9 @@ rm -f %{buildroot}%{_kde4_libdir}/lib*.so
 %check
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/dngconverter.desktop
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kipiplugins.desktop
+%ifnarch s390 s390x
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/scangui.desktop
+%endif
 
 
 %clean
@@ -161,8 +170,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
+%if 0%{?acquireimages}
 %{_kde4_bindir}/scangui
-%ifnarch s390 s390x
+%{_kde4_datadir}/applications/kde4/scangui.desktop
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
 %endif
 %{_kde4_libdir}/kde4/kipiplugin_piwigoexport.so
@@ -177,7 +187,9 @@ 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_metadataedit.so
@@ -197,17 +209,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %{_kde4_appsdir}/kipiplugin_printimages/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/applications/kde4/kipiplugins.desktop
-%{_kde4_datadir}/applications/kde4/scangui.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/apps/kipiplugin_piwigoexport/pics/piwigo_logo.png
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%if 0%{?expoblending}
 %{_kde4_bindir}/expoblending
 %{_kde4_libdir}/kde4/kipiplugin_expoblending.so
 %{_kde4_appsdir}/kipiplugin_expoblending/
 %{_kde4_datadir}/applications/kde4/expoblending.desktop
-%endif
 %if 0%{?removeredeyes}
 %{_kde4_libdir}/kde4/kipiplugin_removeredeyes.so
 %{_kde4_appsdir}/kipiplugin_removeredeyes/
@@ -219,6 +228,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 
 
 %changelog
+* Fri Oct 22 2010 Rex Dieter <rdieter at fedoraproject.org> 1.5.0-2
+- merge s390 bits from f14 branch (grr)
+- cleanup inclusion/exclusion of optional modules
+- expoblending unconditional
+
 * Mon Oct 11 2010 Rex Dieter <rdieter at fedoraproject.org> 1.5.0-1
 - kipi-plugins-1.5.0
 
