rpms/kdelibs3/devel kde.csh, 1.3, 1.4 kde.sh, 1.4, 1.5 kdelibs3.spec, 1.70, 1.71
Rex Dieter
rdieter at fedoraproject.org
Wed Sep 23 19:39:16 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7618
Modified Files:
kde.csh kde.sh kdelibs3.spec
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17
- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)
Index: kde.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kde.csh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde.csh 3 Sep 2009 12:44:07 -0000 1.3
+++ kde.csh 23 Sep 2009 19:39:15 -0000 1.4
@@ -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
Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kde.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde.sh 3 Sep 2009 12:44:07 -0000 1.4
+++ kde.sh 23 Sep 2009 19:39:16 -0000 1.5
@@ -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
Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- kdelibs3.spec 4 Sep 2009 20:19:42 -0000 1.70
+++ kdelibs3.spec 23 Sep 2009 19:39:16 -0000 1.71
@@ -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/crys
%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/crys
%changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at 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 at redhat.com> - 3.5.10-16
- openssl-1.0 build fixes
More information about the fedora-extras-commits
mailing list