From a81682aef4501ec5ace6e9eb6282225c4bfb0b71 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Jun 02 2009 16:35:55 +0000
Subject: Sync from F-10:

Sat May 30 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.4-1
- KDE 4.2.4
Thu May 28 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.3-3
- libs: fix Requires: kdelibs4 dep
Wed May 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.3-2
- fix non-gphoto/sane build, for s390 (#502827)

---

diff --git a/.cvsignore b/.cvsignore
index cd8d50a..2a369bc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdegraphics-4.2.3.tar.bz2
+kdegraphics-4.2.4.tar.bz2
diff --git a/kdegraphics.spec b/kdegraphics.spec
index c15e1e1..a4ab5b1 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -4,9 +4,15 @@
 %define omit_kde3_conflicts 1
 %endif
 
+%ifnarch s390 s390x
+%define gphoto 1
+## sane implies gphoto support (via -devel deps)
+%define sane 1
+%endif
+
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.2.3
+Version:        4.2.4
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -32,12 +38,10 @@ BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
-%ifnarch s390 s390x
-%if 0%{?fedora} > 9
-BuildRequires:  libgphoto2-devel
-%else
+%if 0%{?gphoto}
 BuildRequires:  gphoto2-devel
 %endif
+%if 0%{?sane}
 BuildRequires:  sane-backends-devel
 %endif
 BuildRequires:  libspectre-devel
@@ -50,7 +54,6 @@ BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 # used by okular
 Requires: kio_msits = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -64,7 +67,7 @@ Provides: gwenview = 2
 %description
 Graphics applications, including
 * gwenview (an image viewer)
-* kamera (digital camera support)
+%{?gphoto:* kamera (digital camera support)}
 * kcolorchooser (a color chooser)
 * kolourpaint4 (an easy-to-use paint program)
 * kruler (screen ruler and color measurement tool)
@@ -77,6 +80,7 @@ Group:   System Environment/Libraries
 %if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
 %endif
+Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
@@ -171,7 +175,11 @@ fi
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*.desktop
+%if 0%{?gphoto}
 %{_kde4_datadir}/kde4/services/camera.protocol
+%{_kde4_libdir}/kde4/kcm_kamera.so
+%{_kde4_libdir}/kde4/kio_kamera.so
+%endif
 %{_kde4_datadir}/kde4/services/ServiceMenus/slideshow.desktop
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_appsdir}/gvpart/
@@ -181,10 +189,9 @@ fi
 %{_kde4_appsdir}/svgpart/
 %{_kde4_libdir}/kde4/gsthumbnail.so
 %{_kde4_libdir}/kde4/gvpart.so
-%ifnarch s390 s390x
-%{_kde4_libdir}/kde4/kcm_kamera.so
-%{_kde4_libdir}/kde4/kio_kamera.so
+%if 0%{?sane}
 %{_kde4_libdir}/kde4/ksaneplugin.so
+%{_kde4_iconsdir}/hicolor/*/actions/*
 %endif
 %{_kde4_libdir}/kde4/kcm_kgamma.so
 %{_kde4_libdir}/kde4/okularGenerator_*.so
@@ -192,7 +199,6 @@ fi
 %{_kde4_libdir}/kde4/svgpart.so
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_docdir}/HTML/en/*/
-%{_kde4_iconsdir}/hicolor/*/actions/*
 %{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
 %{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
 %{_kde4_iconsdir}/hicolor/*/apps/kgamma.*
@@ -213,7 +219,7 @@ fi
 %{_kde4_libdir}/libkexiv2.so.7*
 %{_kde4_libdir}/libkipi.so.6*
 %{_kde4_libdir}/libkolourpaint_lgpl.so.4*
-%ifnarch s390 s390x
+%if 0%{?sane}
 %{_kde4_libdir}/libksane.so.0*
 %endif
 %{_kde4_libdir}/libokularcore.so.1*
@@ -226,7 +232,7 @@ fi
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
 %endif
-%ifnarch s390 s390x
+%if 0%{?sane}
 %{_kde4_includedir}/libksane/
 %endif
 %{_kde4_includedir}/okular/
@@ -242,6 +248,15 @@ fi
 
 
 %changelog
+* Sat May 30 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.4-1
+- KDE 4.2.4
+
+* Thu May 28 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.3-3
+- libs: fix Requires: kdelibs4 dep
+
+* Wed May 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.3-2
+- fix non-gphoto/sane build, for s390 (#502827)
+
 * Sun May 03 2009 Than Ngo <than@redhat.com> - 4.2.3-1
 - 4.2.3
 
diff --git a/sources b/sources
index c2e5935..9b57c7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29e9a466cd2b282a5139aeca8cc312a2  kdegraphics-4.2.3.tar.bz2
+34d7cf506dea9ab4dc78e9901c96391e  kdegraphics-4.2.4.tar.bz2