Merge remote-tracking branch 'origin/master' into f14
This commit is contained in:
commit
df5a037f90
@ -1 +0,0 @@
|
||||
kdelibs-4_1_69-1_fc10:HEAD:kdelibs-4.1.69-1.fc10.src.rpm:1224265644
|
18
kdelibs.spec
18
kdelibs.spec
@ -16,7 +16,7 @@
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.6.3
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}.1
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
@ -46,7 +46,8 @@ Requires: kde-settings
|
||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||
Requires: hunspell
|
||||
# beware of possible bootstrapping problems -- Rex
|
||||
Requires: oxygen-icon-theme >= %{version}
|
||||
# reverted %%{version} => 4.6.2 due to some (hopefully temporary) regressions seen in 4.6.3 -- Rex
|
||||
Requires: oxygen-icon-theme >= 4.6.2
|
||||
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
|
||||
Requires: phonon%{?_isa} >= %{phonon_version}
|
||||
Requires: shared-desktop-ontologies >= 0.4
|
||||
@ -68,7 +69,8 @@ Patch9: kdelibs-4.5.80-branding.patch
|
||||
# don't cache kdeglobals paths because they change after profile directories
|
||||
# are loaded from kde4rc
|
||||
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
||||
# old menu customizations for Fedora 14 and older
|
||||
# adds the Administration menu from redhat-menus which equals System + Settings
|
||||
# This prevents the stuff getting listed twice, under both System and Settings.
|
||||
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||
Patch14: kdelibs-4.5.80-libexecdir.patch
|
||||
@ -122,6 +124,7 @@ BuildRequires: qt4-devel >= %{qt4_ver}
|
||||
BuildRequires: qt4-webkit-devel
|
||||
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
||||
Requires: xdg-utils
|
||||
Requires: redhat-menus
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
@ -267,9 +270,7 @@ format for use with the Qt 4 Assistant or KDevelop 4.
|
||||
%patch9 -p1 -b .branding
|
||||
# add release version as part of branding (suggested by cailon)
|
||||
sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
|
||||
%if 0%{?fedora} < 15
|
||||
%patch12 -p1 -b .Administration-menu
|
||||
%endif
|
||||
%patch14 -p1 -b .libexecdir
|
||||
%patch18 -p1 -b .kstandarddirs
|
||||
%patch20 -p1 -b .xxcmake
|
||||
@ -539,6 +540,13 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 16 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.3-4.1
|
||||
- Requires: oxygen-icon-theme >= 4.6.2
|
||||
|
||||
* Tue May 10 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.3-4
|
||||
- Apply the xdg-menu patch everywhere again (#703531)
|
||||
- Requires: redhat-menus (proper fix for #701693)
|
||||
|
||||
* Sun May 08 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.3-3
|
||||
- Plasma crash in KiconLoader (kde258706)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user