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

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 15 00:05:28 UTC 2015


>From 93560d78e6a1b786042ba1eb99f6d8cab998428d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 14 Apr 2015 19:04:51 -0500
Subject: kf5-ize


diff --git a/blinken.spec b/blinken.spec
index 230611f..2b237c0 100644
--- a/blinken.spec
+++ b/blinken.spec
@@ -13,14 +13,21 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
-BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
+BuildRequires: cmake
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdoctools-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Svg)
 %if 0%{?fedora} > 19
 BuildRequires: libappstream-glib
 %endif
 BuildRequires: readline-devel 
 
-%{?kde_runtime_requires}
 Requires: sj-stevehand-fonts
 
 # when split occurred
@@ -34,9 +41,9 @@ Conflicts: kdeedu < 4.7.0-10
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -45,39 +52,38 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde --without-mo
-
 ## unpackaged files
 # omit bundled steve font
-rm -fv %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
+rm -fv %{buildroot}%{_kf5_datadir}/blinken/fonts/steve.ttf
 
 
 %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/org.kde.%{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 || :
 fi
 
-%files -f %{name}.lang
-%doc COPYING COPYING.DOC
-%doc AUTHORS
-%{_kde4_bindir}/blinken
-%{_kde4_appsdir}/blinken/
-%{_kde4_datadir}/appdata/%{name}.appdata.xml
-%{_kde4_datadir}/applications/kde4/blinken.desktop
-%{_kde4_datadir}/config.kcfg/blinken.kcfg
-%{_kde4_iconsdir}/hicolor/*/*/blinken.*
+%posttrans
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+
+%files
+%doc AUTHORS COPYING*
+%{_kf5_bindir}/%{name}
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_kf5_datadir}/icons/hicolor/*/*/*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+#{_kf5_datadir}/kxmlgui5/%{name}/
+%{_kf5_datadir}/config.kcfg/%{name}.kcfg
 
 
 %changelog
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/blinken.git/commit/?h=master&id=93560d78e6a1b786042ba1eb99f6d8cab998428d


More information about the scm-commits mailing list