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

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 18 00:36:45 UTC 2015


>From 7f8ac9f3edfbb9db85d9311c42f7635d0b614a15 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 17 Apr 2015 19:36:36 -0500
Subject: kf5-ize


diff --git a/kig.spec b/kig.spec
index 26bb98c..5972385 100644
--- a/kig.spec
+++ b/kig.spec
@@ -13,20 +13,39 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
-# Kig can optionally use Boost.Python for Python scripting
-%if 0%{?fedora} || 0%{?rhel} > 6
-%global boost_python 1
 BuildRequires: boost-devel
-%endif
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
-%if 0%{?fedora} > 19
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+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-kdelibs4support-devel
+BuildRequires: kf5-kdnssd-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kitemmodels-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-ktexteditor-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Svg) pkgconfig(Qt5PrintSupport)
+BuildRequires: python2-devel python2
 BuildRequires: libappstream-glib
-%endif
-BuildRequires: python-devel python
 
-Requires: kate4-part
-%{?kde_runtime_requires}
 
 # when split occurred
 Conflicts: kdeedu-math < 4.7.0-10
@@ -43,7 +62,7 @@ Conflicts: kdeedu-math < 4.7.0-10
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -52,41 +71,46 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde --without-mo
-
 
 %check
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml ||:
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/%{name}.desktop ||:
 
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 fi
 
-%files -f %{name}.lang
-%doc AUTHORS ChangeLog COPYING TODO
-%{_kde4_bindir}/kig
-%{_kde4_bindir}/pykig.*
-%{_kde4_libdir}/kde4/kigpart.*
-%{_kde4_datadir}/appdata/kig.appdata.xml
-%{_kde4_datadir}/applications/kde4/kig.desktop
-%{_kde4_iconsdir}/hicolor/*/*/kig.*
-%{_kde4_iconsdir}/hicolor/*/*/application-x-kig.*
-%if 0%{?boost_python}
-%{_kde4_appsdir}/katepart/syntax/python-kig.xml
-%endif
-%{_kde4_appsdir}/kig/
-%{_kde4_datadir}/kde4/services/kig_part.desktop
-%{_mandir}/man1/kig.*
+%posttrans
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%files
+%doc COPYING*
+%doc README
+%{_kf5_bindir}/%{name}*
+%{_kf5_bindir}/pykig.*
+#{_sysconfdir}/xdg/%{name}.knsrc
+%{_kf5_datadir}/applications/%{name}.desktop
+%{_kf5_datadir}/appdata/%{name}.appdata.xml
+%{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_kf5_datadir}/icons/hicolor/*/mimetypes/application-x-%{name}.*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+#{_kf5_datadir}/kconf_update/%{name}*
+#{_kf5_datadir}/knotifications5/%{name}.notifyrc
+%{_kf5_datadir}/kservices5/kig_part.desktop
+%{_kf5_datadir}/kxmlgui5/%{name}/
+#{_kf5_datadir}/sounds/%{name}*
+%{_kf5_qtplugindir}/kigpart.so
+%{_kf5_datadir}/katepart/syntax/python-kig.xml
+%{_mandir}/man1/kig.1*
 
 
 %changelog
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kig.git/commit/?h=master&id=7f8ac9f3edfbb9db85d9311c42f7635d0b614a15


More information about the scm-commits mailing list