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

[notifications at fedoraproject.org]

>From 7cfec0bb8db853d89bb1f8aeaaccc717fccfbdd1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 19 Apr 2015 08:15:45 -0500
Subject: kf5-ize


diff --git a/parley-15.04.0-appdata.patch b/parley-15.04.0-appdata.patch
new file mode 100644
index 0000000..40d50c4
--- /dev/null
+++ b/parley-15.04.0-appdata.patch
@@ -0,0 +1,10 @@
+diff -up parley-15.04.0/CMakeLists.txt.appdata parley-15.04.0/CMakeLists.txt
+--- parley-15.04.0/CMakeLists.txt.appdata	2015-03-17 08:59:02.000000000 -0500
++++ parley-15.04.0/CMakeLists.txt	2015-04-19 08:13:39.061354617 -0500
+@@ -157,5 +157,5 @@ endif(HAVE_LIBXSLT)
+ #add_subdirectory(plasmoid)
+ 
+ 
+-install(FILES parley.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
++install(FILES parley.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ RENAME org.kde.parley.appdata.xml)
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/parley.spec b/parley.spec
index 0e7356d..5c04847 100644
--- a/parley.spec
+++ b/parley.spec
@@ -13,18 +13,44 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstreamable
+Patch1: parley-15.04.0-appdata.patch
+
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
-%if 0%{?fedora} > 19
-BuildRequires: libappstream-glib
-%endif
-BuildRequires: libkdeedu-devel >= 4.14
-BuildRequires: pkgconfig(libattica)
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-attica-devel
+BuildRequires: kf5-kcompletion-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kcrash-devel
+BuildRequires: kf5-kdoctools-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-kross-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: kf5-sonnet-devel
+BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Multimedia) pkgconfig(Qt5Concurrent)
 BuildRequires: pkgconfig(libxslt)
+BuildRequires: libappstream-glib
+BuildRequires: libkeduvocdocument-devel >= %{version}
 
-Requires: kross(python)
 Requires: python-mwclient
-%{?kde_runtime_requires}
 
 # when split occurred
 Conflicts: kdeedu < 4.7.0-10
@@ -36,11 +62,13 @@ Conflicts: kdeedu < 4.7.0-10
 %prep
 %setup -q
 
+%patch1 -p1 -b .appdata
+
 
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -49,47 +77,47 @@ 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 copies of python-(mwclient,simplejson)
-rm -frv %{buildroot}%{_kde4_appsdir}/parley/plugins/mwclient
+rm -frv %{buildroot}%{_kf5_datadir}/parley/plugins/mwclient/
 
 
 %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 || :
+touch --no-create %{_kf5_datadir}/icons/oxygen &> /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
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/oxygen &> /dev/null || :
 fi
 
-%files -f %{name}.lang
-%doc AUTHORS COPYING
-%{_kde4_bindir}/parley
-%{_kde4_appsdir}/parley/
-%{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
-%{_kde4_datadir}/kde4/services/plasma_parley.desktop
-%{_kde4_libdir}/kde4/plasma_applet_parley.so
-%{_kde4_libdir}/kde4/plasma_engine_parley.so
-%{_kde4_datadir}/appdata/%{name}.appdata.xml
-%{_kde4_datadir}/applications/kde4/parley.desktop
-%{_kde4_datadir}/config.kcfg/parley.kcfg
-%{_kde4_configdir}/parley.knsrc
-%{_kde4_configdir}/parley-themes.knsrc
-%{_kde4_iconsdir}/hicolor/*/*/parley*.*
-%{_kde4_datadir}/config.kcfg/documentsettings.kcfg
-%{_kde4_datadir}/config.kcfg/languagesettings.kcfg
-%{_kde4_appsdir}/desktoptheme/default/widgets/parley_plasma_card.svg
+%posttrans
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/oxygen &> /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}/icons/oxygen/*/*/*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+#{_kf5_datadir}/kconf_update/%{name}*
+#{_kf5_datadir}/knotifications5/%{name}.notifyrc
+%{_kf5_datadir}/kxmlgui5/%{name}/
+%{_kf5_datadir}/config.kcfg/*.kcfg
 
 
 %changelog
-- 
cgit v0.10.2


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