rpms/xfce4-taskmanager/F-8 xfce4-taskmanager-0.4.0-cpufix.patch, NONE, 1.1 xfce4-taskmanager-0.4.0-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-taskmanager.spec, 1.7, 1.8

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-taskmanager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21698

Modified Files:
	.cvsignore sources xfce4-taskmanager.spec 
Added Files:
	xfce4-taskmanager-0.4.0-cpufix.patch 
	xfce4-taskmanager-0.4.0-fixes.patch 
Log Message:
* Sat May 24 2008 Christoph Wickert <fedora christoph-wickert de> - 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)
- Add patch to fix some compiler warnings (also based on Enrico's work)
- Update license tag


xfce4-taskmanager-0.4.0-cpufix.patch:

--- NEW FILE xfce4-taskmanager-0.4.0-cpufix.patch ---
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 ||

xfce4-taskmanager-0.4.0-fixes.patch:

--- NEW FILE xfce4-taskmanager-0.4.0-fixes.patch ---
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);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-taskmanager/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 13:08:22 -0000	1.3
+++ .cvsignore	24 May 2008 01:29:06 -0000	1.4
@@ -1 +1 @@
-xfce4-taskmanager-0.4.0-rc2.tar.bz2
+xfce4-taskmanager-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-taskmanager/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 13:08:22 -0000	1.3
+++ sources	24 May 2008 01:29:06 -0000	1.4
@@ -1 +1 @@
-6111d36a743ecef817b5589f90a3f869  xfce4-taskmanager-0.4.0-rc2.tar.bz2
+fff1988558b319a71b83387964987227  xfce4-taskmanager-0.4.0.tar.bz2


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-taskmanager/F-8/xfce4-taskmanager.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-taskmanager.spec	5 Oct 2006 13:10:32 -0000	1.7
+++ xfce4-taskmanager.spec	24 May 2008 01:29:06 -0000	1.8
@@ -1,53 +1,72 @@
-Name:		xfce4-taskmanager
-Version:	0.4.0
-Release:	0.2.rc2%{?dist}
-Summary:	Taskmanager for the Xfce desktop environment
-
-Group:		User Interface/Desktops
-License:	GPL
-URL:		http://xfce4-taskmanager.nebulon.de
-Source0:	http://xfce4-taskmanager.nebulon.de/xfce4-taskmanager-0.4.0-rc2.tar.bz2
-Source1:	xfce4-taskmanager.desktop
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           xfce4-taskmanager
+Version:        0.4.0
+Release:        1%{?dist}
+Summary:        Taskmanager for the Xfce desktop environment
+
+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.2, gettext, desktop-file-utils, perl(XML::Parser)
+BuildRequires:  libxfcegui4-devel >= 4.4
+BuildRequires:  gettext, desktop-file-utils, perl(XML::Parser)
 
 %description
 A simple taskmanager for the Xfce desktop environment.
 
+
 %prep
-%setup -qn %{name}-%{version}-rc2
-# fix some permissons...
-chmod 0644 src/*.c
-chmod 0644 src/*.h
-chmod 0644 AUTHORS ChangeLog COPYING README TODO
+%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
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-desktop-file-install --vendor fedora				\
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
-	--add-category X-Fedora					\
-	--add-category Application				\
-	--add-category System					\
-	%{SOURCE1}
+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
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 
+
 %changelog
+* Sat May 24 2008 Christoph Wickert <fedora christoph-wickert de> - 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)
+- Add patch to fix some compiler warnings (also based on Enrico's work)
+- Update license tag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.0-0.3.rc2
+- Autorebuild for GCC 4.3
+
 * Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-0.2.rc2
 - Bump release for devel checkin.