rpms/kdelibs/devel kde4.csh, 1.5, 1.6 kde4.sh, 1.6, 1.7 kdelibs.spec, 1.517, 1.518
Rex Dieter
rdieter at fedoraproject.org
Wed Sep 23 19:40:39 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8425
Modified Files:
kde4.csh kde4.sh kdelibs.spec
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-7
- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.csh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde4.csh 14 Aug 2009 14:21:12 -0000 1.5
+++ kde4.csh 23 Sep 2009 19:40:39 -0000 1.6
@@ -5,11 +5,10 @@
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
## When/if using prelinking, avoids use of kdeinit
-## disabled, for now, due to http://bugzilla.redhat.com/515539
-#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
-# unset PRELINKING
-#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
+ unset PRELINKING
+endif
Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- kde4.sh 14 Aug 2009 14:21:12 -0000 1.6
+++ kde4.sh 23 Sep 2009 19:40:39 -0000 1.7
@@ -5,8 +5,7 @@
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
## When/if using prelinking, avoids (some) use of kdeinit
-## disabled, for now, due to http://bugzilla.redhat.com/515539
-#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
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -p -r1.517 -r1.518
--- kdelibs.spec 21 Sep 2009 15:47:17 -0000 1.517
+++ kdelibs.spec 23 Sep 2009 19:40:39 -0000 1.518
@@ -4,7 +4,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Name: kdelibs
Epoch: 6
@@ -270,8 +270,10 @@ do
done
popd
+%if 0%{?fedora} < 12
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+%endif
# fix Sonnet documentation multilib conflict
bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
@@ -316,7 +318,9 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%doc AUTHORS README TODO
%doc COPYING.LIB
+%if 0%{?fedora} < 12
%config(noreplace) %{_sysconfdir}/profile.d/*
+%endif
%{_kde4_bindir}/*
%exclude %{_kde4_bindir}/kconfig_compiler4
%{_kde4_appsdir}/*
@@ -392,6 +396,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-7
+- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
+
* Mon Sep 21 2009 Than Ngo <than at redhat.com> - 4.3.1-6
- use abrt for RHEL
More information about the fedora-extras-commits
mailing list