From e121b9ee9a2203ef5cfc827413e21e13f1700725 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 13 2017 16:19:47 +0000 Subject: kf5-ize, update URL --- diff --git a/.gitignore b/.gitignore index c611849..c84b997 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -/kgpg-16.04.0.tar.xz -/kgpg-16.04.1.tar.xz -/kgpg-16.04.2.tar.xz -/kgpg-16.04.3.tar.xz -/kgpg-16.07.90.tar.xz -/kgpg-16.08.0.tar.xz -/kgpg-16.08.1.tar.xz -/kgpg-16.08.2.tar.xz -/kgpg-16.08.3.tar.xz /kgpg-16.12.1.tar.xz diff --git a/kgpg.spec b/kgpg.spec index d265213..49f13c3 100644 --- a/kgpg.spec +++ b/kgpg.spec @@ -5,7 +5,7 @@ Version: 16.12.1 Release: 1%{?dist} License: GPLv2+ -URL: https://quickgit.kde.org/?p=%{name}.git +URL: https://www.kde.org/applications/utilities/kgpg/ %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -16,11 +16,38 @@ 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 -BuildRequires: kdepimlibs-devel >= 4.14 -BuildRequires: gpgme-devel +BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros -Requires: kf5-filesystem + +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5Widgets) + +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5Codecs) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5JobWidgets) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5TextWidgets) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5WindowSystem) + +BuildRequires: cmake(KF5AkonadiContact) +BuildRequires: cmake(KF5Contacts) + +# support kde4 servicemenus too +BuildRequires: kde-filesystem +Requires: kde-filesystem + +BuildRequires: gpgme-devel # when split occured Conflicts: kdeutils-common < 6:4.7.80 @@ -28,8 +55,6 @@ Conflicts: kdeutils-common < 6:4.7.80 Obsoletes: kdeutils-kgpg < 6:4.7.80 Provides: kdeutils-kgpg = 6:%{version}-%{release} -%{?kde_runtime_requires} - # kgpg (can be either gnupg or gnupg2, we'll default to the latter) Requires: gnupg2 @@ -45,7 +70,7 @@ KGpg is a simple interface for GnuPG, a powerful encryption utility. %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -54,65 +79,51 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart -sed \ - -e 's|^X-KDE-autostart-condition=.*|X-KDE-autostart-condition[$e]=$(kde4-config --path config --locate kgpgrc):User Interface:AutoStart:false|g' \ - %{buildroot}%{_kde4_datadir}/autostart/kgpg.desktop \ - > %{buildroot}%{_sysconfdir}/xdg/autostart/kgpg.desktop && \ -echo 'OnlyShowIn=KDE;' \ - >> %{buildroot}%{_sysconfdir}/xdg/autostart/kgpg.desktop && \ -rm -fv %{buildroot}%{_kde4_datadir}/autostart/kgpg.desktop - -# create/own kgpgrc -mkdir -p %{buildroot}%{_kde4_configdir} -touch %{buildroot}%{_kde4_configdir}/kgpgrc - -mkdir -p %{buildroot}%{_kf5_datadir}/kservices5/ServiceMenus +# support kde4 servicemenu +mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus cp -alf \ - %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop \ - %{buildroot}%{_kf5_datadir}/kservices5/ServiceMenus/ + %{buildroot}%{_kf5_datadir}/kservices5/ServiceMenus/*.desktop \ + %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ %check -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop ||: +#desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{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 ||: update-desktop-database -q &> /dev/null ||: fi %files %doc AUTHORS %license COPYING -%{_kde4_bindir}/kgpg -%{_kde4_appsdir}/kgpg/ -%{_datadir}/dbus-1/interfaces/org.kde.kgpg.*.xml -%{_datadir}/appdata/kgpg.appdata.xml -%{_kde4_configdir}/kgpgrc -%{_kde4_datadir}/config.kcfg/kgpg.kcfg -%{_sysconfdir}/xdg/autostart/kgpg.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kgpg.* -%{_kde4_datadir}/applications/kde4/kgpg.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/encryptfile.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/encryptfolder.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/viewdecrypted.desktop +%{_kf5_bindir}/kgpg +%{_kf5_sysconfdir}/xdg/autostart/org.kde.kgpg.desktop +%{_kf5_datadir}/appdata/org.kde.kgpg.appdata.xml +%{_kf5_datadir}/applications/org.kde.kgpg.desktop +%{_kf5_datadir}/config.kcfg/kgpg.kcfg +%{_kf5_datadir}/dbus-1/interfaces/org.kde.kgpg.Key.xml +%{_kf5_datadir}/kgpg/ %{_kf5_datadir}/kservices5/ServiceMenus/*.desktop -%lang(en) %{_kde4_docdir}/HTML/en/kgpg/ +%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop +%{_kf5_datadir}/kxmlgui5/kgpg/ +%{_kf5_datadir}/icons/hicolor/*/*/* +%lang(en) %{_kf5_docdir}/HTML/en/kgpg/ %changelog * Fri Jan 13 2017 Rex Dieter - 16.12.1-1 -- 16.12.1 +- 16.12.1, kf5-ize, update URL * Mon Dec 05 2016 Rex Dieter - 16.08.3-1 - 16.08.3