- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)

This commit is contained in:
Rex Dieter 2009-09-23 19:39:16 +00:00
parent 32fcc2ab90
commit 59e8bfe7e1
3 changed files with 18 additions and 11 deletions

12
kde.csh
View File

@ -5,10 +5,10 @@
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
## When/if using prelinking, avoids (some) use of kdeinit
#if ( -f /etc/sysconfig/prelink ) then
# set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
# if ( "$PRELINKING" == "yes" ) then
# if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
# endif
#endif
if ( -f /etc/sysconfig/prelink ) then
set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
if ( "$PRELINKING" == "yes" ) then
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
endif
endif

8
kde.sh
View File

@ -5,7 +5,7 @@
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
## When/if using prelinking, avoids (some) use of kdeinit
#if [ -z "$KDE_IS_PRELINKED" ] ; then
# grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
# KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
#fi
if [ -z "$KDE_IS_PRELINKED" ] ; then
grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
fi

View File

@ -30,7 +30,7 @@
Summary: K Desktop Environment 3 - Libraries
Version: 3.5.10
Release: 16%{?dist}
Release: 17%{?dist}
Name: kdelibs3
Obsoletes: kdelibs < 6:%{version}-%{release}
@ -342,8 +342,10 @@ for i in *; do
done
popd
%if 0%{?fedora} < 12
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
%endif
# Use hicolor-icon-theme rpm/pkg instead (#178319)
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
@ -479,7 +481,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%defattr(-,root,root,-)
%doc README
%doc COPYING.LIB
%if 0%{?fedora} < 12
%config(noreplace) %{_sysconfdir}/profile.d/*
%endif
%{_bindir}/artsmessage
%{_bindir}/cupsdconf
%{_bindir}/cupsdoprint
@ -576,6 +580,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%changelog
* Wed Sep 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-17
- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)
* Fri Sep 04 2009 Than Ngo <than@redhat.com> - 3.5.10-16
- openssl-1.0 build fixes