SPECS: kdepim.spec - Updated branch.diff - Readded kmail_toolbars....

[adgor]

Author: adgor                        Date: Mon Oct  2 10:11:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Updated branch.diff
- Readded kmail_toolbars.patch
- Cleanups
- Release 7

---- Files affected:
SPECS:
   kdepim.spec (1.237 -> 1.238) 

---- Diffs:

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.237 SPECS/kdepim.spec:1.238
--- SPECS/kdepim.spec:1.237	Thu Sep 21 22:20:35 2006
+++ SPECS/kdepim.spec	Mon Oct  2 12:11:34 2006
@@ -18,7 +18,7 @@
 Summary(uk):	đĹŇÓĎÎÁĚŘÎŮĘ ĐĚÁÎŐ×ÁĚŘÎÉË (PIM) ÄĚŃ KDE
 Name:		kdepim
 Version:	3.5.4
-Release:	6
+Release:	7
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -484,48 +484,33 @@
 %setup -q
 %patch100 -p0
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch3 -p1
 %patch4 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;Calendar;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	korganizer/korganizer.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;PDA;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	kpilot/kpilot/kpilotdaemon.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;PDA;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	kpilot/kpilot/kpilot.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;PDA;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	kpilot/conduits/docconduit/kpalmdoc.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;ContactManagement;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	kaddressbook/kaddressbook.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;X-PIM;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	kontact/src/Kontact.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;Email;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	kmail/KMail.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;News;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	knode/KNode.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;PDA;/' \
 	kmobile/kmobile.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;PDA;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	kandy/src/kandy.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Applet;/' \
 	knotes/knotes.desktop
-%{__sed} -i -e 's/Terminal=0/Terminal=false/' \
-	karm/support/karm.desktop \
-	knotes/knotes.desktop \
-	konsolekalendar/konsolekalendar.desktop \
-	korn/KOrn.desktop
 %{__sed} -i -e '/\[Desktop Entry\]/aEncoding=UTF-8' \
-	-e 's/Terminal=0/Terminal=false/' \
 	ktnef/gui/ktnef.desktop
 for f in `find . -name \*.desktop`; do
 	if grep -q '^Categories=.*[^;]$' $f; then
@@ -1391,6 +1376,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.238  2006/10/02 10:11:34  adgor
+- Updated branch.diff
+- Readded kmail_toolbars.patch
+- Cleanups
+- Release 7
+
 Revision 1.237  2006/09/21 20:20:35  adgor
 - Updated branch.diff
 - Release 6
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.237&r2=1.238&f=u