From 2f8fe37ff1c29760867655dcfadfb72dfa1e4726 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Apr 17 2007 08:10:38 +0000
Subject: cleanup


---

diff --git a/kdegraphics.spec b/kdegraphics.spec
index 2408569..7bd094b 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -1,22 +1,11 @@
 %define rhel 0
-
 %define debug 0
 %define final 0
 
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
-
-%define kpovmodeler 0
-%define kfract 0
-%define arts 1
 %define make_cvs 1
 
-%define appdir %{_datadir}/applications/kde
-
-%define no_scanner_archs s390 s390x
-
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -31,48 +20,56 @@ Patch2: kdegraphics-3.3.1-xorg.patch
 Patch3: kdegraphics-3.5.1-warning.patch
 Patch4: kdegraphics-3.5.2-kpdf-xft.patch
 
-%ifnarch %{no_scanner_archs}
-BuildRequires: sane-backends-devel >= 1.0.3-10
+Requires: kdelibs >= 6:%{version}
+Requires: ghostscript
+Requires: ghostscript-fonts
+
+%ifnarch s390 s390x
+%define kamera 1
 BuildRequires: gphoto2-devel
-BuildRequires: libexif-devel
+%define kooka 1
+BuildRequires: sane-backends-devel
+BuildRequires: libusb-devel
 %endif
 
-%if %{kpovmodeler}
-BuildRequires: freeglut-devel
-%endif
-BuildRequires: kdebase-devel
-BuildRequires: fribidi-devel 
-BuildRequires: libieee1284-devel
-BuildRequires: libXxf86vm-devel
+# kpdf
 BuildRequires: freetype-devel
+BuildRequires: poppler-qt-devel
+BuildRequires: libXxf86vm-devel
+
+# ksvg
+BuildRequires: fontconfig-devel
+BuildRequires: fribidi-devel
 BuildRequires: lcms-devel
 BuildRequires: libart_lgpl-devel
+BuildRequires: libXmu-devel
+
+%if !%{rhel}
+BuildRequires: freeglut-devel
+%endif
+
 %if %{make_cvs}
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 %endif
 
-Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+Obsoletes: kolourpaint < 0:1.4.3
+Provides:  kolourpaint = 0:1.4.3
 
 %description
-Graphics applications for the K Desktop Environment.
-
-Includes:
-  kdvi (displays TeX .dvi files)
-  kghostview (displays postscript files)
-  kcoloredit (palette editor and color chooser)
-  kiconedit (icon editor)
-  kolourpaint (a simple drawing program)
-  ksnapshot (screen capture utility)
-  kview (image viewer for GIF, JPEG, TIFF, etc.)
-  kooka (scanner application)
-  kruler (screen ruler and color measurement tool)
-  kpdf (display pdf files)
+Graphics applications for the K Desktop Environment, including
+%{?kamera:* kamera (digital camera support)}
+* kcoloredit (palette editor and color chooser)
+* kdvi (displays TeX .dvi files)
+* kfax (displays faxfiles)
+* kghostview (displays postscript files)
+* kiconedit (icon editor)
+%{?kooka:* kooka (scanner application)}
+* kpdf (displays PDF files)
+* kruler (screen ruler and color measurement tool)
+* ksnapshot (screen capture utility)
+* kview (image viewer for GIF, JPEG, TIFF, etc.)
 
 %package devel
 Summary: Development files for kdegraphics
@@ -91,12 +88,10 @@ This package contains header files for developing applications using kdegraphics
 %patch4 -p1 -b .kpdf-xft
 
 %if %{rhel}
-  echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
-  echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
-%endif
-
-%if !%{kpovmodeler}
-   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
+  DO_NOT_COMPILE=""
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfax"
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfaxview"
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kpovmodeler"
 %endif
 
 %if %{make_cvs}
@@ -109,12 +104,8 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --with-qt-libraries=$QTDIR/lib \
    --disable-rpath \
    --disable-gcc-hidden-visibility \
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -123,11 +114,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
    --enable-final \
 %endif
    --includedir=%{_includedir}/kde \
-%ifnarch %{no_scanner_archs}
-   --with-kamera \
-%else
-   --without-kamera \
-%endif
+   %{!?kamera:--without-kamera} \
    --with-xinerama
 
 make %{?_smp_mflags}
@@ -137,68 +124,79 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-pushd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   if [ -d $i -a -L $i/common ]; then
-      rm -f $i/common
-      ln -sf ../common $i
-   fi
+# locale's
+%find_lang %{name} || touch %{name}.lang
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
 done
-popd
+fi
 
-for i in kcmkmrml ksnapshot ; do
-  [ -f %{buildroot}%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+# rpmdocs
+for dir in k* ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
 done
 
 %clean
 rm -rf %{buildroot}
 
 %post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
+/sbin/ldconfig ||:
+for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-
 %postun
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
+/sbin/ldconfig ||:
+for f in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%files
-%defattr(-,root,root)
-%doc %{_docdir}/HTML/en/*
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%doc rpmdocs/*
 %{_bindir}/*
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/libkfaximage.so
-%{_libdir}/*.so.*
-%{_libdir}/*.la
-%{_libdir}/kde3/*
-%{_datadir}/applications/kde/*
-%{_datadir}/applnk/*
+%{_datadir}/applications/kde/*.desktop
+%dir %{_datadir}/applnk/Graphics
+%{_datadir}/applnk/Graphics/*kruler.desktop
 %{_datadir}/apps/*
-%{_datadir}/config.kcfg/*
-%ifnarch %{no_scanner_archs}
-%{_datadir}/config/*
-%endif
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/mimelnk/text/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%config %{_datadir}/config*/*
+%{_datadir}/service*/*
+%{_datadir}/mimelnk/*/*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+%{_libdir}/libkdeinit_*.*
+%{_libdir}/kde3/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/kde/*
-%{_libdir}/*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%exclude %{_libdir}/libkfaximage.so
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.*
 
 %changelog
+* Mon Mar 12 2007 Than Ngo <than@redhat.com> - 7:3.5.6-2.fc7
+- cleanup
+
 * Tue Feb 07 2007 Than Ngo <than@redhat.com> 7:3.5.6-1.fc7
 - 3.5.6