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

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 18 15:09:23 UTC 2015


>From c84f8b27c02f53635a9f62c636431acf45004909 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Apr 2015 10:09:14 -0500
Subject: kf5-ize


diff --git a/kpat.spec b/kpat.spec
index cb377cd..6aeccfe 100644
--- a/kpat.spec
+++ b/kpat.spec
@@ -14,11 +14,35 @@ URL:     https://projects.kde.org/projects/kde/kdegames/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
+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-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(phonon4qt5)
+BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgconfig(Qt5QuickWidgets) pkgconfig(Qt5Svg) pkgconfig(Qt5Test)
+#BuildRequires: libappstream-glib
 BuildRequires: libkdegames-devel >= %{version}
 
-Requires: libkdegames%{?_isa} >= %{version}
-
 %description
 %{summary}.
 To play patience you need, as the name suggests, patience. For simple
@@ -32,11 +56,15 @@ special order — moving, turning and reordering them.
 %prep
 %setup -q
 
+# fix icon mis-naming
+mv -f icons/hi64-apps-kpats.png icons/hi64-apps-kpat.png ||:
+sed -i -e "s|hi64-apps-kpats.png|hi64-apps-kpat.png|" icons/CMakeLists.txt
+
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -45,41 +73,47 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde
-
 
 %check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+#appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
 
 
 %post
 /sbin/ldconfig
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
 
 %posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
-%files -f %{name}.lang
-%doc COPYING* 
-%{_kde4_bindir}/%{name}
-%{_kde4_datadir}/applications/kde4/%{name}.desktop
-%{_kde4_configdir}/kcardtheme.knsrc
-%{_kde4_configdir}/%{name}.knsrc
-%{_kde4_configdir}.kcfg/%{name}.kcfg
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/%{name}/
-%{_kde4_libdir}/libkcardgame.so
+
+%files
+%doc COPYING*
+#doc README
+%{_kf5_bindir}/%{name}
+%{_sysconfdir}/xdg/kcardtheme.knsrc
+%{_sysconfdir}/xdg/%{name}.knsrc
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+#{_kf5_datadir}/appdata/org.kde.%{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
+%{_kf5_libdir}/libkcardgame.so
 %{_datadir}/mime/packages/kpatience.xml
 
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kpat.git/commit/?h=master&id=c84f8b27c02f53635a9f62c636431acf45004909


More information about the scm-commits mailing list