diff --git a/.gitignore b/.gitignore index 922d346..4456800 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/kget-17.04.1.tar.xz -/kget-17.04.2.tar.xz -/kget-17.04.3.tar.xz -/kget-17.08.1.tar.xz -/kget-17.08.2.tar.xz -/kget-17.08.3.tar.xz +/kget-17.12.0.tar.xz diff --git a/kget-16.08.0-no_fake_mimetypes.patch b/kget-16.08.0-no_fake_mimetypes.patch deleted file mode 100644 index 31a6cfb..0000000 --- a/kget-16.08.0-no_fake_mimetypes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kget-16.08.0/desktop/kget_download.desktop.no_fake_mimetypes kget-16.08.0/desktop/kget_download.desktop ---- kget-16.08.0/desktop/kget_download.desktop.no_fake_mimetypes 2015-11-04 22:23:05.000000000 -0600 -+++ kget-16.08.0/desktop/kget_download.desktop 2016-08-28 09:31:09.822149039 -0500 -@@ -3,7 +3,7 @@ Actions=KGetDownload; - Type=Service - Icon= - Name= --X-KDE-ServiceTypes=KonqPopupMenu/Plugin,all/allfiles -+X-KDE-ServiceTypes=KonqPopupMenu/Plugin,application/octet-stream - X-KDE-ExcludeServiceTypes=kdedevice/* - X-KDE-Protocol=!file - diff --git a/kget.spec b/kget.spec index ed24d9a..1fddb08 100644 --- a/kget.spec +++ b/kget.spec @@ -1,7 +1,7 @@ Name: kget Summary: Download manager -Version: 17.08.3 +Version: 17.12.0 Release: 1%{?dist} License: GPLv2+ and GFDL @@ -16,25 +16,50 @@ URL: https://cgit.kde.org/%{name}.git Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz ## upstream patches -# backport from frameworks/ branch -# https://cgit.kde.org/kget.git&a=commit&h=d8e7fb82a1b3322817f24276f6739c59f5fd0bf2 -Patch1: kget-16.08.0-no_fake_mimetypes.patch BuildRequires: desktop-file-utils -BuildRequires: kde-workspace-devel -BuildRequires: kdelibs4-devel >= 4.14 -BuildRequires: kdepimlibs-devel >= 4.14 + +BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros -BuildRequires: libktorrent-devel -BuildRequires: pkgconfig(qca2) + +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KCMUtils) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5NotifyConfig) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5Solid) +BuildRequires: cmake(KF5TextWidgets) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(KF5XmlGui) + +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) + +BuildRequires: kf5-libktorrent-devel + +BuildRequires: cmake(Gpgmepp) +BuildRequires: cmake(QGpgme) +BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(sqlite3) -## currently @ rpmfusion (not sure why, patents?) -#BuildRequires: libmms-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%{?kde_runtime_requires} -# kf5 service menu -Requires: kf5-filesystem # when split occurred Conflicts: kdenetwork-common < 7:4.10.80 @@ -60,7 +85,7 @@ Provides: kdenetwork-kget-libs = 7:%{version}-%{release} %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -69,66 +94,50 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -# support kf5 servicemenu too -mkdir -p %{buildroot}%{_kf5_datadir}/kservices5/ServiceMenus -cp -alf %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kget_download.desktop \ - %{buildroot}%{_kf5_datadir}/kservices5/ServiceMenus/ +%find_lang %{name} --all-name --with-html -## unpackaged files, TODO: drop kde4 plasma/krunner bits -rm -fv %{buildroot}%{_kde4_libdir}/libkgetcore.so +## unpackaged files +rm -fv %{buildroot}%{_kf5_libdir}/libkgetcore.so -%check -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop - -%post -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : - -%posttrans -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +%check +desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.kget.desktop -%postun -if [ $1 -eq 0 ] ; then -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : -fi -%files +%files -f %{name}.lang %doc AUTHORS README TODO -%lang(en) %{_kde4_docdir}/HTML/en/kget/ -%license COPYING COPYING.DOC -%{_kde4_bindir}/kget -%{_kde4_appsdir}/dolphinpart/kpartplugins/kget_plug_in.* -%{_kde4_appsdir}/kget/ -%{_kde4_appsdir}/kconf_update/kget* -%{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.* -%{_kde4_appsdir}/kwebkitpart/kpartplugins/kget_plug_in.* -%{_kde4_iconsdir}/hicolor/*/apps/kget.* -%{_datadir}/dbus-1/services/org.kde.kget.service -%{_kde4_datadir}/applications/kde4/kget.desktop -%{_kde4_datadir}/kde4/services/kget*.desktop -%{_kde4_datadir}/kde4/services/plasma-engine-kget.desktop -%{_kde4_datadir}/kde4/services/plasma-runner-kget.desktop -%{_kde4_datadir}/kde4/servicetypes/kget*.desktop -%{_kde4_datadir}/config.kcfg/kget*.kcfg -%{_kde4_libdir}/kde4/kget_*.so -%{_kde4_datadir}/kde4/services/ServiceMenus/kget_download.desktop -%{_kf5_datadir}/kservices5/ServiceMenus/kget_download.desktop -%{_kde4_libdir}/kde4/kcm_kget_*.so -%{_kde4_libdir}/kde4/krunner_kget.so -%{_kde4_libdir}/kde4/plasma_engine_kget.so -%{_kde4_libdir}/kde4/plasma_kget_barapplet.so -%{_kde4_libdir}/kde4/plasma_kget_piechart.so +%license COPYING* +%{_kf5_bindir}/kget +%{_kf5_datadir}/applications/org.kde.kget.desktop +%{_kf5_datadir}/kget/ +%{_kf5_datadir}/config.kcfg/kget* +%{_kf5_datadir}/dbus-1/services/org.kde.kget.service +%{_kf5_datadir}/icons/hicolor/*/apps/kget.* +%{_kf5_datadir}/dolphinpart/kpartplugins/kget* +%{_kf5_datadir}/khtml/kpartplugins/kget* +%{_kf5_datadir}/kwebkitpart/kpartplugins/kget* +%{_kf5_datadir}/kconf_update/kget* +%{_kf5_datadir}/knotifications5/kget* +%{_kf5_datadir}/kservices5/kget* +%{_kf5_datadir}/kservices5/ServiceMenus/kget* +%{_kf5_datadir}/kservicetypes5/kget* +%{_kf5_datadir}/kxmlgui5/kget/ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files libs -%{_kde4_libdir}/libkgetcore.so.4* +%{_kf5_libdir}/libkgetcore.so.5* +%{_kf5_qtplugindir}/kcm_kget*.so +%{_kf5_qtplugindir}/kget/ +%{_kf5_qtplugindir}/kget_*.so %changelog +* Thu Dec 28 2017 Rex Dieter - 17.12.0-1 +- 17.12.0 + * Wed Nov 08 2017 Rex Dieter - 17.08.3-1 - 17.08.3 diff --git a/sources b/sources index 367df7a..a81a54e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kget-17.08.3.tar.xz) = 7766065ff062f9266ff7e7a193f5d007a59af408127d42dedd7c7d8dc990d89801c7237f2162e7e335896be5768ac247670992f4bf52776a1470a3d805c0f5c3 +SHA512 (kget-17.12.0.tar.xz) = 62259d13e1b4b3cedd0645e7c15df61357fbb5fe1be64be8e2ef878df5b30a05e48d48085f2b27e15209db035c815ec34c7628a2fa6daac9231606561bc4581e