diff --git a/kdelibs.spec b/kdelibs.spec index 48c8445..3cf0004 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -37,6 +37,7 @@ Patch1: kdelibs-3.5.1-xdg-menu.patch Patch2: kdelibs-3.0.0-ndebug.patch Patch4: kdelibs-3.0.4-ksyscoca.patch Patch5: kdelibs-3.5.0-openssl0.9.8a.patch +Patch7: kdelibs-3.4.0-menu.patch Patch15: kdelibs-3.4.91-buildroot.patch Patch16: kdelibs-3.1-ssl-krb5.patch Patch20: kdelibs-3.3.92-defaultstyle.patch @@ -64,6 +65,7 @@ Patch111: kdelibs-3.5.3-kde#128760.patch Patch112: kdelibs-3.5.3-kde#123307.patch Patch113: kdelibs-3.5.3-kde#106795.patch Patch114: kdelibs-3.5.3-kde#130605.patch +Patch115: kdelibs-3.5.3-kde#129187.patch %if %{arts} Requires: arts >= %{arts_epoch}:%{arts_version} @@ -181,6 +183,7 @@ format for easy browsing %endif %patch4 -p1 -b .ksyscoca %patch5 -p1 -b .openssl +%patch7 -p1 -b .menu %patch15 -p1 -b .buildroot %patch16 -p1 -b .ssl-krb5 %patch20 -p1 -b .defaultstyle @@ -208,6 +211,7 @@ format for easy browsing %patch112 -p0 -b .kde#130252 %patch113 -p0 -b .kde#106795 %patch114 -p0 -b .kde#130605 +%patch115 -p0 -b .kde#129187 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -299,6 +303,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/xdg.d/kde/menus pushd %{buildroot}%{_sysconfdir}/xdg/menus/ mv applications.menu %{buildroot}%{_sysconfdir}/xdg.d/kde/menus ln -s applications-merged kde-applications-merged + ln -s ../../xdg.d/kde/menus/applications.menu kde-applications.menu popd echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme @@ -434,11 +439,12 @@ fi * Tue Jul 11 2006 Than Ngo 6:3.5.3-8 - upstream patches, kde#130605 - konqueror crash + kde#129187 - konqueror crash when modifying address bar address * Mon Jul 10 2006 Than Ngo 6:3.5.3-7 - apply upstream patches, - #123307 - Find previous does nothing sometimes - #106795 - konqueror crash + kde#123307 - Find previous does nothing sometimes + kde#106795 - konqueror crash * Tue Jul 04 2006 Than Ngo 6:3.5.3-6 - apply upstream patches, fix #128940/#81806/#128760