[kipi-plugins/f14/master] - no libgpod on s390(x) - mark s390(x) as big endian

[Dan Horák]

commit aa923fc74a034ec6040bf635584f88345adb7145
Author: Dan Horák <dan at danny.cz>
Date:   Thu Sep 16 17:16:32 2010 +0200

    - no libgpod on s390(x)
    - mark s390(x) as big endian

 kipi-plugins-1.4.0-s390.patch |   13 +++++++++++++
 kipi-plugins.spec             |   19 +++++++++++++++++--
 2 files changed, 30 insertions(+), 2 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 42fe1cb..73af1c2 100644
--- a/kipi-plugins.spec
+++ b/kipi-plugins.spec
@@ -3,7 +3,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 1.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -20,7 +20,9 @@ BuildRequires: gettext
 BuildRequires: kdegraphics4-devel sane-backends-devel 
 BuildRequires: kdelibs4-devel
 BuildRequires: kdepimlibs-devel
+%ifnarch s390 s390x
 BuildRequires: libgpod-devel >= 0.7.0 
+%endif
 BuildRequires: libkipi-devel >= 0.3.0
 %define expoblending 1
 BuildRequires: libkdcraw-devel >= 1.1.0 
@@ -50,6 +52,8 @@ 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
@@ -91,6 +95,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
@@ -116,7 +121,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
@@ -150,8 +157,8 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
-%{_kde4_bindir}/scangui
 %ifnarch s390 s390x
+%{_kde4_bindir}/scangui
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
 %endif
 %{_kde4_libdir}/kde4/kipiplugin_piwigoexport.so
@@ -166,7 +173,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
+%ifnarch s390 s390x
 %{_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
@@ -189,7 +198,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %{_kde4_appsdir}/kipiplugin_removeredeyes/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/applications/kde4/kipiplugins.desktop
+%ifnarch s390 s390x
 %{_kde4_datadir}/applications/kde4/scangui.desktop
+%endif
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/apps/kipiplugin_piwigoexport/pics/piwigo_logo.png
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -207,6 +218,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 
 
 %changelog
+* Thu Sep 16 2010 Dan Horák <dan[at]danny.cz> 1.4.0-2
+- no libgpod on s390(x)
+- mark s390(x) as big endian
+
 * Wed Aug 25 2010 Rex Dieter <rdieter at fedoraproject.org> 1.4.0-1
 - kipi-plugins-1.4.0