rdieter pushed to kteatime (master). "kf5-ize"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 18 21:55:52 UTC 2015
>From fbbed3506dc6e4ebb5821d1640daa7759fe99e26 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Apr 2015 16:55:41 -0500
Subject: kf5-ize
diff --git a/kteatime.spec b/kteatime.spec
index 58e2037..04c4303 100644
--- a/kteatime.spec
+++ b/kteatime.spec
@@ -13,11 +13,34 @@ URL: https://projects.kde.org/projects/kde/kdetoys/amor
%endif
Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
-BuildRequires: kdelibs4-devel >= 4.14
-BuildRequires: kde-filesystem
-BuildRequires: cmake
-
-%{?kde_runtime_requires}
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kcompletion-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kcrash-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdeclarative-devel
+BuildRequires: kf5-kdoctools-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kitemviews-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kjobwidgets-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-knotifyconfig-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5DBus)
+BuildRequires: libappstream-glib
Conflicts: kdetoys < 7:4.10.80
@@ -29,9 +52,9 @@ KTeaTime makes sure your tea does not get too strong.
%build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -40,31 +63,40 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --all-name --with-kde --without-mo
%check
-desktop-file-validate %{buildroot}/%{_kde4_datadir}/applications/kde4/%{name}.desktop
+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 ||:
%post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kf5_datadir}/icons/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 ||:
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+
+%files
+%doc COPYING*
+#doc README
+%{_kf5_bindir}/%{name}
+#{_sysconfdir}/xdg/%{name}.knsrc
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml
+%{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
+#{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+#{_kf5_datadir}/kconf_update/%{name}*
+%{_kf5_datadir}/knotifications5/%{name}.notifyrc
+#{_kf5_datadir}/kxmlgui5/%{name}/
+#{_kf5_datadir}/sounds/%{name}/
+#{_kf5_datadir}/config.kcfg/%{name}.kcfg
-%files -f %{name}.lang
-%doc COPYING COPYING.DOC
-%{_kde4_bindir}/kteatime
-%{_kde4_appsdir}/kteatime/
-%{_kde4_datadir}/applications/kde4/kteatime.desktop
-%{_kde4_iconsdir}/hicolor/*/*/kteatime.*
%changelog
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kteatime.git/commit/?h=master&id=fbbed3506dc6e4ebb5821d1640daa7759fe99e26
More information about the scm-commits
mailing list