rdieter pushed to kturtle (master). "kf5-ize, fix appdata name"

[notifications at fedoraproject.org]

>From 64b5ed983ab142d66eb9c76adf613d3e42d87f49 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Apr 2015 17:51:36 -0500
Subject: kf5-ize, fix appdata name


diff --git a/kturtle-15.04.0-appdata.patch b/kturtle-15.04.0-appdata.patch
new file mode 100644
index 0000000..0f57bee
--- /dev/null
+++ b/kturtle-15.04.0-appdata.patch
@@ -0,0 +1,11 @@
+diff -up kturtle-15.04.0/CMakeLists.txt.appdata kturtle-15.04.0/CMakeLists.txt
+--- kturtle-15.04.0/CMakeLists.txt.appdata	2015-02-27 03:39:26.000000000 -0600
++++ kturtle-15.04.0/CMakeLists.txt	2015-04-18 17:50:31.419470262 -0500
+@@ -47,5 +47,5 @@ add_subdirectory (doc)
+ add_subdirectory (src)
+ add_subdirectory (icons)
+ 
+-install(FILES kturtle.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
++install(FILES kturtle.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ RENAME org.kde.kturtle.appdata.xml)
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+diff -up kturtle-15.04.0/kturtle.appdata.xml.appdata kturtle-15.04.0/kturtle.appdata.xml
diff --git a/kturtle.spec b/kturtle.spec
index 0be4023..84b689b 100644
--- a/kturtle.spec
+++ b/kturtle.spec
@@ -13,13 +13,38 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstreamable patches
+Patch1:  kturtle-15.04.0-appdata.patch
+
+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-kcrash-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdeclarative-devel
+BuildRequires: kf5-kdoctools-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-knotifications-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) pkgconfig(Qt5Svg)
 BuildRequires: libappstream-glib
-%endif
-
-%{?kde_runtime_requires}
 
 # when split occurred
 Conflicts: kdeedu < 4.7.0-10
@@ -31,11 +56,13 @@ Conflicts: kdeedu < 4.7.0-10
 %prep
 %setup -q
 
+%patch1 -p1 -b .appdata
+
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -44,34 +71,39 @@ 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/org.kde.%{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 AUTHORS COPYING FAQ README TODO
-%{_kde4_bindir}/kturtle
-%{_kde4_appsdir}/kturtle/
-%{_kde4_datadir}/appdata/%{name}.appdata.xml
-%{_kde4_datadir}/applications/kde4/kturtle.desktop
-%{_kde4_configdir}/kturtle.knsrc
-%{_kde4_iconsdir}/hicolor/*/*/kturtle.*
+%posttrans
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+
+%files
+%doc COPYING*
+%doc README
+%{_kf5_bindir}/%{name}
+%{_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}/knotifications5/%{name}.notifyrc
+%{_kf5_datadir}/kxmlgui5/%{name}/
+#{_kf5_datadir}/sounds/%{name}/
+#{_kf5_datadir}/config.kcfg/%{name}.kcfg
 
 
 %changelog
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kturtle.git/commit/?h=master&id=64b5ed983ab142d66eb9c76adf613d3e42d87f49