SPECS: kdebase.spec - Updated branch.diff ('malformed url' bug is ...

[adgor]

Author: adgor                        Date: Sun Oct  1 10:21:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Updated branch.diff ('malformed url' bug is fixed)
- Commented out {kcm_background,bgdefaults}.patch (kdmconfig.patch modified)
- Release 8

---- Files affected:
SPECS:
   kdebase.spec (1.525 -> 1.526) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.525 SPECS/kdebase.spec:1.526
--- SPECS/kdebase.spec:1.525	Sat Sep 23 22:16:40 2006
+++ SPECS/kdebase.spec	Sun Oct  1 12:20:55 2006
@@ -26,7 +26,7 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	3.5.4
-Release:	6
+Release:	8
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -63,7 +63,6 @@
 Patch14:	%{name}-session.patch
 Patch15:	%{name}-bgdefaults.patch
 Patch16:	%{name}-vmenus.patch
-Patch17:	%{name}-sasl-includes.patch
 Patch18:	%{name}-kio_settings.patch
 Patch19:	%{name}-konsole-default-keytab.patch
 Patch20:	%{name}-seesar.patch
@@ -1042,7 +1041,8 @@
 %patch100 -p0
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+# Temporary disabled (for test)
+#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -1055,7 +1055,8 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
+# Temporary disabled (for test)
+#%patch15 -p1
 %patch16 -p1
 %patch18 -p1
 # FIXME (still needed?)
@@ -1085,12 +1086,10 @@
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;TerminalEmulator;/' \
 	konsole/konsole-script.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;TerminalEmulator;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	konsole/konsole.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Amusement;/' \
 	ksplashml/ksplash.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;System;Monitor;/' \
-	-e 's/Terminal=0/Terminal=false/' \
 	ksysguard/gui/ksysguard.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Settings;/' \
 	kcontrol/kcontrol/KControl.desktop
@@ -1100,37 +1099,16 @@
 	kcontrol/randr/krandrtray.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;X-Help;/' \
 	-e 's/Name=/Name=KDE/g' -e s'/Name[pl]=Pomoc/Name[pl]=Pomoc KDE/g' \
-	-e 's/Terminal=0/Terminal=false/' -e 's/OnlyShowIn=KDE;//g' \
-	khelpcenter/Help.desktop
+	-e 's/OnlyShowIn=KDE;//g' khelpcenter/Help.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;/' \
-	-e 's/Terminal=0/Terminal=false/' -e 's/OnlyShowIn=KDE;//g' \
-	kfind/Kfind.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;System;X-administration;/' \
+	-e 's/OnlyShowIn=KDE;//g' kfind/Kfind.desktop
+%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;SystemSetup;/' \
 	konqueror/konquerorsu.desktop
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;System;X-administration;/' \
-	-e 's/Terminal=0/Terminal=false/' \
+%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;SystemSetup;/' \
 	konsole/konsolesu.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;WebBrowser;/' \
 	konqueror/konqbrowser.desktop
-%{__sed} -i -e '/\[Desktop Entry\]/aEncoding=UTF-8' \
-	khotkeys/kcontrol/khotkeys.desktop \
-	kioslave/cgi/kcmcgi/kcmcgi.desktop
-%{__sed} -i -e 's/Terminal=0/Terminal=false/' \
-	kappfinder/kappfinder.desktop \
-	kate/data/kate.desktop \
-	kdeprint/kdeprintfax/kdeprintfax.desktop \
-	kcontrol/kfontinst/viewpart/kfontview.desktop \
-	kdeprint/kjobviewer/kjobviewer.desktop \
-	klipper/klipper.desktop \
-	kpager/kpager.desktop \
-	kpersonalizer/kpersonalizer.desktop \
-	ktip/ktip.desktop \
-	kate/data/kwrite.desktop \
-	konqueror/Home.desktop \
-	konqueror/kfmclient.desktop \
-	konqueror/kfmclient_dir.desktop \
-	konqueror/kfmclient_html.desktop \
-	konqueror/kfmclient_war.desktop
+
 for f in `find . -name \*.desktop`; do
 	if grep -q '^Categories=.*[^;]$' $f; then
 		sed -i -e 's/\(^Categories=.*$\)/\1;/' $f
@@ -1164,19 +1142,16 @@
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
-	--without-java \
+	--with-distribution="PLD Linux Distribution" \
 	--with-kdm-pam=kdm \
 	--with-pam=kdesktop \
+	--with-openexr \
 	--with-qt-libraries=%{_libdir} \
 	--with%{!?with_kerberos5:out}-krb5auth \
-	%{!?with_ldap:--without-ldap} \
-	--with-openexr \
-	--with-distribution="PLD Linux Distribution"
+	--without-java \
+	%{!?with_ldap:--without-ldap}
+
 
-#cd kwin/kcmkwin/kwinrules
-#%%{__make} ruleswidgetbase.h
-#%%{__make} ruleswidgetbase.cpp
-#cd -
 
 %{__make}
 
@@ -2861,6 +2836,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.526  2006/10/01 10:20:55  adgor
+- Updated branch.diff ('malformed url' bug is fixed)
+- Commented out {kcm_background,bgdefaults}.patch (kdmconfig.patch modified)
+- Release 8
+
 Revision 1.525  2006/09/23 20:16:40  arekm
 - rel 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.525&r2=1.526&f=u