* Tue May 10 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.2-5
- Apply the xdg-menu patch everywhere again (#703531) - Requires: redhat-menus (proper fix for #701693)
This commit is contained in:
parent
e4303d3d14
commit
2fcfe9364c
12
kdelibs.spec
12
kdelibs.spec
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.6.2
|
Version: 4.6.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -68,7 +68,8 @@ Patch9: kdelibs-4.5.80-branding.patch
|
|||||||
# don't cache kdeglobals paths because they change after profile directories
|
# don't cache kdeglobals paths because they change after profile directories
|
||||||
# are loaded from kde4rc
|
# are loaded from kde4rc
|
||||||
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
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
|
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
||||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||||
Patch14: kdelibs-4.5.80-libexecdir.patch
|
Patch14: kdelibs-4.5.80-libexecdir.patch
|
||||||
@ -119,6 +120,7 @@ BuildRequires: qt4-devel >= %{qt4_ver}
|
|||||||
BuildRequires: qt4-webkit-devel
|
BuildRequires: qt4-webkit-devel
|
||||||
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
|
Requires: redhat-menus
|
||||||
Requires(post): /sbin/ldconfig
|
Requires(post): /sbin/ldconfig
|
||||||
Requires(postun): /sbin/ldconfig
|
Requires(postun): /sbin/ldconfig
|
||||||
|
|
||||||
@ -264,9 +266,7 @@ format for use with the Qt 4 Assistant or KDevelop 4.
|
|||||||
%patch9 -p1 -b .branding
|
%patch9 -p1 -b .branding
|
||||||
# add release version as part of branding (suggested by cailon)
|
# add release version as part of branding (suggested by cailon)
|
||||||
sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
|
sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
|
||||||
%if 0%{?fedora} < 15
|
|
||||||
%patch12 -p1 -b .Administration-menu
|
%patch12 -p1 -b .Administration-menu
|
||||||
%endif
|
|
||||||
%patch14 -p1 -b .libexecdir
|
%patch14 -p1 -b .libexecdir
|
||||||
%patch18 -p1 -b .kstandarddirs
|
%patch18 -p1 -b .kstandarddirs
|
||||||
%patch20 -p1 -b .xxcmake
|
%patch20 -p1 -b .xxcmake
|
||||||
@ -535,6 +535,10 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 10 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.2-5
|
||||||
|
- Apply the xdg-menu patch everywhere again (#703531)
|
||||||
|
- Requires: redhat-menus (proper fix for #701693)
|
||||||
|
|
||||||
* Tue May 03 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.2-4
|
* Tue May 03 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.2-4
|
||||||
- Drop xdg-menu patch on F15+ (#701693)
|
- Drop xdg-menu patch on F15+ (#701693)
|
||||||
- Omit mimetypes patch for now pending upstream feedback
|
- Omit mimetypes patch for now pending upstream feedback
|
||||||
|
Loading…
Reference in New Issue
Block a user