From c4c36ef677eef17c01da78671e43aea777ddcb25 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 30 2016 13:55:38 +0000 Subject: kf5 port --- diff --git a/.gitignore b/.gitignore index 016d59c..d9faa7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -/kolourpaint-15.12.3.tar.xz -/kolourpaint-16.03.80.tar.xz -/kolourpaint-16.04.0.tar.xz -/kolourpaint-16.04.1.tar.xz -/kolourpaint-16.04.2.tar.xz -/kolourpaint-16.04.3.tar.xz /kolourpaint-16.07.80.tar.xz diff --git a/kolourpaint.spec b/kolourpaint.spec index bb53498..31bbf6e 100644 --- a/kolourpaint.spec +++ b/kolourpaint.spec @@ -14,15 +14,15 @@ URL: https://quickgit.kde.org/?p=%{name}.git Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz BuildRequires: desktop-file-utils -BuildRequires: kdelibs4-devel >= 4.14 -%if 0%{?fedora} > 19 +BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros BuildRequires: libappstream-glib -%endif -BuildRequires: pkgconfig(libksane) -BuildRequires: pkgconfig(qimageblitz) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5Sane) Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%{?kde_runtime_requires} + # when split occurred Conflicts: kdegraphics < 7:4.6.95-10 @@ -44,7 +44,7 @@ License: LGPLv2 %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -62,38 +62,39 @@ rm -fv %{buildroot}%{_kde4_libdir}/libkolourpaint_lgpl.so %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/%{name}.desktop %post -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : +touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || : %posttrans -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || : update-desktop-database -q &> /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 %doc AUTHORS BUGS ChangeLog NEWS README %license COPYING* -%{_kde4_bindir}/%{name} -%{_kde4_appsdir}/%{name}/ -%{_kde4_datadir}/appdata/%{name}.appdata.xml -%{_kde4_datadir}/applications/kde4/%{name}.desktop -%{_kde4_iconsdir}/hicolor/*/*/* -%lang(en) %{_kde4_docdir}/HTML/en/%{name}/ +%{_kf5_bindir}/%{name} +%{_kf5_datadir}/%{name}/ +%{_kf5_datadir}/appdata/%{name}.appdata.xml +%{_kf5_datadir}/applications/%{name}.desktop +%{_kf5_datadir}/icons/hicolor/*/*/* +%{_kf5_datadir}/kxmlgui5/%{name}/ +%lang(en) %{_kf5_docdir}/HTML/en/%{name}/ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files libs -%{_kde4_libdir}/libkolourpaint_lgpl.so.4* +%{_kf5_libdir}/libkolourpaint_lgpl.so.5 %changelog