SPECS (AC-branch): kdebase.spec - install shortcut - lang broken d...
glen
glen at pld-linux.org
Thu Feb 14 22:19:25 CET 2008
Author: glen Date: Thu Feb 14 21:19:25 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- install shortcut
- lang broken due find-lang incompat
---- Files affected:
SPECS:
kdebase.spec (1.491.2.40 -> 1.491.2.41)
---- Diffs:
================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.491.2.40 SPECS/kdebase.spec:1.491.2.41
--- SPECS/kdebase.spec:1.491.2.40 Thu Feb 14 13:09:04 2008
+++ SPECS/kdebase.spec Thu Feb 14 22:19:20 2008
@@ -65,7 +65,6 @@
Patch12: %{name}-screensavers.patch
Patch13: %{name}-prefmenu.patch
Patch14: %{name}-session.patch
-Patch15: %{name}-xembed.patch
Patch16: %{name}-vmenus.patch
Patch18: %{name}-kio_settings.patch
Patch19: %{name}-konsole-default-keytab.patch
@@ -1052,7 +1051,6 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch15 -p0
%patch16 -p1
%patch18 -p1
# FIXME (still needed?)
@@ -1151,74 +1149,86 @@
%{?with_apidocs:%{__make} apidox}
%install
-rm -rf $RPM_BUILD_ROOT
-rm -rf *.lang
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+ rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
+
+ %{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ kde_htmldir=%{_kdedocdir}
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- kde_htmldir=%{_kdedocdir}
-
-install -d \
- $RPM_BUILD_ROOT/etc/{X11/kdm/faces,pam.d,rc.d/init.d,security} \
- $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror \
- $RPM_BUILD_ROOT%{_datadir}/apps/kate/{scripts,plugins}
+ touch makeinstall.stamp
+fi
-%browser_plugins_add_browser konqueror -p %{_libdir}/kde3/plugins/konqueror
+if [ ! -f installed.stamp ]; then
+ install -d \
+ $RPM_BUILD_ROOT/etc/{X11/kdm/faces,pam.d,rc.d/init.d,security} \
+ $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror \
+ $RPM_BUILD_ROOT%{_datadir}/apps/kate/{scripts,plugins}
-if [ -d "$RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs" ] ; then
- mv -f $RPM_BUILD_ROOT{%{_kdedocdir}/en/%{name}-%{version}-apidocs,%{_kdedocdir}/en/%{name}-apidocs}
+ %browser_plugins_add_browser konqueror -p %{_libdir}/kde3/plugins/konqueror
+
+ if [ -d "$RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs" ] ; then
+ mv -f $RPM_BUILD_ROOT{%{_kdedocdir}/en/%{name}-%{version}-apidocs,%{_kdedocdir}/en/%{name}-apidocs}
+ fi
+
+ # Drop generated Xsession file (we have own one)
+ rm -f $RPM_BUILD_ROOT/etc/X11/kdm/Xsession
+
+ # Install miscleanous PLD files
+ install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/kdesktop
+ install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/kdm
+ install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/kdm-np
+ install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/kdm
+ 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
+
+ # Copying default faces to kdm config dir
+ cp $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/users/default1.png \
+ $RPM_BUILD_ROOT/etc/X11/kdm/faces/.default.face.icon
+ cp $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/users/root1.png \
+ $RPM_BUILD_ROOT/etc/X11/kdm/faces/root.face.icon
+
+ # konqueror/dirtree no longer supported
+ 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' *.desktop); do
+ echo "OnlyShowIn=KDE" >> $f
+ done
+ cd -
+
+ touch installed.stamp
fi
-# Drop generated Xsession file (we have own one)
-rm -f $RPM_BUILD_ROOT/etc/X11/kdm/Xsession
-# Install miscleanous PLD files
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/kdesktop
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/kdm
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/kdm
-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
-
-# Copying default faces to kdm config dir
-cp $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/users/default1.png \
- $RPM_BUILD_ROOT/etc/X11/kdm/faces/.default.face.icon
-cp $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/users/root1.png \
- $RPM_BUILD_ROOT/etc/X11/kdm/faces/root.face.icon
-
-# konqueror/dirtree no longer supported
-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
- echo "OnlyShowIn=KDE" >> $f
-done
-cd -
+rm -f *.lang
+
+# kcontrol/
+#colors
+#fonts
+#kcmstyle
+#language
# find_lang
> core.lang
programs="
-colors
-fonts
-kcmstyle
kdebugdialog
kdeprint
kdesu
khelpcenter
knetattach
kompmgr
-language
"
for i in $programs; do
%find_lang $i --with-kde
@@ -1226,34 +1236,34 @@
rm -f $i.lang
done
+#clock
+#arts
+#background
+#bell
+#desktop
+#desktopbehavior
+#energy
+#kcmaccess
+#kcmlaunch
+#kcmnotify
+#kcmsmserver
+#kcmtaskbar
+#keyboard
+#keys
+#kwindecoration
+#mouse
+#panel
+#panelappearance
+#passwords
+#performance
+#spellchecking
+#windowmanagement
> %{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
"
for i in $programs; do
%find_lang $i --with-kde
@@ -1261,22 +1271,22 @@
rm -f $i.lang
done
+#cache
+#cookies
+#crypto
+#ebrowsing
+#email
+#filemanager
+#filetypes
+#icons
+#kcmcss
+#khtml
+#netpref
+#proxy
+#smb
+#useragent
%find_lang konqueror --with-kde
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
@@ -1286,10 +1296,10 @@
%find_lang kappfinder --with-kde
%find_lang kate --with-kde
-%find_lang kcmkonsole --with-kde
%find_lang kdm --with-kde
%find_lang kfind --with-kde
-%find_lang kcmfontinst --with-kde
+#%find_lang kcmfontinst --with-kde
+>kcmfontinst.lang
%find_lang kdcop --with-kde
%find_lang kinfocenter --with-kde
%find_lang kioslave --with-kde
@@ -1298,7 +1308,10 @@
%find_lang ksysguard --with-kde
%find_lang kpager --with-kde
%find_lang kwrite --with-kde
-%find_lang screensaver --with-kde
+#%find_lang screensaver --with-kde
+>screensaver.lang
+#%find_lang kcmkonsole --with-kde
+>kcmkonsole.lang
cat kcmkonsole.lang >> konsole.lang
rm -f kcmkonsole.lang
cat kioslave.lang >> kinfocenter.lang
@@ -2614,6 +2627,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.491.2.41 2008-02-14 21:19:20 glen
+- install shortcut
+- lang broken due find-lang incompat
+
Revision 1.491.2.40 2008-02-14 12:09:04 glen
- KDE 3.5.9
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdebase.spec?r1=1.491.2.40&r2=1.491.2.41&f=u
More information about the pld-cvs-commit
mailing list