rdieter pushed to kcalc (master). "kf5-ize"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 17 01:30:05 UTC 2015


>From 9e460c361d3e852f5270a71f89d105103970c935 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 16 Apr 2015 20:29:55 -0500
Subject: kf5-ize


diff --git a/kcalc.spec b/kcalc.spec
index 9127804..4a0d115 100644
--- a/kcalc.spec
+++ b/kcalc.spec
@@ -13,12 +13,36 @@ URL:     https://projects.kde.org/projects/kde/kdeutils/kcalc
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstreamable patches
 # fix arithmetic fault in mod, factorial
 Patch0: kcalc-4.9.90-misc.patch
 
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
+BuildRequires: extra-cmake-modules
 BuildRequires: gmp-devel
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kcompletion-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdeclarative-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kitemviews-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kjobwidgets-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-knotifyconfig-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Widgets)
+#BuildRequires: libappstream-glib
 
 # when split occured
 Conflicts: kdeutils-common < 6:4.7.80
@@ -26,24 +50,21 @@ Conflicts: kdeutils-common < 6:4.7.80
 Obsoletes: kdeutils-kcalc < 6:4.7.80
 Provides:  kdeutils-kcalc = 6:%{version}-%{release}
 
-%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
-
-
 %description
 KCalc is a calculator which offers many more mathematical
 functions than meet the eye on a first glance.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %patch0 -p1 -b .misc
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -52,22 +73,27 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde --without-mo
-
 
 %check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
-
-
-%files -f %{name}.lang
-%doc COPYING README
-%{_kde4_bindir}/kcalc
-%{_kde4_appsdir}/kcalc/
-%{_kde4_appsdir}/kconf_update/kcalcrc.upd
-%{_kde4_datadir}/config.kcfg/kcalc.kcfg
-%{_kde4_datadir}/applications/kde4/kcalc.desktop
-%{_kde4_libdir}/libkdeinit4_kcalc.so
-
+#appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
+
+
+%files
+%doc COPYING*
+#doc README
+%{_kf5_bindir}/%{name}
+%{_kf5_libdir}/libkdeinit5_%{name}.so
+#{_sysconfdir}/xdg/%{name}.knsrc
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+#{_datadir}/appdata/%{name}.appdata.xml
+#{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+%{_kf5_datadir}/kconf_update/%{name}*
+%{_kf5_datadir}/kxmlgui5/%{name}/
+#{_kf5_datadir}/sounds/%{name}/
+%{_kf5_datadir}/config.kcfg/%{name}.kcfg
 
 
 %changelog
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kcalc.git/commit/?h=master&id=9e460c361d3e852f5270a71f89d105103970c935


More information about the scm-commits mailing list