diff --git a/latencytop-0.4-updated-translations.patch b/latencytop-0.4-updated-translations.patch deleted file mode 100644 index 37b627c..0000000 --- a/latencytop-0.4-updated-translations.patch +++ /dev/null @@ -1,21 +0,0 @@ -Patch taken from upstream: - -commit 01c28eed49f397f04baccb00c1747ff34414e4f0 -Author: root -Date: Thu Oct 2 21:28:42 2008 -0700 - - updated translations - -diff --git a/src/latencytop.trans b/src/latencytop.trans -index 962028b..6a69bae 100644 ---- a/src/latencytop.trans -+++ b/src/latencytop.trans -@@ -123,6 +123,8 @@ - 3 lock_kernel Big Kernel Lock contention - 3 blk_execute_rq Submitting block IO - 3 scsi_cmd_ioctl SCSI ioctl command -+3 acpi_ec_transaction ACPI hardware access -+3 journal_get_undo_access Waiting for EXT3 journal undo operation - # - # - 5 do_page_fault Page fault diff --git a/latencytop-Makefile-fixes.patch b/latencytop-Makefile-fixes.patch index c78fa50..b97caa1 100644 --- a/latencytop-Makefile-fixes.patch +++ b/latencytop-Makefile-fixes.patch @@ -4,38 +4,27 @@ From: Michal Schmidt Fix the 'install' target: - Don't assume SBINDIR already exists under DESTDIR. - - Install latencytop.block too. - Install the manpage. ---- - src/Makefile | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - - -diff --git a/src/Makefile b/src/Makefile -index 7a01f4f..c75c98e 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,5 +1,7 @@ +Index: latencytop-0.5/Makefile +=================================================================== +--- latencytop-0.5.orig/Makefile ++++ latencytop-0.5/Makefile +@@ -3,6 +3,7 @@ HAS_GTK_GUI = 1 + DESTDIR = SBINDIR = /usr/sbin -+DATADIR = /usr/share +MANDIR = /usr/share/man - XCFLAGS = -W `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare + XCFLAGS = -W -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncursesw -@@ -24,6 +26,10 @@ clean: - rm -f *~ latencytop DEADJOE *.o +@@ -36,6 +37,9 @@ clean: install: latencytop -- mkdir -p $(DESTDIR)/usr/share/latencytop -- install -m 0644 latencytop.trans $(DESTDIR)/usr/share/latencytop/latencytop.trans -- install -m 0755 latencytop $(DESTDIR)$(SBINDIR)/ -\ No newline at end of file -+ mkdir -p $(DESTDIR)$(DATADIR)/latencytop + mkdir -p $(DESTDIR)/usr/share/latencytop + mkdir -p $(DESTDIR)$(MANDIR)/man8 + mkdir -p $(DESTDIR)$(SBINDIR) -+ install -m 0644 latencytop.trans $(DESTDIR)$(DATADIR)/latencytop/latencytop.trans -+ install -m 0644 latencytop.block $(DESTDIR)$(DATADIR)/latencytop/latencytop.block + install -m 0644 latencytop.trans $(DESTDIR)/usr/share/latencytop/latencytop.trans + install -m 0644 *.png $(DESTDIR)/usr/share/latencytop/ + install -m 0755 latencytop $(DESTDIR)$(SBINDIR)/ + install -m 0644 latencytop.8 $(DESTDIR)$(MANDIR)/man8/ -+ install -m 0755 latencytop $(DESTDIR)$(SBINDIR)/ diff --git a/latencytop-datadir.patch b/latencytop-datadir.patch deleted file mode 100644 index dc6096d..0000000 --- a/latencytop-datadir.patch +++ /dev/null @@ -1,49 +0,0 @@ -Use translation tables in /usr/share - -From: Michal Schmidt - -The translation tables are in /usr/share/... -Don't look for them in the current directory. ---- - - src/latencytop.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - - -diff --git a/src/latencytop.c b/src/latencytop.c -index a5d5fb3..780aa98 100644 ---- a/src/latencytop.c -+++ b/src/latencytop.c -@@ -35,6 +35,8 @@ - - #include "latencytop.h" - -+#define MYDATADIR "/usr/share/latencytop" -+ - GList *lines; - - GList *procs; -@@ -495,7 +497,7 @@ int main(int argc, char **argv) - int ret = 1; - enable_sysctl(); - if (argc>1 && strcmp(argv[1],"-d")==0) { -- init_translations("latencytop.trans"); -+ init_translations(MYDATADIR "/latencytop.trans"); - parse_global_list(); - sort_list(); - dump_global_to_console(); -@@ -508,12 +510,12 @@ int main(int argc, char **argv) - - if (argc>1 && strcmp(argv[1],"--block")==0) { - printf("Doing block tracing\n"); -- init_translations("latencytop.block"); -+ init_translations(MYDATADIR "/latencytop.block"); - noui = 1; - dump_unknown = 1; - } - else -- init_translations("/usr/share/latencytop/latencytop.trans"); -+ init_translations(MYDATADIR "/latencytop.trans"); - - initialize_curses(); - while (ret) { diff --git a/latencytop-standard-CFLAGS.patch b/latencytop-standard-CFLAGS.patch deleted file mode 100644 index 1539a5e..0000000 --- a/latencytop-standard-CFLAGS.patch +++ /dev/null @@ -1,24 +0,0 @@ -Use standard CFLAGS - -From: Michal Schmidt - -_FORTIFY_SOURCE is already in Fedora's default CFLAGS. ---- - - src/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - - -diff --git a/src/Makefile b/src/Makefile -index c75c98e..b183c4d 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -2,7 +2,7 @@ DESTDIR = - SBINDIR = /usr/sbin - DATADIR = /usr/share - MANDIR = /usr/share/man --XCFLAGS = -W `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare -+XCFLAGS = -W `pkg-config --cflags glib-2.0` -Wno-sign-compare - LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncursesw - - # diff --git a/latencytop.spec b/latencytop.spec index 245663e..d0abc9f 100644 --- a/latencytop.spec +++ b/latencytop.spec @@ -1,6 +1,6 @@ Name: latencytop -Version: 0.4 -Release: 3%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: System latency monitor Group: Applications/System @@ -8,12 +8,9 @@ License: GPLv2 URL: http://www.latencytop.org/ Source0: http://www.latencytop.org/download/%{name}-%{version}.tar.gz Patch0: latencytop-Makefile-fixes.patch -Patch1: latencytop-datadir.patch -Patch2: latencytop-standard-CFLAGS.patch -Patch3: latencytop-0.4-updated-translations.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel glib2-devel +BuildRequires: ncurses-devel glib2-devel gtk2-devel %description LatencyTOP is a tool for software developers (both kernel and userspace), aimed @@ -23,10 +20,7 @@ changed to avoid the worst latency hiccups. %prep %setup -q -%patch0 -p2 -%patch1 -p2 -%patch2 -p2 -%patch3 -p2 +%patch0 -p1 %build @@ -52,6 +46,9 @@ rm -rf %{buildroot} %changelog +* Thu May 14 2009 Michal Schmidt 0.5-1 +- Upstream release 0.5, adds GTK based GUI. + * Wed Feb 25 2009 Fedora Release Engineering - 0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild