[packages/kf5-kguiaddons] - separated -geo-handler to allow parallel install with kf6-kguiaddons; release 2

[qboosh]

commit c93bf0e40f56e0c10bdf7e2fc310f778ac8438cb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Oct 21 19:48:06 2024 +0200

    - separated -geo-handler to allow parallel install with kf6-kguiaddons; release 2

 kf5-kguiaddons.spec | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)
---
diff --git a/kf5-kguiaddons.spec b/kf5-kguiaddons.spec
index 3e265a0..a62a9eb 100644
--- a/kf5-kguiaddons.spec
+++ b/kf5-kguiaddons.spec
@@ -10,23 +10,23 @@ Summary:	Utilities for graphical user interfaces
 Summary(pl.UTF-8):	Narzędzia do graficznych interfejsów użytkownika
 Name:		kf5-%{kfname}
 Version:	5.116.0
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		X11/Libraries
 Source0:	https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
 # Source0-md5:	10ae58da0ac1b99eb78a8e40c9a39183
 URL:		https://kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
+BuildRequires:	Qt5DBus-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= %{qtver}
 BuildRequires:	Qt5Test-devel >= %{qtver}
-BuildRequires:	Qt5WaylandClient >= %{qtver}
 BuildRequires:	Qt5WaylandClient-devel >= %{qtver}
 BuildRequires:	Qt5X11Extras-devel >= %{qtver}
 BuildRequires:	cmake >= 3.16
 BuildRequires:	kf5-extra-cmake-modules >= %{version}
-BuildRequires:	kf5-plasma-wayland-protocols-devel >= 1.7.0
 BuildRequires:	libxcb-devel
 BuildRequires:	ninja
+BuildRequires:	plasma-wayland-protocols-devel >= 1.7.0
 BuildRequires:	pkgconfig
 BuildRequires:	qt5-linguist >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.736
@@ -35,6 +35,10 @@ BuildRequires:	wayland-devel >= 1.9
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-proto-kbproto-devel
 BuildRequires:	xz
+# allow also geo-chandler from kf6-kguiaddons
+Requires:	%{name}-geo-handler >= %{version}-%{release}
+Requires:	Qt5Core >= %{qtver}
+Requires:	Qt5DBus >= %{qtver}
 Requires:	Qt5Gui >= %{qtver}
 Requires:	Qt5WaylandClient >= %{qtver}
 Requires:	Qt5X11Extras >= %{qtver}
@@ -67,6 +71,19 @@ Header files for %{kfname} development.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe dla programistów używających %{kfname}.
 
+%package geo-handler
+Summary:	Geo URI handlers for %{kfname}
+Summary(pl.UTF-8):	Obsługa URI geograficznych dla %{kfname}
+Requires:	%{name} = %{version}-%{release}
+Conflicts:	kf6-kguiaddons
+
+%description geo-handler
+Geo URI handlers (via various map services) for %{kfname}.
+
+%description geo-handler -l pl.UTF-8
+Obsługa URI geograficznych (przez różne serwisy z mapami) dla
+%{kfname}.
+
 %prep
 %setup -q -n %{kfname}-%{version}
 
@@ -82,32 +99,35 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %ninja_build -C build test
 %endif
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc README.md
+%attr(755,root,root) %{_libdir}/libKF5GuiAddons.so.*.*.*
 %ghost %{_libdir}/libKF5GuiAddons.so.5
-%attr(755,root,root) %{_libdir}/libKF5GuiAddons.so.*.*
 %{_datadir}/qlogging-categories5/kguiaddons.categories
-%attr(755,root,root) %{_bindir}/kde-geo-uri-handler
-%{_desktopdir}/google-maps-geo-handler.desktop
-%{_desktopdir}/openstreetmap-geo-handler.desktop
-%{_desktopdir}/qwant-maps-geo-handler.desktop
-%{_desktopdir}/wheelmap-geo-handler.desktop
 
 %files devel
 %defattr(644,root,root,755)
+%{_libdir}/libKF5GuiAddons.so
 %{_includedir}/KF5/KGuiAddons
 %{_libdir}/cmake/KF5GuiAddons
-%{_libdir}/libKF5GuiAddons.so
 %{qt5dir}/mkspecs/modules/qt_KGuiAddons.pri
+
+%files geo-handler
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/kde-geo-uri-handler
+%{_desktopdir}/google-maps-geo-handler.desktop
+%{_desktopdir}/openstreetmap-geo-handler.desktop
+%{_desktopdir}/qwant-maps-geo-handler.desktop
+%{_desktopdir}/wheelmap-geo-handler.desktop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kf5-kguiaddons.git/commitdiff/c93bf0e40f56e0c10bdf7e2fc310f778ac8438cb