From 747e4744e50c2a856694adc50db8218bdd3f01fe Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 26 2015 18:28:50 +0000 Subject: 15.12.0, rename appdata --- diff --git a/.gitignore b/.gitignore index a0aa606..188e665 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/kanagram-4.14.3.tar.xz -/kanagram-15.04.0.tar.xz -/kanagram-15.04.1.tar.xz -/kanagram-15.04.2.tar.xz -/kanagram-15.08.0.tar.xz -/kanagram-15.08.3.tar.xz +/kanagram-15.12.0.tar.xz diff --git a/kanagram.spec b/kanagram.spec index 9f72143..34605b0 100644 --- a/kanagram.spec +++ b/kanagram.spec @@ -1,10 +1,10 @@ Name: kanagram Summary: Letter Order Game -Version: 15.08.3 +Version: 15.12.0 Release: 1%{?dist} License: GPLv2+ -URL: https://projects.kde.org/projects/kde/kdeedu/%{name} +URL: https://projects.kde.org/kanagram %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable @@ -38,8 +38,9 @@ BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Svg) ## TODO #BuildRequires: pkgconfig(Qt5TextToSpeech) BuildRequires: libappstream-glib -BuildRequires: libkdegames-devel >= 15.04 -BuildRequires: libkeduvocdocument-devel >= 15.04 +%global majmin_ver %(echo %{version} | cut -d. -f1,2) +BuildRequires: libkdegames-devel >= %{majmin_ver} +BuildRequires: libkeduvocdocument-devel >= %{majmin_ver} Requires: kdeedu-data @@ -49,7 +50,6 @@ Conflicts: kdeedu < 4.7.0-10 Obsoletes: kanagram-devel < 4.13.90 Obsoletes: kanagram-libs < 4.13.90 - %description %{summary}. @@ -70,12 +70,17 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +# TODO: upstream fix +mv -fv \ + %{buildroot}%{_kf5_datadir}/appdata/%{name}.appdata.xml \ + %{buildroot}%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml + ## unpackaged files rm -fv %{buildroot}%{_kf5_datadir}/icons/hicolor/*/*/kanagram-harmattan.* %check -appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/%{name}.appdata.xml ||: +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 ||: @@ -92,11 +97,11 @@ fi gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || : %files -%doc COPYING* +%license COPYING* %{_kf5_bindir}/%{name} %{_sysconfdir}/xdg/%{name}.knsrc %{_kf5_datadir}/applications/org.kde.%{name}.desktop -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/appdata/org.kde.%{name}.appdata.xml %{_kf5_datadir}/icons/hicolor/*/apps/%{name}.* %{_kf5_datadir}/%{name}/ %{_kf5_docdir}/HTML/en/%{name}/ @@ -106,6 +111,9 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || : %changelog +* Sat Dec 26 2015 Rex Dieter 15.12.0-1 +- 15.12.0, rename appdata + * Mon Nov 30 2015 Rex Dieter - 15.08.3-1 - 15.08.3 diff --git a/sources b/sources index 9c5ce08..fab2b0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddacf1f23a9d6fdd76f12e1ca82f861d kanagram-15.08.3.tar.xz +6dc5e8b0e708856c758f68b24ff5c02c kanagram-15.12.0.tar.xz