rpms/hardinfo/devel fixsensors.patch, NONE, 1.1 hardinfo.spec, 1.2, 1.3 disablesensors.patch, 1.1, NONE

Adel Gadllah (drago01) fedora-extras-commits at redhat.com
Thu Jul 26 08:33:11 UTC 2007


Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25248

Modified Files:
	hardinfo.spec 
Added Files:
	fixsensors.patch 
Removed Files:
	disablesensors.patch 
Log Message:
Fix sensors & cleanups

fixsensors.patch:

--- NEW FILE fixsensors.patch ---
 diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c
--- hardinfo-0.4.2.2.orign/util.c	2007-07-20 16:45:08.000000000 +0200
+++ hardinfo-0.4.2.2/util.c	2007-07-26 10:15:32.000000000 +0200
@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo
     if (source) {
 	retn = g_strconcat(source, buffer, NULL);
 	g_free(buffer);
-        g_free(source);
+        if(strlen(source))
+		 g_free(source);
     } else {
 	retn = buffer;
     }


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/devel/hardinfo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hardinfo.spec	25 Jul 2007 17:28:58 -0000	1.2
+++ hardinfo.spec	26 Jul 2007 08:32:39 -0000	1.3
@@ -1,14 +1,14 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: System Profiler and Benchmark      
 
-Group: User Interface/Desktops     
+Group: Applications/System     
 License: GPL        
 URL: http://hardinfo.berlios.de/            
 Source0:  http://download.berlios.de/hardinfo/%{name}-%{version}.tar.bz2  
 Patch0: multilibfix.patch  
-Patch1: disablesensors.patch 
+Patch1: fixsensors.patch
 Patch2: fixuserdsp.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,7 +18,6 @@
 BuildRequires:  pciutils 
 
 Requires:  pciutils 
-Requires:  zlib  
 
 %description
 HardInfo can gather information about a system's hardware and operating system,
@@ -28,8 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-#disable sensors for now (segfaults)
-%patch1 -p1 -b .disablesensors
+%patch1 -p1 -b .fixsensors
 %patch2 -p1 -b .fixuserdsp
 
 %build
@@ -62,6 +60,11 @@
 
 
 %changelog
+* Thu Jul 26 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-4
+- Fix and reenable sensor reading
+- Remove zlib requires
+- Fix group
+
 * Wed Jul 25 2007 Jesse Keating <jkeating at redhat.com> - 0.4.2.2-3
 - Rebuild for RH #249435
 


--- disablesensors.patch DELETED ---




More information about the fedora-extras-commits mailing list