rpms/kdeutils/devel kdeutils.spec,1.100,1.101

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376/devel

Modified Files:
	kdeutils.spec 
Log Message:
* Mon Nov 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4
- include kregexpeditor in %description (#399281)



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdeutils.spec	25 Oct 2007 20:16:11 -0000	1.100
+++ kdeutils.spec	26 Nov 2007 12:54:57 -0000	1.101
@@ -12,9 +12,6 @@
 %define devel 1
 %endif
 
-# include kalc in main pkg?
-%define kcalc_in_main 1
-
 %define appdir %{_datadir}/applications/kde
 
 Name:    kdeutils
@@ -65,22 +62,20 @@
 %endif
 
 %description
-Utilities for the K Desktop Environment.
-Includes:
-  * ark (tar/gzip archive manager);
-%if %{kcalc_in_main}
-  * kcalc (scientific calculator);
-%endif
-  * kcharselect (character selector);
-  * kdepasswd (change password);
-  * kdessh (ssh front end);
-  * kdf (view disk usage);
-  * kedit (simple text editor);
-  * kfloppy (floppy formatting tool);
+Utilities for the K Desktop Environment, including:
+  * ark (tar/gzip archive manager)
+  * kcalc (scientific calculator)
+  * kcharselect (character selector)
+  * kdepasswd (change password)
+  * kdessh (ssh front end)
+  * kdf (view disk usage)
+  * kedit (simple text editor)
+  * kfloppy (floppy formatting tool)
   * kgpg (gpg gui)
-  * khexedit (hex editor);
-  * kjots (note taker);
-  * ktimer (task scheduler);
+  * khexedit (hex editor)
+  * kjots (note taker)
+  * kregexpeditor (regular expression editor)
+  * ktimer (task scheduler)
   * kwikdisk (removable media utility)
 
 %if 0%{?devel} 
@@ -102,9 +97,6 @@
 Requires: usermode
 %description extras
 More Utilities for the K Desktop Environment:
-%if ! %{kcalc_in_main}
-  * kcalc (scientific calculator);
-%endif
  * kmilo
  * ksim (system information monitor);
  * klaptopdaemon (battery monitoring and management for laptops);
@@ -154,11 +146,11 @@
 
 # Show only in KDE (really? -- Rex)
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
-         KCharSelect ark kwalletmanager kwalletconfig \
-         irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
-    if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
-        echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
-    fi
+  KCharSelect ark kwalletmanager kwalletconfig \
+ irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
+ if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
+   echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
+ fi
 done
 
 ## File lists
@@ -244,20 +236,6 @@
 %files extras
 %defattr(-,root,root,-)
 
-%if ! %{kcalc_in_main}
-# kcalc
-%{_docdir}/HTML/*/kcalc/
-%{_bindir}/kcalc
-%{_libdir}/kde3/kcalc.*
-%{_libdir}/libkdeinit_kcalc.la
-%{_libdir}/libkdeinit_kcalc.so
-%{_datadir}/applications/kde/kcalc.desktop
-%{_datadir}/apps/kcalc
-%{_datadir}/config.kcfg/kcalc.kcfg
-%{_datadir}/icons/hicolor/??x??/apps/kcalc.png
-%{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
-%endif
-
 # kmilo
 %{_libdir}/kde3/kded_kmilod.*
 %{_libdir}/kde3/kmilo*
@@ -299,20 +277,6 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 
-%if ! %{kcalc_in_main}
-# kcalc
-%exclude %{_docdir}/HTML/*/kcalc/
-%exclude %{_bindir}/kcalc
-%exclude %{_libdir}/kde3/kcalc.*
-%exclude %{_libdir}/libkdeinit_kcalc.la
-%exclude %{_libdir}/libkdeinit_kcalc.so
-%exclude %{_datadir}/applications/kde/kcalc.desktop
-%exclude %{_datadir}/apps/kcalc
-%exclude %{_datadir}/config.kcfg/kcalc.kcfg
-%exclude %{_datadir}/icons/hicolor/??x??/apps/kcalc.png
-%exclude %{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
-%endif
-
 # kmilo
 %exclude %{_libdir}/kde3/kded_kmilod.*
 %exclude %{_libdir}/kde3/kmilo*
@@ -383,6 +347,9 @@
 
 
 %changelog
+* Mon Nov 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4
+- include kregexpeditor in %%description (#399281)
+
 * Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-3
 - Obsoletes: %%name ... to help out multilib upgrades