diff --git a/kio-extras.spec b/kio-extras.spec index 2da702f..3f7efd9 100644 --- a/kio-extras.spec +++ b/kio-extras.spec @@ -1,6 +1,6 @@ Name: kio-extras Version: 5.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Additional components to increase the functionality of KIO Framework License: GPLv2+ @@ -49,7 +49,12 @@ BuildRequires: libjpeg-devel BuildRequires: lzma-devel Requires: kf5-filesystem -Requires: %{name}-mtp-common = %{version}-%{release} + +# translation conflicts +Conflicts: kio_mtp < 0.75-7 +Conflicts: kio_mtp-common < 0.75-10 +# short-lived subpkg, locale conflicts fixed in kio_mtp instead +Obsoletes: kio-extras-mtp-common < 5.2.2-3 %description %{summary}. @@ -64,16 +69,6 @@ BuildArch: noarch %description docs %{summary}. -%package mtp-common -Summary: Documentation and user manuals for %{name} -Obsoletes: kio_mtp-common < 5.8.0-2 -Provides: kio_mtp-common = %{version}-%{release} -# translation conflicts -Conflicts: kio_mtp < 0.75-7 -BuildArch: noarch -%description mtp-common -%{summary}. - %prep %setup -q -n %{name}-%{version} @@ -91,13 +86,7 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -for i in kfileaudiopreview5 kio_archive kio_bookmarks kio_fish kio_info kio_man kio_mtp kio_nfs kio_recentdocuments kio_sftp kio_smb kio_thumbnail; do -%find_lang ${i} --with-qt -done - -cat kfileaudiopreview5.lang kio_archive.lang kio_bookmarks.lang kio_fish.lang kio_info.lang \ - kio_man.lang kio_nfs.lang kio_recentdocuments.lang kio_sftp.lang kio_smb.lang kio_thumbnail.lang > \ - %{name}.lang +%find_lang %{name} --all-name --with-qt %post @@ -170,10 +159,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_docdir}/HTML/en/kcontrol/ %lang(pt_BR) %{_docdir}/HTML/pt_BR/kcontrol/ -%files mtp-common -f kio_mtp.lang - %changelog +* Tue Apr 07 2015 Rex Dieter 5.2.2-3 +- drop mtp-common subpkg + * Fri Apr 03 2015 Rex Dieter - 5.2.2-2 - drop Obsoletes/Provides: kio_mtp (#1208601) - add mimetype scriptlets