rpms/kdebase/devel kde-menus.sh,NONE,1.1 kdebase.spec,1.167,1.168
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 4 18:05:01 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31149
Modified Files:
kdebase.spec
Added Files:
kde-menus.sh
Log Message:
use XDG_CONFIG_DIRS for kde menu #178320
--- NEW FILE kde-menus.sh ---
if [ -z "${XDG_CONFIG_DIRS}" ] ; then
XDG_CONFIG_DIRS=/etc/xdg.d/kde:/etc/xdg
export XDG_CONFIG_DIRS
fi
Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdebase.spec 4 May 2006 11:00:53 -0000 1.167
+++ kdebase.spec 4 May 2006 18:04:25 -0000 1.168
@@ -20,7 +20,7 @@
Summary: K Desktop Environment - core files
Name: kdebase
Version: 3.5.2
-Release: 6
+Release: 7
Epoch: 6
Url: http://www.kde.org
Group: User Interface/Desktops
@@ -35,6 +35,7 @@
Source5: kde-np
Source6: logrotate-kdm
Source7: mailsettings.cc
+Source8: kde-menus.sh
Patch0: kde-libtool.patch
Patch1: kdebase-3.5.2-1-redhat.patch
@@ -205,25 +206,25 @@
g++ $FLAGS -o mailsettings %{SOURCE7}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make RUN_KAPPFINDER=no DESTDIR=$RPM_BUILD_ROOT install
+make RUN_KAPPFINDER=no DESTDIR=%{buildroot} install
-install -m 755 mailsettings $RPM_BUILD_ROOT%{_bindir}
+install -m 755 mailsettings %{buildroot}%{_bindir}
# Fix up permissions on some things
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/kdesud
+chmod 755 %{buildroot}%{_bindir}/kdesud
# install pam configuration file
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/kdm-np
-install -m 644 kde.pamd $RPM_BUILD_ROOT/etc/pam.d/kdm
-install -m 644 kde.pamd $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
-install -m 644 kde.pamd $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
+mkdir -p %{buildroot}/etc/pam.d
+install -m 644 %{SOURCE5} %{buildroot}/etc/pam.d/kdm-np
+install -m 644 kde.pamd %{buildroot}/etc/pam.d/kdm
+install -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
+install -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
# fix kappfinder script for relocatability and run it through consolehelper
%if %{include_kappfinder}
-pushd $RPM_BUILD_ROOT%{_bindir}
+pushd %{buildroot}%{_bindir}
mkdir -p ../sbin
cp kappfinder kappfinder.temp
sed -e 's.\$(prefix).\$KDEDIR.g' kappfinder.temp > ../sbin/kappfinder
@@ -232,29 +233,29 @@
ln -sf consolehelper kappfinder
popd
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
-cat >$RPM_BUILD_ROOT/etc/security/console.apps/kappfinder <<EOF
+mkdir -p %{buildroot}/etc/security/console.apps
+cat >%{buildroot}/etc/security/console.apps/kappfinder <<EOF
USER=root
PROGRAM=%{_sbindir}/kappfinder
SESSION=true
EOF
%else
-rm -rf $RPM_BUILD_ROOT%{_bindir}/kappfinder \
- $RPM_BUILD_ROOT%{_datadir}/applnk/System/kappfinder.desktop \
- $RPM_BUILD_ROOT%{_datadir}/applications/kde/kappfinder.desktop \
- $RPM_BUILD_ROOT%{_datadir}/icons/*/*/*/kappfinder.png \
- $RPM_BUILD_ROOT%{_datadir}/apps/kappfinder
+rm -rf %{buildroot}%{_bindir}/kappfinder \
+ %{buildroot}%{_datadir}/applnk/System/kappfinder.desktop \
+ %{buildroot}%{_datadir}/applications/kde/kappfinder.desktop \
+ %{buildroot}%{_datadir}/icons/*/*/*/kappfinder.png \
+ %{buildroot}%{_datadir}/apps/kappfinder
%endif
# Nuke man2html - we get it from man
-find $RPM_BUILD_ROOT -name "man2html*" | xargs rm -rf
+find %{buildroot} -name "man2html*" | xargs rm -rf
# install gdm session support
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/
+mkdir -p %{buildroot}%{_datadir}/xsessions
+install -m 755 %{SOURCE3} %{buildroot}%{_datadir}/xsessions/
# install config files
-pushd $RPM_BUILD_ROOT
+pushd %{buildroot}
tar xjf %{SOURCE4}
mv etc/skel/kde etc/skel/.kde
find etc/skel/.kde -type f | xargs chmod 0644
@@ -262,15 +263,15 @@
popd
# install logrotate script
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/kdm
+mkdir -p %{buildroot}/etc/logrotate.d
+install -m 644 %{SOURCE6} %{buildroot}/etc/logrotate.d/kdm
# Symlink things to their correct place
-rm -rf $RPM_BUILD_ROOT%{_datadir}/config/kdm
-ln -sf ../../../etc/kde/kdm $RPM_BUILD_ROOT%{_datadir}/config/kdm
+rm -rf %{buildroot}%{_datadir}/config/kdm
+ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
# Replace the kdm default files with symlinks to the shared {kxg}dm ones
-pushd $RPM_BUILD_ROOT/etc/kde/kdm
+pushd %{buildroot}/etc/kde/kdm
for i in Xaccess Xservers Xwilling kdmrc; do
ln -sf ../../X11/xdm/$i .
done
@@ -278,7 +279,7 @@
ln -fs ../../X11/xinit/Xsession Xsession
popd
-cat >>$RPM_BUILD_ROOT/etc/kderc <<EOF
+cat >>%{buildroot}/etc/kderc <<EOF
[General]
activeFont=Sans,10,-1,5,50,0,0,0,0,0
background=230,230,230
@@ -300,7 +301,7 @@
EOF
# Make symlinks relative
-cd $RPM_BUILD_ROOT/%{_docdir}/HTML/en
+cd %{buildroot}/%{_docdir}/HTML/en
for i in */*/*; do
if [ -d "$i" -a -L "$i"/common ]; then
rm -f $i/common
@@ -321,9 +322,9 @@
done
%if %{redhatify}
- rm -f $RPM_BUILD_ROOT%{_datadir}/locale/l10n/*/flag.png
+ rm -f %{buildroot}%{_datadir}/locale/l10n/*/flag.png
# mark KDE-Only
- pushd $RPM_BUILD_ROOT%{_datadir}/applications/kde
+ pushd %{buildroot}%{_datadir}/applications/kde
for f in *.desktop ; do
if [ "$f" == "konqbrowser.desktop" ] ; then
cat $f | grep -v Categories >$f.o
@@ -334,9 +335,11 @@
fi
done
popd
- for f in $(find $RPM_BUILD_ROOT%{_datadir}/applnk -name "*.desktop") ; do
+ for f in $(find %{buildroot}%{_datadir}/applnk -name "*.desktop") ; do
echo "OnlyShowIn=KDE;" >> $f
done
+ mkdir -p %{buildroot}/etc/kde/env
+ install -m 755 %{SOURCE8} %{buildroot}/etc/kde/env/
%endif
# Own Mozilla plugin dir
@@ -505,6 +508,9 @@
%{_includedir}/kde/ksplash/*
%changelog
+* Thu May 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-7
+- use XDG_CONFIG_DIRS for kde menu #178320
+
* Thu May 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-6
- add missing kcheckpass
More information about the fedora-cvs-commits
mailing list