rpms/netdump-server/EL-5 netdump-server-Makefile.patch, 1.1, 1.2 netdump-server.spec, 1.4, 1.5

[Neil Horman (nhorman)]

Author: nhorman

Update of /cvs/extras/rpms/netdump-server/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3872

Modified Files:
	netdump-server-Makefile.patch netdump-server.spec 
Log Message:
Fixing spec file

netdump-server-Makefile.patch:

Index: netdump-server-Makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/netdump-server/EL-5/netdump-server-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netdump-server-Makefile.patch	14 Dec 2007 00:26:00 -0000	1.1
+++ netdump-server-Makefile.patch	14 Dec 2007 14:10:04 -0000	1.2
@@ -5,10 +5,11 @@
  DEBUG_FLAGS=-Wall -g
  
 -CFLAGS=`glib-config --cflags` $(DEBUG_FLAGS) -D_FILE_OFFSET_BITS=64
- LDFLAGS=`glib-config --libs` -lpopt
+-LDFLAGS=`glib-config --libs` -lpopt
++LDFLAGS=`pkg-config glib --libs` -lpopt
  
  VERSION=$(shell awk '/Version:/ { print $$2 }' netdump.spec)
-@@ -21,12 +20,12 @@ netdump-server: server.o netdumpclient.o
+@@ -21,12 +20,12 @@
  	gcc -o netdump-server server.o netdumpclient.o configuration.o $(LDFLAGS)
  
  install: netdump-server


Index: netdump-server.spec
===================================================================
RCS file: /cvs/extras/rpms/netdump-server/EL-5/netdump-server.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netdump-server.spec	14 Dec 2007 13:46:36 -0000	1.4
+++ netdump-server.spec	14 Dec 2007 14:10:04 -0000	1.5
@@ -45,7 +45,7 @@
 %patch8 -p1
 
 %build
-export CFLAGS="%{optflags} `glib-config --cflags`"; make
+export CFLAGS="%{optflags} `pkg-config glib --cflags`"; make
 
 %install
 rm -rf $RPM_BUILD_ROOT