* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-19
- ConsoleKit-related patch (#244065)
This commit is contained in:
parent
cd3b740448
commit
25fbf1faa5
26
kdelibs-3.5.7-rh#244065.patch
Normal file
26
kdelibs-3.5.7-rh#244065.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- branches/KDE/3.5/kdelibs/kinit/setproctitle.cpp 2005/07/26 18:54:59 438982
|
||||
+++ branches/KDE/3.5/kdelibs/kinit/setproctitle.cpp 2007/08/10 18:22:59 698691
|
||||
@@ -173,6 +173,15 @@
|
||||
else
|
||||
continue;
|
||||
}
|
||||
+
|
||||
+ /*
|
||||
+ * On linux, we don't want to reuse the memory allocated for
|
||||
+ * the environment, as there are tools that try to read our environment
|
||||
+ * variables while we're running (ConsoleKit does that).
|
||||
+ * There is no way to move or resize it, so just not touchint it
|
||||
+ * seems to be the only option
|
||||
+ */
|
||||
+#ifndef __linux__
|
||||
for (i=0; envp[i] != NULL; i++)
|
||||
{
|
||||
if (LastArgv + 1 == envp[i])
|
||||
@@ -180,6 +189,7 @@
|
||||
else
|
||||
continue;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
#if SPT_TYPE != SPT_BUILTIN
|
11
kdelibs.spec
11
kdelibs.spec
@ -21,7 +21,7 @@
|
||||
|
||||
Summary: K Desktop Environment - Libraries
|
||||
Version: 3.5.7
|
||||
Release: 18%{?dist}
|
||||
Release: 19%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs3
|
||||
@ -34,7 +34,7 @@ Obsoletes: kdelibs3 = %{version}-%{release}
|
||||
Provides: kdelibs3 = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
# FIXME/TODO: there appear to be bits of ARTISTIC, BSD, GPLv2, GFDLv2(?), QPL too -- Rex
|
||||
# FIXME/TODO: there appear to be bits of ARTISTIC, BSD, GPLv2, GFDL (and QPL?) too -- Rex
|
||||
License: LGPLv2+
|
||||
Url: http://www.kde.org/
|
||||
Group: System Environment/Libraries
|
||||
@ -73,6 +73,9 @@ Patch103: kdelibs-3.5.0-101956.patch
|
||||
|
||||
# upstream patches
|
||||
Patch500: kdelibs-3.5.7-kde#146105.patch
|
||||
# http://bugzilla.redhat.com/244065
|
||||
# http://websvn.kde.org/branches/KDE/3.5/kdelibs/kinit/setproctitle.cpp?r1=438982&r2=698691
|
||||
Patch501: kdelibs-3.5.7-rh#244065.patch
|
||||
|
||||
%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
|
||||
Requires: qt >= %{qt_epoch}:%{qt_ver}
|
||||
@ -217,6 +220,7 @@ format for easy browsing
|
||||
|
||||
# upstream patches
|
||||
%patch500 -p0 -b .kde#146105
|
||||
%patch501 -p4 -b .rh#244065
|
||||
|
||||
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
||||
|
||||
@ -498,6 +502,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-19
|
||||
- ConsoleKit-related patch (#244065)
|
||||
|
||||
* Sun Aug 12 2007 Florian La Roche <laroche@redhat.com> 6:3.5.7-18
|
||||
- fix apidocs subpackage requires
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user