rpms/gkrellm-freq/FC-4 gkfreq-0.1.1-rmasm.patch, NONE, 1.1 gkrellm-freq.spec, 1.1, 1.2

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/gkrellm-freq/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29653/FC-4

Modified Files:
	gkrellm-freq.spec 
Added Files:
	gkfreq-0.1.1-rmasm.patch 
Log Message:
Backport PPC fix from devel to FC-4 and FC-3 branches.


gkfreq-0.1.1-rmasm.patch:

--- NEW FILE gkfreq-0.1.1-rmasm.patch ---
diff -Naupr gkfreq-0.1.1.orig/gkfreq.c gkfreq-0.1.1/gkfreq.c
--- gkfreq-0.1.1.orig/gkfreq.c	2005-06-07 18:42:00.000000000 +0200
+++ gkfreq-0.1.1/gkfreq.c	2005-07-15 17:51:51.000000000 +0200
@@ -19,13 +19,6 @@ static GkrellmDecal	*decal_text1;
 static gint	style_id;
 
 
-__inline__ unsigned long long int rdtsc()
-{
-	unsigned long long int x;
-	__asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
-	return x;
-}
-
 /* FIXED : whatdoineed2do at yahoo.co.uk
  */
 static


Index: gkrellm-freq.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-freq/FC-4/gkrellm-freq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gkrellm-freq.spec	13 Jul 2005 07:57:03 -0000	1.1
+++ gkrellm-freq.spec	1 Aug 2005 10:54:34 -0000	1.2
@@ -3,11 +3,12 @@
 Summary: CPU frequency display plugin for GKrellM
 Name: gkrellm-freq
 Version: 0.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.peakunix.net/gkfreq/
 Source: http://www.peakunix.net/downloads/gkfreq-%{version}.tar.gz
+Patch: gkfreq-0.1.1-rmasm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gkrellm >= 2.2.0
 BuildRequires: gkrellm-devel >= 2.2.0
@@ -19,6 +20,7 @@
 
 %prep
 %setup -n gkfreq-%{version}
+%patch -p1 -b .noasm
 
 
 %build
@@ -44,6 +46,10 @@
 
 
 %changelog
+* Fri Jul 15 2005 Matthias Saou <http://freshrpms.net/> 0.1.1-2
+- Include patch to remove unused function containing an asm call that made
+  build fail on PPC.
+
 * Tue Jul 12 2005 Matthias Saou <http://freshrpms.net/> 0.1.1-1
 - Initial RPM release, split out from my old gkrellm-plugins package.