From 97b2e12457a54746fc6e1bafb5a2985ed77c618e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 18 2015 03:33:56 +0000 Subject: kf5-ize --- diff --git a/klettres.spec b/klettres.spec index 20ecf17..0cc8815 100644 --- a/klettres.spec +++ b/klettres.spec @@ -14,13 +14,37 @@ URL: http://edu.kde.org/klettres/ %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz +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-kwindowsystem-devel +BuildRequires: kf5-kwidgetsaddons-devel +BuildRequires: kf5-kxmlgui-devel +BuildRequires: pkgconfig(phonon4qt5) +BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Test) pkgconfig(Qt5Svg) BuildRequires: libappstream-glib -%endif - -%{?kde_runtime_requires} +BuildRequires: libkeduvocdocument-devel >= %{version} # when split occurred Conflicts: kdeedu < 4.7.0-10 @@ -36,9 +60,9 @@ very first sounds of a new language, for children or for adults. %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -47,35 +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/%{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 ChangeLog COPYING TODO -%{_kde4_bindir}/klettres -%{_kde4_appsdir}/klettres/ -%{_kde4_datadir}/appdata/klettres.appdata.xml -%{_kde4_datadir}/applications/kde4/klettres.desktop -%{_kde4_datadir}/config.kcfg/klettres.kcfg -%{_kde4_configdir}/klettres.knsrc -%{_kde4_iconsdir}/hicolor/*/*/klettres.* +%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/%{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