rdieter pushed to kio-extras (master). "5.2.2-2 (..more)"

[notifications at fedoraproject.org]

>From 1821117b7b3cb72a7e55b4ab05b3cbedf1c6046a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 3 Apr 2015 09:02:26 -0500
Subject: 5.2.2-2

- drop Obsoletes/Provides: kio_mtp (#1208601)
- add mimetype scriptlets
- s/libjpeg-turbo-devel/libjpeg-devel/
- minor .spec cleanup
- doc: noarch
- BR: libmtp-devel

diff --git a/kio-extras.spec b/kio-extras.spec
index 243bb12..2da702f 100644
--- a/kio-extras.spec
+++ b/kio-extras.spec
@@ -1,6 +1,6 @@
 Name:           kio-extras
 Version:        5.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional components to increase the functionality of KIO Framework
 
 License:        GPLv2+
@@ -39,18 +39,17 @@ BuildRequires:  kf5-kpty-devel
 
 BuildRequires:  phonon-qt5-devel
 BuildRequires:  openslp-devel
+BuildRequires:  libmtp-devel
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libssh-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  OpenEXR-devel
-BuildRequires:  libjpeg-turbo-devel
+BuildRequires:  libjpeg-devel
 BuildRequires:  lzma-devel
 
 Requires:       kf5-filesystem
-
-Obsoletes:      kio_mtp < 5.2.0
-Provides:       kio_mtp = %{version}-%{release}
+Requires:       %{name}-mtp-common = %{version}-%{release}
 
 %description
 %{summary}.
@@ -58,40 +57,106 @@ Provides:       kio_mtp = %{version}-%{release}
 %package        docs
 Summary:        Documentation and user manuals for %{name}
 Obsoletes:      kde-runtime-docs < 5.0.0-1
+# when went noarch
+Obsoletes:      kio-extras-doc < 5.8.0-2
 Requires:       %{name} = %{version}-%{release}
+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}
 
-%build
 
-mkdir -p %{_target_platform}
+%build
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang kioextras5 --with-qt --all-name
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+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
 
-%files -f kioextras5.lang
+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
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+
+%postun
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+  update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+fi
+
+%posttrans
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+
+%files -f %{name}.lang
 %{_libdir}/libmolletnetwork.so.*
-%{_kf5_plugindir}/kio/*.so
-%{_kf5_qtplugindir}/*.so
-%{_datadir}/kio_desktop
-%{_datadir}/kio_docfilter
-%{_datadir}/kio_bookmarks
-%{_datadir}/kio_info
+%{_kf5_plugindir}/kio/archive.so
+%{_kf5_plugindir}/kio/bookmarks.so
+%{_kf5_plugindir}/kio/desktop.so
+%{_kf5_plugindir}/kio/filenamesearch.so
+%{_kf5_plugindir}/kio/filter.so
+%{_kf5_plugindir}/kio/fish.so
+%{_kf5_plugindir}/kio/info.so
+%{_kf5_plugindir}/kio/man.so
+%{_kf5_plugindir}/kio/mtp.so
+%{_kf5_plugindir}/kio/network.so
+%{_kf5_plugindir}/kio/nfs.so
+%{_kf5_plugindir}/kio/recentdocuments.so
+%{_kf5_plugindir}/kio/settings.so
+%{_kf5_plugindir}/kio/sftp.so
+%{_kf5_plugindir}/kio/smb.so
+%{_kf5_plugindir}/kio/thumbnail.so
+%{_kf5_qtplugindir}/kfileaudiopreview.so
+%{_kf5_qtplugindir}/comicbookthumbnail.so
+%{_kf5_qtplugindir}/imagethumbnail.so
+%{_kf5_qtplugindir}/jpegthumbnail.so
+%{_kf5_qtplugindir}/kded_desktopnotifier.so
+%{_kf5_qtplugindir}/kded_networkwatcher.so
+%{_kf5_qtplugindir}/kded_recentdocumentsnotifier.so
+%{_kf5_qtplugindir}/libkmanpart.so
+%{_kf5_qtplugindir}/svgthumbnail.so
+%{_kf5_qtplugindir}/textthumbnail.so
+%{_datadir}/kio_desktop/
+%{_datadir}/kio_docfilter/
+%{_datadir}/kio_bookmarks/
+%{_datadir}/kio_info/
+%dir %{_datadir}/konqsidebartng/
+%dir %{_datadir}/konqsidebartng/virtual_folders/
+%dir %{_datadir}/konqsidebartng/virtual_folders/remote/
 %{_datadir}/konqsidebartng/virtual_folders/remote/virtualfolder_network.desktop
+%dir %{_datadir}/konqueror/
+%dir %{_datadir}/konqueror/dirtree/
+%dir %{_datadir}/konqueror/dirtree/remote/
+%{_datadir}/konqueror/dirtree/remote/mtp-network.desktop
 %{_datadir}/konqueror/dirtree/remote/smb-network.desktop
-%{_datadir}/remoteview
+%{_datadir}/remoteview/
+%{_kf5_datadir}/solid/actions/solid_mtp.desktop
 %{_kf5_datadir}/kservices5/*.protocol
 %{_kf5_datadir}/kservices5/*.desktop
 %{_kf5_datadir}/kservices5/kded/*.desktop
@@ -101,13 +166,26 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_datadir}/config.kcfg/jpegcreatorsettings.kcfg
 
 %files docs
-%{_datadir}/doc/HTML/*/*
+%{_docdir}/HTML/en/kioslave5/
+%{_docdir}/HTML/en/kcontrol/
+%lang(pt_BR) %{_docdir}/HTML/pt_BR/kcontrol/
+
+%files mtp-common -f kio_mtp.lang
 
 
 %changelog
+* Fri Apr 03 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.2.2-2
+- drop Obsoletes/Provides: kio_mtp (#1208601)
+- add mimetype scriptlets
+- s/libjpeg-turbo-devel/libjpeg-devel/
+- minor .spec cleanup
+- doc: noarch
+- BR: libmtp-devel
+
 * Fri Mar 20 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.2-1
 - Plasma 5.2.2
 
+
 * Fri Feb 27 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.1-2
 - Rebuild (GCC 5)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kio-extras.git/commit/?h=master&id=1821117b7b3cb72a7e55b4ab05b3cbedf1c6046a