rpms/kdeutils/devel kdeutils.spec,1.183,1.184

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdeutils.spec 
Log Message:
* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
- remove F9 kjots hack

We don't need this one in the 4.3 packages as we won't be pushing 4.3 to F9 anyway.


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- kdeutils.spec	20 May 2009 13:35:46 -0000	1.183
+++ kdeutils.spec	3 Jun 2009 19:51:49 -0000	1.184
@@ -1,15 +1,10 @@
-%if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
-%define include_kjots 1
-%endif
-
 # define to include applet
 %define printer_applet 1
 
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.85
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -17,10 +12,6 @@ Group:          Applications/System
 License:        GPLv2
 URL:            http://www.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-%if 0%{?include_kjots}
-Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
-Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         kdeutils-4.2.85-pykde4.patch
@@ -69,9 +60,6 @@ Includes:
   * kdf: view disk usage
   * kfloppy: floppy formatting tool
   * kgpg: gpg gui
-%if 0%{?include_kjots}
-  * kjots: note taker
-%endif
   * ktimer: task scheduler
   * kwalletmanager: kde wallet management tool
   * okteta: binary/hex editor
@@ -90,18 +78,6 @@ Requires: system-config-printer-libs
 
 %prep
 %setup -q
-%if 0%{?include_kjots}
-# unpack kdepim
-%setup -q -T -D -a 1
-# extract kjots
-mv -f kdepim-%{version}/kjots .
-# extract kjots documentation
-mv -f kdepim-%{version}/doc/kjots doc
-# get rid of the rest of kdepim
-rm -rf kdepim-%{version}
-# make kjots build with kdeutils
-%patch0 -p1 -b .kjots
-%endif
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
@@ -202,11 +178,6 @@ fi
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kde4/*.so
-%if 0%{?include_kjots}
-%{_kde4_bindir}/kjots
-%{_kde4_appsdir}/kjots/
-%{_kde4_docdir}/HTML/en/kjots/
-%endif
 %{_mandir}/man1/*
 
 %if 0%{?printer_applet}
@@ -219,6 +190,9 @@ fi
 
 
 %changelog
+* Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- remove F9 kjots hack
+
 * Wed May 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
 - reenable printer-applet