respun 4.2.0 tarball, plasma security fix
This commit is contained in:
parent
67eeafc02a
commit
6a049175a0
135
kdelibs.spec
135
kdelibs.spec
|
@ -1,6 +1,6 @@
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
Summary: K Desktop Environment 4 - Libraries
|
||||||
Version: 4.2.0
|
Version: 4.2.0
|
||||||
Release: 1%{?dist}
|
Release: 4%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
|
@ -44,8 +44,9 @@ Requires: kdelibs-common
|
||||||
%if 0%{?fedora} >= 9
|
%if 0%{?fedora} >= 9
|
||||||
Requires: hunspell
|
Requires: hunspell
|
||||||
%endif
|
%endif
|
||||||
Requires: phonon >= 4.2.96
|
Requires: phonon%{?_isa} >= 4.3.0
|
||||||
Requires: soprano >= 2.1.64
|
Requires: soprano%{?_isa} >= 2.1.64
|
||||||
|
Requires: strigi-libs%{?_isa} >= 0.6.3
|
||||||
|
|
||||||
Source1: kde4.sh
|
Source1: kde4.sh
|
||||||
Source2: kde4.csh
|
Source2: kde4.csh
|
||||||
|
@ -83,6 +84,8 @@ Patch22: kdelibs-4.1.96-cmake.patch
|
||||||
Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
|
Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
|
||||||
|
|
||||||
BuildRequires: qt4-devel >= 4.4.0
|
BuildRequires: qt4-devel >= 4.4.0
|
||||||
|
# qt4%{_?_isa} isn't provided yet -- Rex
|
||||||
|
#Requires: qt4%{?_isa} >= %{_qt4_version}
|
||||||
Requires: qt4 >= %{_qt4_version}
|
Requires: qt4 >= %{_qt4_version}
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
Requires(post): /sbin/ldconfig xdg-utils
|
Requires(post): /sbin/ldconfig xdg-utils
|
||||||
|
@ -93,7 +96,7 @@ BuildRequires: alsa-lib-devel
|
||||||
# we don't want a hard dependency on aspell on F9+, use enchant only
|
# we don't want a hard dependency on aspell on F9+, use enchant only
|
||||||
BuildRequires: aspell-devel
|
BuildRequires: aspell-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: automoc
|
BuildRequires: automoc4 >= 0.9.88
|
||||||
BuildRequires: avahi-devel
|
BuildRequires: avahi-devel
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: cmake >= 2.6.2-3
|
BuildRequires: cmake >= 2.6.2-3
|
||||||
|
@ -114,7 +117,7 @@ BuildRequires: libxslt-devel libxml2-devel
|
||||||
BuildRequires: OpenEXR-devel
|
BuildRequires: OpenEXR-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: phonon-devel >= 4.2.96
|
BuildRequires: phonon-devel >= 4.3.0
|
||||||
BuildRequires: shared-mime-info
|
BuildRequires: shared-mime-info
|
||||||
BuildRequires: soprano-devel >= 2.1.64
|
BuildRequires: soprano-devel >= 2.1.64
|
||||||
BuildRequires: strigi-devel >= 0.6.3
|
BuildRequires: strigi-devel >= 0.6.3
|
||||||
|
@ -153,11 +156,11 @@ Obsoletes: kdelibs4-devel < %{version}-%{release}
|
||||||
Provides: kdelibs4-devel = %{version}-%{release}
|
Provides: kdelibs4-devel = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
Requires: cmake >= 2.6.2-3
|
Requires: cmake >= 2.6.2-3
|
||||||
Requires: automoc
|
Requires: automoc4 >= 0.9.88
|
||||||
Requires: qt4-devel
|
Requires: qt4-devel
|
||||||
Requires: openssl-devel
|
Requires: openssl-devel
|
||||||
Requires: phonon-devel >= 4.2.96
|
Requires: phonon-devel
|
||||||
Requires: strigi-devel >= 0.6.3
|
Requires: strigi-devel
|
||||||
Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
|
Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
|
||||||
%{?x_deps:Requires: %{x_deps}}
|
%{?x_deps:Requires: %{x_deps}}
|
||||||
%description devel
|
%description devel
|
||||||
|
@ -209,6 +212,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch101 -p1 -b .AllowExternalPaths
|
%patch101 -p1 -b .AllowExternalPaths
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
mkdir -p %{_target_platform}
|
mkdir -p %{_target_platform}
|
||||||
|
@ -369,27 +373,112 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jan 26 2009 Lukáš Tinkl <ltinkl@redhat.com> 4.2.0-1
|
* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-4
|
||||||
- KDE 4.2.0
|
- revert Requires: qt4%%{_isa}
|
||||||
|
|
||||||
* Thu Jan 08 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.4-2
|
* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-3
|
||||||
- restore AWOL NTFS workaround yet again
|
- respun tarball
|
||||||
|
|
||||||
* Wed Jan 7 2009 Lukáš Tinkl <ltinkl@redhat.com> 4.1.4-1
|
* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-2
|
||||||
- KDE 4.1.4
|
- plasma-on-screensaver-security patch
|
||||||
|
- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
|
||||||
|
- Requires: strigi-libs >= 0.6.3
|
||||||
|
- use %%{?_isa} to avoid potential multilib heartbreak
|
||||||
|
|
||||||
* Mon Dec 08 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.3-4
|
* Thu Jan 22 2009 Than Ngo <than@redhat.com> - 4.2.0-1
|
||||||
- restore NTFS workaround which accidentally got dropped in the 4.1.3 update
|
- 4.2.0
|
||||||
|
|
||||||
* Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.3-3
|
* Fri Jan 16 2009 Than Ngo <than@redhat.com> - 4.1.96-9
|
||||||
- unmess Utilities menu (kdebug:161117)
|
- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
|
||||||
|
since new plasma allows to define default wallpaper, new kde-setting
|
||||||
|
is required
|
||||||
|
- backport fix from trunk to allow symlinks in wallpaper theme
|
||||||
|
|
||||||
* Fri Nov 07 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.3-2
|
* Fri Jan 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.96-8
|
||||||
|
- rebuild for new OpenSSL
|
||||||
|
|
||||||
|
* Mon Jan 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.1.96-7
|
||||||
|
- Slight speedup to profile.d/kde.sh (#465370)
|
||||||
|
- (Build)Req: strigi(-devel) >= 0.6.3
|
||||||
|
|
||||||
|
* Mon Jan 12 2009 Than Ngo <than@redhat.com> - 4.1.96-6
|
||||||
|
- fix a crash (appearing in KSMServer)
|
||||||
|
|
||||||
|
* Sat Jan 10 2009 Than Ngo <than@redhat.com> - 4.1.96-5
|
||||||
|
- kdeworkspace cmake files in correct place
|
||||||
|
|
||||||
|
* Fri Jan 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.1.96-4
|
||||||
|
- bump min deps (cmake, kde-filesystem, phonon)
|
||||||
|
- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling
|
||||||
|
- Requires: coreutils grep
|
||||||
|
|
||||||
|
* Fri Jan 09 2009 Than Ngo <than@redhat.com> - 4.1.96-3
|
||||||
|
- BR soprano >= 2.1.64
|
||||||
|
|
||||||
|
* Thu Jan 08 2009 Than Ngo <than@redhat.com> - 4.1.96-2
|
||||||
|
- kdepim cmake files in correct place
|
||||||
|
|
||||||
|
* Wed Jan 07 2009 Than Ngo <than@redhat.com> - 4.1.96-1
|
||||||
|
- 4.2rc1
|
||||||
|
|
||||||
|
* Fri Dec 19 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.85-6
|
||||||
|
- add plasma-default-wallpaper libplasma patch from kdebase-workspace-4.1
|
||||||
|
|
||||||
|
* Tue Dec 16 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.85-5
|
||||||
|
- respun tarball, integrates kde-l10n-systemsettings patch
|
||||||
|
|
||||||
|
* Tue Dec 16 2008 Than Ngo <than@redhat.com> - 4.1.85-4
|
||||||
|
- add missing ENTITY systemsettings in pt, that fixes kde-l10
|
||||||
|
build breakage
|
||||||
|
|
||||||
|
* Mon Dec 15 2008 Than Ngo <than@redhat.com> - 4.1.85-3
|
||||||
|
- add missing ENTITY systemsettings in ru/gl/es/pt, that fixes kde-l10
|
||||||
|
build breakage
|
||||||
|
- rename suffix .xxcmake to avoid install .cmake
|
||||||
|
|
||||||
|
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2
|
||||||
|
- tweak parallel_devel patch to get a -L flag for the symlink directory
|
||||||
|
|
||||||
|
* Thu Dec 11 2008 Than Ngo <than@redhat.com> - 4.1.85-1
|
||||||
|
- 4.2beta2
|
||||||
|
|
||||||
|
* Tue Dec 09 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 6:4.1.82-2
|
||||||
|
- rebase parallel devel patch and kde149705 patch
|
||||||
|
|
||||||
|
* Mon Dec 08 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 6:4.1.82-1
|
||||||
|
- 4.1.82
|
||||||
|
|
||||||
|
* Tue Nov 25 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.80-5
|
||||||
|
- remove workaround BR on phonon-backend-gstreamer, it's ineffective since
|
||||||
|
phonon now explicitly Requires: phonon-backend-xine and the dependency is no
|
||||||
|
longer circular anyway
|
||||||
|
- update parallel_devel patch
|
||||||
|
- fix minimum strigi version (only 0.5.9 needed)
|
||||||
|
|
||||||
|
* Tue Nov 25 2008 Than Ngo <than@redhat.com> 4.1.80-4
|
||||||
|
- respin
|
||||||
|
|
||||||
|
* Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.80-3
|
||||||
|
- -devel: Provides: plasma-devel
|
||||||
|
|
||||||
|
* Thu Nov 20 2008 Than Ngo <than@redhat.com> 4.1.80-2
|
||||||
|
- merged
|
||||||
|
|
||||||
|
* Thu Nov 20 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 6:4.1.80-1
|
||||||
|
- 4.1.80
|
||||||
|
- BR strigi 0.60
|
||||||
|
- BR cmake 2.6
|
||||||
|
- make install/fast
|
||||||
|
- rebase policykit patch
|
||||||
|
- rebase cmake patch
|
||||||
|
- rebase a couple of patches and drop _default_patch_fuzz 2
|
||||||
|
|
||||||
|
* Wed Nov 12 2008 Than Ngo <than@redhat.com> 4.1.3-1
|
||||||
|
- 4.1.3
|
||||||
|
|
||||||
|
* Fri Nov 07 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-6
|
||||||
- backport http_cache_cleaner fix (kdebug:172182)
|
- backport http_cache_cleaner fix (kdebug:172182)
|
||||||
|
|
||||||
* Tue Nov 4 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.3-1
|
|
||||||
- KDE 4.1.3
|
|
||||||
|
|
||||||
* Wed Oct 15 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.2-5
|
* Wed Oct 15 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.2-5
|
||||||
- backport fix for faulty window resizing (kdebug:172042)
|
- backport fix for faulty window resizing (kdebug:172042)
|
||||||
|
|
||||||
|
@ -840,7 +929,7 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
|
* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
|
||||||
- kde-3.91.0
|
- kde-3.91.0
|
||||||
- CMAKE_BUILD_TYPE=debug
|
- CMAKE_BUILD_TYPE=debug
|
||||||
|
|
||||||
* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
|
* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
|
||||||
- specfile cleanup (%%prefix issues mostly)
|
- specfile cleanup (%%prefix issues mostly)
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
Index: containment.cpp
|
||||||
|
===================================================================
|
||||||
|
--- containment.cpp (revision 916284)
|
||||||
|
+++ containment.cpp (working copy)
|
||||||
|
@@ -1602,12 +1602,10 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
|
||||||
|
- if (canConfig) {
|
||||||
|
- action = actions().action("activity settings");
|
||||||
|
- if (action) {
|
||||||
|
- action->setVisible(canConfig);
|
||||||
|
- action->setEnabled(canConfig);
|
||||||
|
- }
|
||||||
|
+ action = actions().action("activity settings");
|
||||||
|
+ if (action) {
|
||||||
|
+ action->setVisible(canConfig);
|
||||||
|
+ action->setEnabled(canConfig);
|
||||||
|
}
|
||||||
|
|
||||||
|
// tell the applets too
|
Loading…
Reference in New Issue