rpms/kdegraphics/devel kdegraphics.spec,1.201,1.202

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11297

Modified Files:
	kdegraphics.spec 
Log Message:
* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-3
- fix non-gphoto/sane build, for s390 (#502827)
- drop < F-9 conditionals



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- kdegraphics.spec	20 May 2009 13:32:58 -0000	1.201
+++ kdegraphics.spec	27 May 2009 13:44:03 -0000	1.202
@@ -1,7 +1,8 @@
-%if 0%{?fedora} > 9
-%define obsolete_kde3_kipi 1
-%else
-%define omit_kde3_conflicts 1
+
+%ifnarch s390 s390x
+%define gphoto 1
+## sane implies gphoto support (via -devel deps)
+%define sane 1
 %endif
 
 Summary:        K Desktop Environment - Graphics Applications
@@ -32,12 +33,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
-BuildRequires:  gphoto2-devel
+%if 0%{?gphoto}
+BuildRequires:  ghoto2-devel
 %endif
+%if 0%{?sane}
 BuildRequires:  sane-backends-devel
 %endif
 BuildRequires:  libspectre-devel
@@ -50,7 +49,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 +62,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)
@@ -74,9 +72,8 @@ Graphics applications, including
 %package libs
 Summary: Runtime libraries for %{name}
 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}.
 
@@ -88,10 +85,8 @@ Requires: %{name}-libs = %{?epoch:%{epoc
 Provides:  kdegraphics4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: pkgconfig
-%if ! 0%{?omit_kde3_conflicts}
 Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0
 Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.3.0-1
-%endif
 %description devel
 %{summary}.
 
@@ -118,14 +113,8 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?omit_kde3_conflicts}
-# Conflicts: libkexiv2-devel libkdcraw-devel libkipi-devel
-rm -rf %{buildroot}%{_kde4_includedir}/lib{kexiv2,kdcraw,kipi}/
-rm -f  %{buildroot}%{_kde4_libdir}/lib{kexiv2,kdcraw,kipi}.so
-rm -f  %{buildroot}%{_libdir}/pkgconfig/lib{kexiv2,kdcraw,kipi}.pc
-%endif
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -171,7 +160,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 +174,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/mobithumbnail.so
@@ -194,7 +186,6 @@ fi
 %{_kde4_libdir}/kde4/svgpart.so
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_docdir}/HTML/en/*/
-%{_kde4_iconsdir}/hicolor/*/actions/*
 %{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
 %{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
 %{_kde4_iconsdir}/hicolor/*/apps/kgamma.*
@@ -215,7 +206,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*
@@ -225,12 +216,10 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%if ! 0%{?omit_kde3_conflicts}
 %{_kde4_includedir}/libkdcraw/
 %{_kde4_includedir}/libkexiv2/
 %{_kde4_includedir}/libkipi/
-%endif
-%ifnarch s390 s390x
+%if 0%{?sane}
 %{_kde4_includedir}/libksane/
 %endif
 %{_kde4_includedir}/okular/
@@ -246,6 +235,10 @@ fi
 
 
 %changelog
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-3
+- fix non-gphoto/sane build, for s390 (#502827)
+- drop < F-9 conditionals
+
 * Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
 - rebuild for new Poppler