From 731af177309002233354d8e639d74c55e07ba93d Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 01:07:18 +0100 Subject: [PATCH] rename /etc/xdg/menus/applications.menu to applications-kde4.menu to allow kservice installation of kf5 application.menu [release 4.14.38-5mamba;Sat Oct 17 2020] --- kdelibs.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index a291248..e8c7bae 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -34,7 +34,7 @@ %endif Name: kdelibs Version: 4.14.38 -Release: 4mamba +Release: 5mamba Summary: KDE Software Compilation - Core Libraries Group: Graphical Desktop/Libraries/KDE Vendor: openmamba @@ -64,7 +64,9 @@ License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: ldconfig +%ifnarch aarch64 BuildRequires: libHUpnp-devel +%endif BuildRequires: libICE-devel BuildRequires: libQtDeclarative BuildRequires: libSM-devel @@ -125,10 +127,10 @@ BuildRequires: hspell BuildRequires: avahi-compat-libdns_sd-devel #BuildConflicts: libqt4-phonon-devel BuildRequires: libgrantlee-devel -BuildRequires: libHUpnp-devel BuildRequires: libdbusmenu-qt-devel BuildRequires: media-player-info BuildRequires: libsoprano-devel >= 1:2.9.4-2mamba +BuildRequires: shared-desktop-ontologies-devel Obsoletes: kdelibs-experimental Provides: kdelibs-experimental Requires: libqt4 >= %_qt4_version @@ -138,8 +140,8 @@ Requires: shared-desktop-ontologies Requires: shared-mime-info # FIXME: libphonon needs an explicit requirement to avoid use of library from package libqt4-phonon Requires: libphonon -Requires: PyQt4 -Requires: python-dbus +#Requires: PyQt4 +#Requires: python-dbus Requires: udev Requires: udisks2 Requires: upower @@ -270,8 +272,8 @@ find %{buildroot}%{_kde4_htmldir}/en/kdelibs-apidocs -name \*.tag \ install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh -#mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \ -# %{buildroot}%{_sysconfdir}/xdg/menus/applications-kde4.menu +mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \ + %{buildroot}%{_sysconfdir}/xdg/menus/applications-kde4.menu mv %{buildroot}%{_mandir}/man7/kdeoptions.7 \ %{buildroot}%{_mandir}/man7/kde4options.7 mv %{buildroot}%{_mandir}/man7/qtoptions.7 \ @@ -322,7 +324,7 @@ exit 0 %files %defattr(-,root,root) -%{_sysconfdir}/xdg/menus/applications.menu +%{_sysconfdir}/xdg/menus/applications-kde4.menu %if "%{_kde4_prefix}" != "%{_prefix}" %{_sysconfdir}/ld.so.conf.d/kde4.conf %endif @@ -465,6 +467,9 @@ exit 0 %{_kde4_htmldir}/en/kioslave/ %changelog +* Sat Oct 17 2020 Silvan Calarco 4.14.38-5mamba +- rename /etc/xdg/menus/applications.menu to applications-kde4.menu to allow kservice installation of kf5 application.menu + * Mon Sep 21 2020 Silvan Calarco 4.14.38-4mamba - re-enable building nepomuk lib