diff --git a/.cvsignore b/.cvsignore index 53eeb45..49e383d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-taskmanager-0.4.0.tar.bz2 +xfce4-taskmanager-0.4.1.tar.bz2 diff --git a/sources b/sources index 4c758f1..f3c2268 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fff1988558b319a71b83387964987227 xfce4-taskmanager-0.4.0.tar.bz2 +4ed599faf6b734b2d2e7be16adf0b2d9 xfce4-taskmanager-0.4.1.tar.bz2 diff --git a/xfce4-taskmanager-0.4.0-cpufix.patch b/xfce4-taskmanager-0.4.0-cpufix.patch deleted file mode 100644 index 7ae0269..0000000 --- a/xfce4-taskmanager-0.4.0-cpufix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur xfce4-taskmanager-0.4.0.orig/src/functions.c xfce4-taskmanager-0.4.0/src/functions.c ---- xfce4-taskmanager-0.4.0.orig/src/functions.c 2008-05-17 10:20:35.000000000 +0200 -+++ xfce4-taskmanager-0.4.0/src/functions.c 2008-05-24 01:32:25.000000000 +0200 -@@ -55,7 +55,7 @@ - tmp->time = new_tmp->time; - - tmp->old_time_percentage = tmp->time_percentage; -- tmp->time_percentage = (gdouble)(tmp->time - tmp->old_time) * (gdouble)(1/num_cpus); -+ tmp->time_percentage = (gdouble)(tmp->time - tmp->old_time) * ((gdouble)1/num_cpus); - - if( - tmp->ppid != new_tmp->ppid || diff --git a/xfce4-taskmanager-0.4.0-fixes.patch b/xfce4-taskmanager-0.4.0-fixes.patch deleted file mode 100644 index 24fdbb1..0000000 --- a/xfce4-taskmanager-0.4.0-fixes.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -dur xfce4-taskmanager-0.4.0.orig/src/types.h xfce4-taskmanager-0.4.0/src/types.h ---- xfce4-taskmanager-0.4.0.orig/src/types.h 2008-05-17 10:20:35.000000000 +0200 -+++ xfce4-taskmanager-0.4.0/src/types.h 2008-05-24 01:29:00.000000000 +0200 -@@ -73,7 +73,7 @@ - - gboolean show_cached_as_free; /* Show memory used Cache as free memory */ - --guint sort_column; -+gint sort_column; - guint sort_type; - - enum -diff -dur xfce4-taskmanager-0.4.0.orig/src/xfce-taskmanager-linux.c xfce4-taskmanager-0.4.0/src/xfce-taskmanager-linux.c ---- xfce4-taskmanager-0.4.0.orig/src/xfce-taskmanager-linux.c 2008-05-18 19:42:21.000000000 +0200 -+++ xfce4-taskmanager-0.4.0/src/xfce-taskmanager-linux.c 2008-05-24 01:29:00.000000000 +0200 -@@ -20,6 +20,7 @@ - - #include "xfce-taskmanager-linux.h" - -+ - struct task get_task_details(gint pid) - { - FILE *task_file; -@@ -32,9 +33,10 @@ - struct stat status; - gchar filename[255]; - gchar cmdline_filename[255]; -+ static gint pagesize = 0; - -- sprintf(filename, "/proc/%i/stat", pid); -- sprintf(cmdline_filename, "/proc/%i/cmdline", pid); -+ g_snprintf(filename, sizeof(filename), "/proc/%i/stat", pid); -+ g_snprintf(cmdline_filename, sizeof(cmdline_filename), "/proc/%i/cmdline", pid); - - stat(filename, &status); - -@@ -299,7 +301,7 @@ - if(task_id > 0 && signal != 0) - { - gint ret = 0; -- -+ - ret = kill(task_id, signal); - - if(ret != 0) -@@ -313,8 +315,8 @@ - if(task_id > 0) - { - gchar command[128] = ""; -- g_sprintf(command, "renice %d %d > /dev/null", prio, task_id); -- -+ g_snprintf(command, sizeof(command), "renice %d %d > /dev/null", prio, task_id); -+ - if(system(command) != 0) - xfce_err(_("Couldn't set priority %d to the task with ID %d"), prio, task_id); - } -diff -dur xfce4-taskmanager-0.4.0.orig/src/xfce-taskmanager-linux.h xfce4-taskmanager-0.4.0/src/xfce-taskmanager-linux.h ---- xfce4-taskmanager-0.4.0.orig/src/xfce-taskmanager-linux.h 2008-05-18 19:42:21.000000000 +0200 -+++ xfce4-taskmanager-0.4.0/src/xfce-taskmanager-linux.h 2008-05-24 01:29:00.000000000 +0200 -@@ -39,8 +39,6 @@ - #define SIGNAL_CONT SIGCONT - #define SIGNAL_STOP SIGSTOP - --static gint pagesize = 0; -- - struct task get_task_details(gint pid); - GArray *get_task_list(void); - gboolean get_system_status(system_status *sys_stat); diff --git a/xfce4-taskmanager.desktop b/xfce4-taskmanager.desktop deleted file mode 100644 index 196565f..0000000 --- a/xfce4-taskmanager.desktop +++ /dev/null @@ -1,52 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Xfce 4 Taskmanager -GenericName=Taskmanager -Comment=View current processes -Comment[be]=Прагледзіць бягучыя працэсы -Comment[bg]=Показване на текущите процеси -Comment[bs]=Pregled trenutnih procesa -Comment[ca]=Visualitza els processos actuals i l'estat -Comment[cs]=Zobrazit aktuální procesy -Comment[cy]=Gweld prosesau cyfredol -Comment[da]=Vis aktive processer -Comment[de]=Momentan laufende Prozesse anzeigen -Comment[el]=Προβολή τρεχουσών διεργασιών -Comment[en_CA]=View current processes -Comment[en_GB]=View current processes -Comment[es]=Ver los procesos actuales -Comment[eu]=Ikusi uneko prozesuak -Comment[fi]=Katsele aktiivisia prosesseja -Comment[fr]=Affiche les processus en cours -Comment[gl]=Ver procesos actuais -Comment[hr]=Pregled trenutnih procesa -Comment[hu]=A jelenlegi folyamatok megtekintése -Comment[id]=Lihat proses yang -Comment[it]=Mostra i processi correnti -Comment[li]=Tuin huijig proses -Comment[lt]=Parodo paleistus procesus -Comment[lv]=Skatīt pašreizējos procesus -Comment[mk]=Погледни ги моментално активните процеси -Comment[ms]=Lihat proses semasa -Comment[nb]=Vis aktive prosesser -Comment[nl]=Toon de huidige processen -Comment[no]=Vis aktive prosesser -Comment[pl]=Wyświetla istniejące procesy -Comment[pt]=Ver processos actuais -Comment[pt_BR]=Exibe os processos atuais -Comment[ro]=Arată procesele curente -Comment[ru]=Программа для просмотра текущих процессов -Comment[sk]=Zobrazuje aktuálne procesy -Comment[sl]=Glej trenutne procese -Comment[sq]=Shfaq proçeset aktualë -Comment[sr]=Погледај тренутно покренуте процесе -Comment[sr@Latn]=Pogledaj trenutno pokrenute procese -Comment[sv]=Visa aktuella processer -Comment[tr]=Çalışan süreçleri -Exec=xfce4-taskmanager -Icon=xfce4_xicon -Terminal=false -Type=Application -StartupNotify=true -X-Desktop-File-Install-Version=0.10 -OnlyShowIn=XFCE; diff --git a/xfce4-taskmanager.spec b/xfce4-taskmanager.spec index 9974453..3cb5998 100644 --- a/xfce4-taskmanager.spec +++ b/xfce4-taskmanager.spec @@ -1,5 +1,5 @@ Name: xfce4-taskmanager -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: Taskmanager for the Xfce desktop environment @@ -7,12 +7,10 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.4.0-cpufix.patch -Patch1: %{name}-0.4.0-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxfcegui4-devel >= 4.4 -BuildRequires: gettext, desktop-file-utils, perl(XML::Parser) +BuildRequires: gettext, desktop-file-utils, intltool %description A simple taskmanager for the Xfce desktop environment. @@ -20,11 +18,9 @@ A simple taskmanager for the Xfce desktop environment. %prep %setup -q -%patch0 -p1 -b .0cpu -%patch1 -p1 -b .fixes -# convert ChangeLog to UTF-8 -iconv -f ISO-8859-1 -t UTF-8 < ChangeLog > ChangeLog.utf8 && \ - mv ChangeLog.utf8 ChangeLog +# convert ChangeLog and THANKS to UTF-8 to make rpmlint happy +iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog +iconv -f ISO88591 -t UTF8 THANKS -o THANKS %build @@ -41,7 +37,6 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category GTK \ --remove-category Application \ - --add-category System \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop @@ -58,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 30 2008 Christoph Wickert - 0.4.1-1 +- Update to 0.4.1 +- Remove patches (fixed upstream) + * Sat May 24 2008 Christoph Wickert - 0.4.0-1 - Update to 0.4.0 stable which has finally been released - Add patch to fix 0%-CPU bug (rebased version of Enrico Tröger's patch)