[packages/kde4-kcachegrind] - updated BRs, cleanup, separated -tools (usable with qcachegrind too); release 2

qboosh qboosh at pld-linux.org
Wed Aug 5 17:07:56 CEST 2015


commit 8a74074f3a138472a1ce2e6493fdc763079196b6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Aug 5 17:07:57 2015 +0200

    - updated BRs, cleanup, separated -tools (usable with qcachegrind too); release 2

 kde4-kcachegrind.spec | 48 ++++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 18 deletions(-)
---
diff --git a/kde4-kcachegrind.spec b/kde4-kcachegrind.spec
index c20ecae..afaeeee 100644
--- a/kde4-kcachegrind.spec
+++ b/kde4-kcachegrind.spec
@@ -1,7 +1,3 @@
-#
-# TODO:
-# - add man files
-#
 %define		orgname		kcachegrind
 %define		_state		stable
 %define		qtver		4.8.1
@@ -10,25 +6,26 @@ Summary:	KCachegrind - visualization of traces generated by profiling
 Summary(pl.UTF-8):	KCachegrind - wizualizacja ścieżek tworzonych przez profilowanie
 Name:		kde4-kcachegrind
 Version:	4.14.3
-Release:	1
-License:	GPL
+Release:	2
+License:	GPL v2
 Group:		X11/Development/Tools
 Source0:	http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5:	74bd394389a508eefe8f08b1b3e32709
 #Patch100: %{name}-branch.diff
 URL:		http://www.kde.org/
 BuildRequires:	QtNetwork-devel >= %{qtver}
-BuildRequires:	QtScriptTools-devel >= %{qtver}
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	bzip2-devel
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	docbook-dtd42-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	gettext-tools
+BuildRequires:	kde4-kdelibs-devel >= 4.14
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.600
+Suggests:	%{name}-tools = %{version}-%{release}
 Obsoletes:	kde4-kdesdk-kcachegrind
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,31 +33,42 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 KCachegrind visualizes traces generated by profiling.
 
 %description -l pl.UTF-8
-KCachegrind wizualizuje ścieżki tworzone przez profilowanie.
+KCachegrind wizualizuje ślady tworzone przez profilowanie.
+
+%package tools
+Summary:	Tools to convert various profiling data to calltree format
+Summary(pl.UTF-8):	Narzędzia do konwersji różnych danych profilujących do formatu calltree
+Group:		Development/Tools
+
+%description tools
+Tools to convert various profiling data to calltree format, used by
+Valgrind tools.
+
+%description tools -l pl.UTF-8
+Narzędzia do konwersji różnych danych profilujących do formatu
+calltree, stosowanego przez narzędzia Valgrinda.
 
 %prep
 %setup -q -n %{orgname}-%{version}
 
+%{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' converters/hotshot2calltree.cmake
+%{__sed} -i -e '1s,/usr/bin/env php,/usr/bin/php,' converters/pprof2calltree
+
 %build
 install -d build
 cd build
-%cmake \
-	../
+%cmake ..
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_gimpdir}/palettes,%{_appdefsdir}}
-
 %{__make} -C build install \
         DESTDIR=$RPM_BUILD_ROOT \
         kde_htmldir=%{_kdedocdir}
 
-rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
-
-%find_lang	kcachegrind	--with-kde
+%find_lang kcachegrind --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,11 +76,15 @@ rm -rf $RPM_BUILD_ROOT
 %files -f kcachegrind.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kcachegrind
+%{_datadir}/apps/kcachegrind
+%{_desktopdir}/kde4/kcachegrind.desktop
+%{_iconsdir}/hicolor/*/apps/kcachegrind.png
+
+%files tools
+%defattr(644,root,root,755)
+%doc converters/README
 %attr(755,root,root) %{_bindir}/hotshot2calltree
 %attr(755,root,root) %{_bindir}/op2calltree
 %attr(755,root,root) %{_bindir}/pprof2calltree
 %attr(755,root,root) %{_bindir}/dprof2calltree
 %attr(755,root,root) %{_bindir}/memprof2calltree
-%{_datadir}/apps/kcachegrind
-%{_desktopdir}/kde4/kcachegrind.desktop
-%{_iconsdir}/hicolor/*/apps/kcachegrind.png
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kcachegrind.git/commitdiff/8a74074f3a138472a1ce2e6493fdc763079196b6



More information about the pld-cvs-commit mailing list