SPECS: kdebase.spec - Updated branch.diff - Removed outdated patch...

Thu Sep 21 02:46:52 CEST 2006

Author: adgor                        Date: Thu Sep 21 00:46:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Updated branch.diff
- Removed outdated patches
- Added konsole-history_clean.patch
- Removed outdated %%install entries
- printers.desktop works again
- Release 5

---- Files affected:
SPECS:
   kdebase.spec (1.523 -> 1.524) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.523 SPECS/kdebase.spec:1.524

--- SPECS/kdebase.spec:1.523	Sat Sep  9 20:43:31 2006
+++ SPECS/kdebase.spec	Thu Sep 21 02:46:47 2006
@@ -26,7 +26,7 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	3.5.4
-Release:	4
+Release:	5
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -45,6 +45,8 @@
 # Source10-md5:	f48ac7af286f4c87961de4bb24d07772
 Source13:	ftp://ftp.pld-linux.org/software/kde/%{name}-konqsidebartng-PLD-entries-0.1.tar.bz2
 # Source13-md5:	c8b947bc3e8a2ac050d9e9548cf585fc
+# Temporary taken from kde svn
+Source14:	%{name}-Metric-Monospace-14.png
 Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-fontdir.patch
@@ -52,7 +54,6 @@
 Patch3:		%{name}-kdm_utmpx.patch
 Patch4:		%{name}-kdmconfig.patch
 Patch5:		%{name}-kicker.patch
-Patch6:		%{name}-konsole_all.patch
 Patch7:		%{name}-nsplugins_dirs.patch
 Patch8:		%{name}-startkde.patch
 Patch9:		%{name}-kcm_fonts.patch
@@ -68,8 +69,8 @@
 Patch20:	%{name}-seesar.patch
 Patch21:	%{name}-konsole-wordseps.patch
 Patch22:	%{name}-tango.patch
-Patch23:	%{name}-konsole-bold.patch
 Patch24:	kde-ac260-lt.patch
+Patch25:	%{name}-konsole-history_clear.patch
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	OpenGL-devel
 BuildRequires:	audiofile-devel
@@ -1045,10 +1046,10 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-# DROPME?
-# %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+# Outdated but some things
+# must be revised (AA default settings)
 #%patch9 -p1
 %patch10 -p1
 %patch12 -p1
@@ -1057,13 +1058,13 @@
 %patch15 -p1
 %patch16 -p1
 %patch18 -p1
-# FIXME
+# FIXME (still needed?)
 #%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p0
-%patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
 for i in  google*.desktop
@@ -1138,6 +1139,9 @@
 		sed -i -e 's/\[ven\]/[ve]/' $f
 	fi
 done
+
+cp %{SOURCE14} konsole/other/wallpapers/Metric-Monospace-14.png
+
 cp /usr/share/automake/config.sub admin
 %{__make} -f admin/Makefile.common cvs
 
@@ -1207,10 +1211,12 @@
 install %{SOURCE5}	$RPM_BUILD_ROOT/etc/X11/kdm/Xsession
 install %{SOURCE6}	$RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/pldlogo.png
 install %{SOURCE7}	$RPM_BUILD_ROOT%{_datadir}/wallpapers/kdm_pld.png
+
 %{__tar} xfj %{SOURCE8} -C $RPM_BUILD_ROOT%{_datadir}/services/searchproviders/
 %{__tar} xfj %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/
 mv $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts/* $RPM_BUILD_ROOT%{_bindir}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts
+%{__tar} xfj %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/apps/konqsidebartng/virtual_folders/
 
 # Needed for pam support
 touch $RPM_BUILD_ROOT/etc/security/blacklist.kdm
@@ -1221,37 +1227,8 @@
 cp $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/users/root1.png \
 	$RPM_BUILD_ROOT/etc/X11/kdm/faces/root.face.icon
 
-# konqsidebartng PLD entries
-cd $RPM_BUILD_ROOT%{_datadir}/apps/konqsidebartng/virtual_folders
-bzip2 -dc %{SOURCE13} | tar xf -
-cd -
-
 # konqueror/dirtree no longer supported
-mv $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop \
-	$RPM_BUILD_ROOT%{_datadir}/apps/konqsidebartng/virtual_folders/remote
-
-# Some desktop appearance defaults
-#cat > $RPM_BUILD_ROOT%{_datadir}/config/kdesktoprc << EOF
-#[FMSettings]
-#NormalTextColor=255,255,255
-#ShadowEnabled=true
-#StandardFont=Helvetica,13,-1,5,75,0,0,0,0,0
-#EOF
-
-# Some kicker appearance defaults
-#cat > $RPM_BUILD_ROOT%{_datadir}/config/kickerrc << EOF
-#[General]
-#Alignment=1
-#SizePercentage=50
-#UseBackgroundTheme=false
-#EOF
-
-# Some order with desktop files
-#mv $RPM_BUILD_ROOT%{_datadir}/applnk/System/kinfocenter.desktop \
-#	$RPM_BUILD_ROOT%{_desktopdir}/kde
-
-# TODO
-mv $RPM_BUILD_ROOT%{_desktopdir}/kde/print{ers,mgr}.desktop
+rm $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
 
 # Workaround for gnome menu which maps all these to "Others" dir
 cd $RPM_BUILD_ROOT%{_desktopdir}/kde
@@ -1716,7 +1693,7 @@
 %{_desktopdir}/kde/colors.desktop
 %{_desktopdir}/kde/fonts.desktop
 %{_desktopdir}/kde/style.desktop
-%{_desktopdir}/kde/printmgr.desktop
+%{_desktopdir}/kde/printers.desktop
 %{_desktopdir}/kde/Help.desktop
 %{_desktopdir}/kde/KControl.desktop
 %{_iconsdir}/*/*/apps/colors.png
@@ -1733,6 +1710,7 @@
 %{_iconsdir}/*/*/apps/looknfeel.png
 %{_iconsdir}/*/*/apps/multimedia.png
 %{_iconsdir}/*/*/apps/personal.png
+%{_iconsdir}/*/*/apps/pinguin.png
 %{_iconsdir}/*/*/apps/printmgr.*
 %{_iconsdir}/*/*/apps/style.png
 # infocenter & konqueror need it:
@@ -2883,6 +2861,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.524  2006/09/21 00:46:47  adgor
+- Updated branch.diff
+- Removed outdated patches
+- Added konsole-history_clean.patch
+- Removed outdated %%install entries
+- printers.desktop works again
+- Release 5
+
 Revision 1.523  2006/09/09 18:43:31  arekm
 - rel up; rebuild again due to new things in kdelibs
 
================================================================

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

