diff --git a/0001-QTBUG-57796.patch b/0001-QTBUG-57796.patch deleted file mode 100644 index e6c3060..0000000 --- a/0001-QTBUG-57796.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3cfe31701ac8ee8444e03db2ecae527c7d1927ef Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Fri, 23 Dec 2016 21:01:43 +0100 -Subject: [PATCH] QTBUG-57796 - -Signed-off-by: Fabian Vogt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 868efe1..71f235f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -217,7 +217,7 @@ if (Gpgmepp_FOUND) - endif() - - --set_target_properties(kgetcore PROPERTIES VERSION 5.0.0 SOVERSION 5 ) -+set_target_properties(kgetcore PROPERTIES VERSION 5.0.0 SOVERSION 5 AUTOMOC_MOC_OPTIONS "-D__GNUC__=6") - install(TARGETS kgetcore ${INSTALL_TARGETS_DEFAULT_ARGS}) - - --- -2.10.2 - diff --git a/kget.changes b/kget.changes index f303619..0b8d95f 100644 --- a/kget.changes +++ b/kget.changes @@ -7,8 +7,6 @@ Sat Mar 25 23:10:56 CET 2017 - lbeltrame@kde.org * https://www.kde.org/announcements/announce-applications-17.03.80.php - Changes since 16.12.3: * Fix terminology: "by KDE", not "for KDE" -- Add 0001-QTBUG-57796.patch: Add proper options to automoc to fix - 32 bit building (QTBUG-57796) ------------------------------------------------------------------- Thu Mar 9 12:45:17 CET 2017 - lbeltrame@kde.org diff --git a/kget.spec b/kget.spec index 9cf450a..449f75f 100644 --- a/kget.spec +++ b/kget.spec @@ -1,7 +1,7 @@ # # spec file for package kget # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,96 +17,76 @@ Name: kget -Version: 17.03.80 +Version: 16.12.3 Release: 0 -%define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) -%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} -# It can only build on the same platforms as Qt Webengine -ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 Summary: Download Manager License: GPL-2.0+ Group: Productivity/Networking/Other Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE moc-gnuc.patch fabian@ritter-vogt.de -- QTBUG-57796 -Patch1: 0001-QTBUG-57796.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif -BuildRequires: extra-cmake-modules BuildRequires: gpgme-devel -BuildRequires: kcmutils-devel -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdbusaddons-devel -BuildRequires: kdelibs4support-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: knotifications-devel -BuildRequires: knotifyconfig-devel -BuildRequires: kwallet-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: libgpgmepp-devel -BuildRequires: libqca-qt5-devel -BuildRequires: libqgpgme-devel -BuildRequires: pkgconfig -BuildRequires: solid-devel +BuildRequires: libkdepimlibs4-devel +BuildRequires: libkonq-devel +BuildRequires: libktorrent-devel +BuildRequires: libqca2-devel BuildRequires: sqlite-devel -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) -Obsoletes: kget5 < %{version} -Provides: kget5 = %{version} +# It can only build on the same platforms as Qt Webengine +ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description An advanced download manager for KDE %prep %setup -q -%patch1 -p1 %build - %cmake_kf5 -d build -- +%ifarch ppc ppc64 +export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%endif + %cmake_kde4 -d build %make_jobs %install - %kf5_makeinstall -C build - %suse_update_desktop_file -r org.kde.kget System TrayIcon + cd build +%kde4_makeinstall + cd .. + %suse_update_desktop_file -r kget System TrayIcon + %kde_post_install %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig +%clean + rm -rf %{buildroot} + %files %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kf5_bindir}/kget -%{_kf5_sharedir}/dolphinpart/ -%{_kf5_servicetypesdir}/ -%{_kf5_servicesdir}/ -%{_kf5_sharedir}/dbus-1/services/org.kde.kget.service -%{_kf5_configkcfgdir}/ -%{_kf5_sharedir}/kwebkitpart/ -%{_kf5_sharedir}/khtml/ -%{_kf5_sharedir}/kget/ -%{_kf5_sharedir}/kxmlgui5/ -%{_kf5_notifydir}/ -%{_kf5_iconsdir}/hicolor/*/apps/kget.* -%dir %{_kf5_htmldir} -%dir %{_kf5_htmldir}/en -%doc %{_kf5_htmldir}/en/kget/ -%{_kf5_libdir}/libkgetcore.so* -%{_kf5_applicationsdir}/org.kde.kget.desktop -%{_kf5_sharedir}/kconf_update/ -%{_kf5_plugindir}/ +%{_kde4_bindir}/kget +%{_kde4_appsdir}/dolphinpart/ +%{_kde4_servicetypesdir}/*.desktop +%{_kde4_servicesdir}/*.desktop +%{_kde4_servicesdir}/ServiceMenus/*.desktop +%{_datadir}/dbus-1/services/org.kde.kget.service +%{_kde4_configkcfgdir}/*.kcfg +%{_kde4_appsdir}/kwebkitpart/ +%{_kde4_appsdir}/khtml/ +%{_kde4_appsdir}/kget/ +%{_kde4_iconsdir}/hicolor/*/apps/kget.* +%{_kde4_htmldir}/en/kget/ +%{_kde4_modulesdir}/kcm_kget*.so +%{_kde4_modulesdir}/kget_*.so +%{_kde4_modulesdir}/krunner_*.so +%{_kde4_modulesdir}/plasma_*.so +%{_kde4_libdir}/libkgetcore.so* +%{_kde4_applicationsdir}/kget.desktop +%{_kde4_appsdir}/kconf_update/ %changelog