From b7b3f4ae5b65d667ae5366f8dc2ac5a352825563 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 06 2014 14:18:47 +0000 Subject: no libs/devel anymore, +appdata --- diff --git a/kanagram.spec b/kanagram.spec index 8c5790a..4360fd5 100644 --- a/kanagram.spec +++ b/kanagram.spec @@ -13,32 +13,22 @@ URL: https://projects.kde.org/projects/kde/kdeedu/%{name} %endif Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz +BuildRequires: appdata-tools BuildRequires: desktop-file-utils BuildRequires: kdelibs4-devel >= %{version} BuildRequires: libkdeedu-devel >= %{version} Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} Requires: libkdeedu%{?_isa} >= %{version} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} # when split occurred Conflicts: kdeedu < 4.7.0-10 +Obsoletes: kanagram-devel < 4.13.90 +Obsoletes: kanagram-libs < 4.13.90 -%description -%{summary}. - - -%package devel -Summary: Developement files for %{name} -Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -%description devel -%{summary}. -%package libs -Summary: Runtime libraries for %{name} -Requires: %{name} = %{version}-%{release} -%description libs +%description %{summary}. @@ -67,7 +57,9 @@ rm -vf %{buildroot}%{_kde4_iconsdir}/hicolor/80x80/apps/kanagram-harmattan.png %check -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop +%check +appdata-validate --nonet --relax %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml +desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/juk.desktop %post @@ -83,26 +75,18 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : fi -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig - %files -f %{name}.lang %doc ChangeLog COPYING COPYING.DOC TODO %{_kde4_bindir}/kanagram %{_kde4_appsdir}/kanagram/ +%{_kde4_appsdir}/plasma/packages/org.kde.kanagram +%{_kde4_datadir}/appdata/kanagram.appdata.xml %{_kde4_datadir}/applications/kde4/kanagram.desktop %{_kde4_datadir}/config.kcfg/kanagram.kcfg %{_kde4_configdir}/kanagram.knsrc %{_kde4_iconsdir}/hicolor/*/*/kanagram.* -%files devel -%{_includedir}/kanagram/ -%{_kde4_libdir}/libkanagramengine.so - -%files libs -%{_kde4_libdir}/libkanagramengine.so.* - %changelog * Tue Aug 05 2014 Rex Dieter - 4.13.97-1