From 1c1078892c2b4a14b4d54b935ba59e81b0db7fb9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sep 30 2017 22:20:09 +0000 Subject: kf5-port --- diff --git a/.gitignore b/.gitignore index 06d7216..dfede19 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/kmag-17.04.1.tar.xz -/kmag-17.04.3.tar.xz -/kmag-17.08.0.tar.xz /kmag-17.08.1.tar.xz diff --git a/kmag.spec b/kmag.spec index 36e8775..4fe1ebd 100644 --- a/kmag.spec +++ b/kmag.spec @@ -16,10 +16,24 @@ URL: http://accessibility.kde.org/ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz BuildRequires: desktop-file-utils -BuildRequires: kdelibs4-devel >= 4.14 +BuildRequires: desktop-file-utils +#BuildRequires: libappstream-glib + +BuildRequires: extra-cmake-modules +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5XmlGui) + +BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5Widgets) + %if 0%{?fedora} -BuildRequires: qaccessibilityclient-devel +## needs Qt5 build +#BuildRequires: qaccessibilityclient-devel %endif + + # DBus runtime service Requires: kaccessible%{?_isa} >= %{version} @@ -31,13 +45,13 @@ Conflicts: kdeaccessibility < 1:4.7.80 %prep -%setup -q +%autosetup -p1 %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -46,37 +60,29 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%find_lang %{name} --all-name --with-html --with-man -%check -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmag.desktop - -%post -touch --no-create %{_kde4_iconsdir}/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 -fi - -%posttrans -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : - - -%files -%doc AUTHORS COPYING COPYING.DOC ChangeLog README TODO -%{_kde4_bindir}/kmag -%{_kde4_appsdir}/kmag/ -%{_kde4_datadir}/applications/kde4/*.desktop -%{_kde4_docdir}/HTML/en/kmag/ -%{_kde4_iconsdir}/hicolor/*/*/* +%check +#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 ||: + + +%files -f %{name}.lang +%doc AUTHORS ChangeLog README TODO +%license COPYING* +%{_kf5_bindir}/%{name}* +%{_kf5_datadir}/%{name} +#{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml +%{_kf5_datadir}/applications/org.kde.%{name}.desktop +%{_kf5_datadir}/icons/hicolor/*/*/* +%{_kf5_datadir}/kxmlgui5/%{name} %{_mandir}/man1/*.1* %changelog * Tue Sep 05 2017 Rex Dieter - 17.08.1-1 -- 17.08.1 +- 17.08.1, kf5-port * Tue Aug 29 2017 Rex Dieter - 17.08.0-1 - 17.08.0