diff --git a/.gitignore b/.gitignore index c9d45e4..1a2db68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1 @@ -/knavalbattle-4.10.1.tar.xz -/knavalbattle-4.10.2.tar.xz -/knavalbattle-4.10.3.tar.xz -/knavalbattle-4.10.4.tar.xz -/knavalbattle-4.10.90.tar.xz -/knavalbattle-4.10.95.tar.xz -/knavalbattle-4.10.97.tar.xz -/knavalbattle-4.11.0.tar.xz -/knavalbattle-4.11.1.tar.xz -/knavalbattle-4.11.2.tar.xz -/knavalbattle-4.11.3.tar.xz -/knavalbattle-4.11.90.tar.xz -/knavalbattle-4.11.95.tar.xz -/knavalbattle-4.11.97.tar.xz -/knavalbattle-4.12.0.tar.xz -/knavalbattle-4.12.1.tar.xz -/knavalbattle-4.12.2.tar.xz -/knavalbattle-4.12.3.tar.xz -/knavalbattle-4.12.90.tar.xz -/knavalbattle-4.12.95.tar.xz -/knavalbattle-4.12.97.tar.xz -/knavalbattle-4.13.0.tar.xz -/knavalbattle-4.13.1.tar.xz -/knavalbattle-4.13.2.tar.xz -/knavalbattle-4.13.3.tar.xz -/knavalbattle-4.13.97.tar.xz -/knavalbattle-4.14.0.tar.xz -/knavalbattle-4.14.1.tar.xz -/knavalbattle-4.14.2.tar.xz -/knavalbattle-4.14.3.tar.xz -/knavalbattle-14.11.97.tar.xz -/knavalbattle-14.12.1.tar.xz -/knavalbattle-14.12.2.tar.xz -/knavalbattle-14.12.3.tar.xz -/knavalbattle-15.04.0.tar.xz -/knavalbattle-15.04.1.tar.xz -/knavalbattle-15.04.2.tar.xz -/knavalbattle-15.04.3.tar.xz -/knavalbattle-15.08.0.tar.xz -/knavalbattle-15.08.3.tar.xz /knavalbattle-15.12.0.tar.xz diff --git a/knavalbattle.spec b/knavalbattle.spec index 1003c07..2edaba6 100644 --- a/knavalbattle.spec +++ b/knavalbattle.spec @@ -5,7 +5,7 @@ Version: 15.12.0 Release: 1%{?dist} License: GPLv2+ and GFDL -URL: https://projects.kde.org/projects/kde/kdegames/%{name} +URL: https://projects.kde.org/%{name} %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable @@ -14,9 +14,27 @@ URL: https://projects.kde.org/projects/kde/kdegames/%{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: libkdegames4-devel +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: extra-cmake-modules +BuildRequires: kf5-kconfig-devel +BuildRequires: kf5-kconfigwidgets-devel +BuildRequires: kf5-kcoreaddons-devel +BuildRequires: kf5-kdbusaddons-devel +BuildRequires: kf5-kdnssd-devel +BuildRequires: kf5-kguiaddons-devel +BuildRequires: kf5-ki18n-devel +BuildRequires: kf5-kiconthemes-devel +BuildRequires: kf5-kio-devel +BuildRequires: kf5-knotifications-devel +BuildRequires: kf5-knotifyconfig-devel +BuildRequires: kf5-kwidgetsaddons-devel +BuildRequires: kf5-kxmlgui-devel +BuildRequires: kf5-rpm-macros +#BuildRequires: libappstream-glib +%global majmin_ver %(echo %{version} | cut -d. -f1,2) +BuildRequires: libkdegames-devel >= %{majmin_ver} +BuildRequires: pkgconfig(Qt5Widgets) %description Naval Battle is a ship sinking game for KDE. Ships are placed on a board @@ -32,7 +50,7 @@ ships wins the game. %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -41,36 +59,35 @@ 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/knavalbattle.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 || : +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 || : -update-desktop-database -q &> /dev/null ||: +touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null +gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || : fi %posttrans -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : -update-desktop-database -q &> /dev/null ||: - -%files -f %{name}.lang -%doc COPYING* -%doc AUTHORS -%{_kde4_bindir}/knavalbattle -%{_kde4_datadir}/applications/kde4/knavalbattle.desktop -%{_kde4_datadir}/kde4/services/knavalbattle.protocol -%{_kde4_iconsdir}/hicolor/*/*/* -%{_kde4_appsdir}/knavalbattle/ -%{_kde4_appsdir}/kconf_update/knavalbattle.upd +gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || : + +%files +%license COPYING* +%{_kf5_bindir}/%{name} +#{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml +%{_kf5_datadir}/applications/org.kde.%{name}.desktop +%{_kf5_datadir}/icons/hicolor/*/*/* +%{_kf5_datadir}/%{name}/ +%{_kf5_datadir}/kconf_update/%{name}* +#{_kf5_datadir}/knotifications5/%{name}.notifyrc +%{_kf5_datadir}/kservices5/%{name}.protocol +%{_kf5_datadir}/kxmlgui5/%{name}/ +%{_kf5_datadir}/doc/HTML/en/%{name}/ %changelog