diff --git a/.gitignore b/.gitignore index d051738..23c810a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/kcachegrind-16.08.3.tar.xz -/kcachegrind-16.12.1.tar.xz -/kcachegrind-16.12.2.tar.xz -/kcachegrind-16.12.3.tar.xz +/kcachegrind-17.04.1.tar.xz diff --git a/kcachegrind.spec b/kcachegrind.spec index d3098fa..732649c 100644 --- a/kcachegrind.spec +++ b/kcachegrind.spec @@ -1,10 +1,10 @@ Name: kcachegrind Summary: GUI to profilers such as Valgrind -Version: 16.12.3 -Release: 2%{?dist} +Version: 17.04.1 +Release: 1%{?dist} License: GPLv2 and GFDL -URL: https://quickgit.kde.org/?p=%{name}.git +URL: https://cgit.kde.org/%{name}.git %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -17,9 +17,26 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-% ## upstream patches BuildRequires: desktop-file-utils -BuildRequires: kdelibs4-devel >= 4.14 BuildRequires: perl-generators +BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5KIO) + +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Widgets) + +# translations moved here +Conflicts: kde-l10n < 17.03 + Conflicts: kdesdk-common < 4.10.80 Provides: kdesdk-kcachegrind = %{version}-%{release} Obsoletes: kdesdk-kcachegrind < 4.10.80 @@ -35,7 +52,7 @@ Browser for data produced by profiling tools (e.g. cachegrind) %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -46,40 +63,43 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %check -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop +desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop + +%find_lang %{name} --all-name --with-html --with-qt %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 ||: -update-mime-database %{_kde4_datadir}/mime >& /dev/null ||: +gtk-update-icon-cache %{_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 ||: -update-mime-database %{_kde4_datadir}/mime >& /dev/null ||: +touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null ||: fi -%files +%files -f %{name}.lang %doc README -%license COPYING COPYING.DOC -%{_kde4_docdir}/HTML/en/%{name}/ -%{_kde4_bindir}/kcachegrind -%{_kde4_bindir}/dprof2calltree -%{_kde4_bindir}/hotshot2calltree -%{_kde4_bindir}/memprof2calltree -%{_kde4_bindir}/op2calltree -%{_kde4_bindir}/pprof2calltree -%{_kde4_appsdir}/kcachegrind/ -%{_kde4_datadir}/applications/kde4/kcachegrind.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kcachegrind.* +%license COPYING* +%{_kf5_bindir}/kcachegrind +%{_kf5_bindir}/dprof2calltree +%{_kf5_bindir}/hotshot2calltree +%{_kf5_bindir}/memprof2calltree +%{_kf5_bindir}/op2calltree +%{_kf5_bindir}/pprof2calltree +%{_kf5_datadir}/kcachegrind/ +%{_kf5_datadir}/applications/org.kde.kcachegrind.desktop +%{_kf5_datadir}/icons/hicolor/*/apps/kcachegrind.* +%{_kf5_datadir}/kxmlgui5/kcachegrind/ %changelog +* Sat Jun 03 2017 Rex Dieter - 17.04.1-1 +- 17.04.1 + * Mon May 15 2017 Fedora Release Engineering - 16.12.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild diff --git a/sources b/sources index a86d57c..d684715 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kcachegrind-16.12.3.tar.xz) = 57ef1d2a9b02f2001417984c0b57cd991060b4089b394f41309a8cc58af41b3b20fdcfc1ab7fc8da03568c890261fe3932113807b1741c10d29dddfdc156b0b4 +SHA512 (kcachegrind-17.04.1.tar.xz) = 322036a414b433364d788b42e97373896fb6557a2a69dd20228cffb4adacaa9324b96b6a3275c250a5a34344e771f694e89e057badddc1807c1352d62106af8e