rpms/gkrellm-top/F-11 gkrelltop-2.2.13-optflags.patch, NONE, 1.1 gkrellm-top.spec, 1.4, 1.5 gkrelltop-2.2.10-optflags.patch, 1.1, NONE

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/gkrellm-top/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8432/F-11

Modified Files:
	gkrellm-top.spec 
Added Files:
	gkrelltop-2.2.13-optflags.patch 
Removed Files:
	gkrelltop-2.2.10-optflags.patch 
Log Message:
Change what I forgot to change...


gkrelltop-2.2.13-optflags.patch:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gkrelltop-2.2.13-optflags.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for gkrelltop >= 2.2.13, which
adds the missing $RPM_OPT_FLAGS to the Makefile for proper building results.

--- gkrelltop-2.2.13.orig/Makefile		2009-07-24 07:09:39.000000000 +0200
+++ gkrelltop-2.2.13.orig/Makefile.optflags	2009-07-25 01:01:50.000000000 +0200
@@ -43,14 +43,14 @@
 
 ifeq ($(GKRELL1FLAG),0)
 # Parameters for gkrellm version 2.*
-CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags`
+CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(RPM_OPT_FLAGS)
 LIBS =  
 CC=/usr/bin/gcc $(CFLAGS2)
 
 else 
 # Parameters for gkrellm version 1.*
 CC=/usr/bin/cc
-CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` 
+CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` $(RPM_OPT_FLAGS)
 LIBS=
 
 endif
@@ -65,12 +65,12 @@
 endif
 
 ifeq ($(WANT_GLIB12),yes)
-CFLAGSD = -I/usr/X11R6/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags`
+CFLAGSD = -I/usr/X11R6/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags` $(RPM_OPT_FLAGS)
 LIBSD = `glib-config --libs`
 LIBSD = 
 CONFIGURE_ARGS += --with-glib12
 else
-CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags`
+CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags` $(RPM_OPT_FLAGS)
 LIBSD = `pkg-config glib-2.0 --libs`
 LIBSD = 
 endif


Index: gkrellm-top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm-top/F-11/gkrellm-top.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gkrellm-top.spec	24 Jul 2009 22:47:13 -0000	1.4
+++ gkrellm-top.spec	24 Jul 2009 23:22:19 -0000	1.5
@@ -8,7 +8,7 @@ License:	GPL+
 Group:		Applications/System
 URL:		http://gkrelltop.sourceforge.net/
 Source:		http://downloads.sf.net/gkrelltop/gkrelltop_%{version}.orig.tar.gz
-Patch:		gkrelltop-2.2.10-optflags.patch
+Patch:		gkrelltop-2.2.13-optflags.patch
 Requires:	gkrellm >= 2.2.0
 BuildRequires:	gkrellm-devel >= 2.2.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


--- gkrelltop-2.2.10-optflags.patch DELETED ---