[packages/kf5-kio] - separated -apps to handle conflict with ka6-kio-extras

[qboosh]

commit 959a531724e80ff70cf5e87345af24f45396a780
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 31 22:07:22 2025 +0200

    - separated -apps to handle conflict with ka6-kio-extras

 kf5-kio.spec | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/kf5-kio.spec b/kf5-kio.spec
index 769115b..b115713 100644
--- a/kf5-kio.spec
+++ b/kf5-kio.spec
@@ -63,11 +63,14 @@ BuildRequires:	libxml2-devel
 BuildRequires:	libxml2-progs
 BuildRequires:	libxslt-devel
 BuildRequires:	ninja
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xz
 BuildRequires:	zlib-devel
+# to allow parallel install with ka6-kio-extras
+Requires:	%{name}-apps >= %{version}-%{release}
 Requires:	Qt5Core >= %{qt_ver}
 Requires:	Qt5DBus >= %{qt_ver}
 Requires:	Qt5Gui >= %{qt_ver}
@@ -136,6 +139,20 @@ interfejsem opartym na plikach. Pozwala to na dostęp do danych we
 wszystkich aplikacjach wykorzystujących okno dialogowe KDE albo
 dowolną inną infrastrukturę obsługującą KIO.
 
+%package apps
+Summary:	KIO provided applications
+Summary(pl.UTF-8):	Aplikacje dostarczane wraz z KIO
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Conflicts:	ka6-kio-extras
+BuildArch:	noarch
+
+%description apps
+KIO provided applications.
+
+%description apps -l pl.UTF-8
+Aplikacje dostarczane wraz z KIO.
+
 %package devel
 Summary:	Header files for %{kfname} development
 Summary(pl.UTF-8):	Pliki nagłówkowe dla programistów używających %{kfname}
@@ -425,7 +442,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kservicetypes5/kpropertiesdialogplugin.desktop
 %{_datadir}/kservicetypes5/searchprovider.desktop
 %{_datadir}/qlogging-categories5/kio.renamecategories
-%{_desktopdir}/kcm_trash.desktop
 %{_desktopdir}/ktelnetservice5.desktop
 %{_mandir}/man8/kcookiejar5.8*
 %lang(ca) %{_mandir}/ca/man8/kcookiejar5.8*
@@ -439,6 +455,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sv) %{_mandir}/sv/man8/kcookiejar5.8*
 %lang(uk) %{_mandir}/uk/man8/kcookiejar5.8*
 
+%files apps
+%defattr(644,root,root,755)
+%{_desktopdir}/kcm_trash.desktop
+
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libKF5KIOCore.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kf5-kio.git/commitdiff/959a531724e80ff70cf5e87345af24f45396a780