From 6ad9ae915bdbc7a61feb55f08cda1cdf628a5f46 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 2 Jul 2015 08:55:11 -0500 Subject: [PATCH] 5.11.0-3 - .spec cleanup, cleanup Conflicts - use %license - drop -doc subpkg - Requires: kf5-kinit (kio apparently needs org.kde.klauncher5 service provided by kinit) --- kf5-kio.spec | 60 +++++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/kf5-kio.spec b/kf5-kio.spec index 1644130..0726e3e 100644 --- a/kf5-kio.spec +++ b/kf5-kio.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction License: GPLv2+ and MIT and BSD @@ -50,12 +50,17 @@ BuildRequires: kf5-solid-devel BuildRequires: kf5-kwidgetsaddons-devel BuildRequires: kf5-kwindowsystem-devel -Requires: kf5-filesystem +Obsoletes: kf5-kio-doc < 5.11.0-3 +Provides: kf5-kio-doc = %{version}-%{release} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-core-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-widgets = %{version}-%{release} -Requires: %{name}-widgets-libs%{?_isa} = %{version}-%{release} +Requires: kf5-filesystem +%if ! 0%{?bootstrap} +# (apparently?) requires org.kde.klauncher5 service provided by kf5-kinit -- rex +Requires: kf5-kinit +%endif + +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-widgets%{?_isa} = %{version}-%{release} Requires: %{name}-file-widgets%{?_isa} = %{version}-%{release} Requires: %{name}-ntlm%{?_isa} = %{version}-%{release} @@ -80,25 +85,17 @@ Requires: qt5-qtbase-devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package doc -Summary: Documentation files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -%description doc -Documentation for %{name}. - %package core Summary: Core components of the KIO Framework Requires: %{name}-core-libs%{?_isa} = %{version}-%{release} # last version of the main package before the split -Conflicts: %{name} < 5.3.0-2 +Conflicts: kf5-kio < 5.3.0-2 %description core KIOCore library provides core non-GUI components for working with KIO. %package core-libs Summary: Runtime libraries for KIO Core Requires: %{name}-core = %{version}-%{release} -# last version of the main package before the split -Conflicts: %{name} < 5.3.0-2 %description core-libs %{summary}. @@ -106,26 +103,20 @@ Conflicts: %{name} < 5.3.0-2 Summary: Widgets for KIO Framework Requires: %{name}-core%{?_isa} = %{version}-%{release} # last version of the main package before the split -Conflicts: %{name} < 5.3.0-2 +Conflicts: kf5-kio < 5.3.0-2 %description widgets KIOWidgets contains classes that provide generic job control, progress reporting, etc. %package widgets-libs Summary: Runtime libraries for KIO Widgets library -Requires: %{name}-core = %{version}-%{release} Requires: %{name}-widgets = %{version}-%{release} -# last version of the main package before the split -Conflicts: %{name} < 5.3.0-2 %description widgets-libs %{summary}. %package file-widgets Summary: Widgets for file-handling for KIO Framework -Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-widgets%{?_isa} = %{version}-%{release} -# last version of the main package before the split -Conflicts: %{name} < 5.3.0-2 %description file-widgets The KIOFileWidgets library provides the file selection dialog and its components. @@ -133,7 +124,7 @@ its components. %package ntlm Summary: NTLM support for KIO Framework # last version of the main package before the split -Conflicts: %{name} < 5.3.0-2 +Conflicts: kf5-kio < 5.3.0-2 %description ntlm KIONTLM provides support for NTLM authentication mechanism in KIO @@ -143,7 +134,7 @@ KIONTLM provides support for NTLM authentication mechanism in KIO %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd @@ -153,11 +144,12 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang kio5 --with-qt --all-name +%find_lang %{name} --all-name --with-man --with-qt %files -%doc COPYING.LIB README.md +%license COPYING.LIB +%doc README.md %posttrans core /usr/bin/update-desktop-database -q &> /dev/null ||: @@ -167,7 +159,7 @@ if [ $1 -eq 0 ] ; then /usr/bin/update-desktop-database -q &> /dev/null ||: fi -%files core -f kio5.lang +%files core -f %{name}.lang %config %{_kf5_sysconfdir}/xdg/accept-languages.codes %{_kf5_libexecdir}/kio_http_cache_cleaner %{_kf5_libexecdir}/kpac_dhcp_helper @@ -176,6 +168,7 @@ fi %{_kf5_libexecdir}/kiod5 %{_kf5_bindir}/ktelnetservice5 %{_kf5_bindir}/kcookiejar5 +%{_kf5_mandir}/man8/kcookiejar5.8* %{_kf5_bindir}/kmailservice5 %{_kf5_bindir}/ktrash5 %{_kf5_plugindir}/kio/*.so @@ -200,6 +193,7 @@ fi %{_kf5_datadir}/kf5/kcookiejar/domain_info %{_kf5_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.kde.kiod5.service +%{_kf5_docdir}/HTML/en/kioslave5/ %post core-libs -p /sbin/ldconfig %postun core-libs -p /sbin/ldconfig @@ -256,14 +250,14 @@ fi %{_kf5_archdatadir}/mkspecs/modules/qt_KIOWidgets.pri %{_datadir}/dbus-1/interfaces/*.xml -%files doc -%{_kf5_mandir}/man8/* -%{_kf5_mandir}/*/man8/* -%exclude %{_kf5_mandir}/man8 -%{_kf5_docdir}/HTML/en/kioslave5/ - %changelog +* Thu Jul 02 2015 Rex Dieter - 5.11.0-3 +- .spec cleanup, cleanup Conflicts +- use %%license +- drop -doc subpkg +- Requires: kf5-kinit (kio apparently needs org.kde.klauncher5 service provided by kinit) + * Wed Jun 17 2015 Fedora Release Engineering - 5.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild