SPECS: kdebase.spec - merged cosmetics from AC-branch
glen
glen at pld-linux.org
Fri Feb 2 18:25:01 CET 2007
Author: glen Date: Fri Feb 2 17:25:01 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged cosmetics from AC-branch
---- Files affected:
SPECS:
kdebase.spec (1.565 -> 1.566)
---- Diffs:
================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.565 SPECS/kdebase.spec:1.566
--- SPECS/kdebase.spec:1.565 Thu Feb 1 15:43:03 2007
+++ SPECS/kdebase.spec Fri Feb 2 18:24:56 2007
@@ -1206,88 +1206,91 @@
$RPM_BUILD_ROOT/etc/X11/kdm/faces/root.face.icon
# konqueror/dirtree no longer supported
-rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/smb-network.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
-for f in `grep -El 'X-KDE-settings|X-KDE-information' *`; do
+for f in $(grep -El 'X-KDE-settings|X-KDE-information' *); do
echo "OnlyShowIn=KDE" >> $f
done
cd -
# find_lang
> core.lang
-programs=" \
- colors \
- fonts \
- kcmstyle \
- kdebugdialog \
- kdeprint \
- kdesu \
- khelpcenter \
- knetattach \
- kompmgr \
- language"
-
+programs="
+colors
+fonts
+kcmstyle
+kdebugdialog
+kdeprint
+kdesu
+khelpcenter
+knetattach
+kompmgr
+language
+"
for i in $programs; do
%find_lang $i --with-kde
cat $i.lang >> core.lang
+ rm -f $i.lang
done
> %{name}.lang
-programs=" \
- arts \
- background \
- bell \
- clock \
- desktop \
- desktopbehavior \
- energy \
- kcmaccess \
- kcmlaunch \
- kcmnotify \
- kcmsmserver \
- kcmtaskbar \
- keyboard \
- keys \
- kicker \
- kmenuedit \
- ksplashml \
- kwindecoration \
- kxkb \
- mouse \
- panel \
- panelappearance \
- passwords \
- performance \
- spellchecking \
- windowmanagement"
-
+programs="
+arts
+background
+bell
+clock
+desktop
+desktopbehavior
+energy
+kcmaccess
+kcmlaunch
+kcmnotify
+kcmsmserver
+kcmtaskbar
+keyboard
+keys
+kicker
+kmenuedit
+ksplashml
+kwindecoration
+kxkb
+mouse
+panel
+panelappearance
+passwords
+performance
+spellchecking
+windowmanagement
+"
for i in $programs; do
%find_lang $i --with-kde
cat $i.lang >> %{name}.lang
+ rm -f $i.lang
done
%find_lang konqueror --with-kde
-programs="\
- cache \
- cookies \
- crypto \
- ebrowsing \
- email \
- filemanager \
- filetypes \
- icons \
- kcmcss \
- khtml \
- netpref \
- proxy \
- smb \
- useragent"
-
+programs="
+cache
+cookies
+crypto
+ebrowsing
+email
+filemanager
+filetypes
+icons
+kcmcss
+khtml
+netpref
+proxy
+smb
+useragent
+"
for i in $programs; do
%find_lang $i --with-kde
cat $i.lang >> konqueror.lang
+ rm -f $i.lang
done
%find_lang kappfinder --with-kde
@@ -1305,9 +1308,10 @@
%find_lang kpager --with-kde
%find_lang kwrite --with-kde
%find_lang screensaver --with-kde
-
cat kcmkonsole.lang >> konsole.lang
+rm -f kcmkonsole.lang
cat kioslave.lang >> kinfocenter.lang
+rm -f kioslave.lang
# Omit apidocs entries
sed -i 's/.*apidocs.*//' *.lang
@@ -2621,6 +2625,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.566 2007/02/02 17:24:56 glen
+- merged cosmetics from AC-branch
+
Revision 1.565 2007/02/01 14:43:03 wolf
- bcond grouping of windows
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.565&r2=1.566&f=u
More information about the pld-cvs-commit
mailing list