rpms/nqc/FC-6 nqc-3.1.4-linux.patch,1.1,1.2 nqc.spec,1.5,1.6

[Rick L. Vinyard, Jr. (rvinyard)]

Author: rvinyard

Update of /cvs/extras/rpms/nqc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27330/FC-6

Modified Files:
	nqc-3.1.4-linux.patch nqc.spec 
Log Message:


nqc-3.1.4-linux.patch:

Index: nqc-3.1.4-linux.patch
===================================================================
RCS file: /cvs/extras/rpms/nqc/FC-6/nqc-3.1.4-linux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nqc-3.1.4-linux.patch	20 Aug 2006 19:08:00 -0000	1.1
+++ nqc-3.1.4-linux.patch	4 Feb 2007 05:40:18 -0000	1.2
@@ -34,8 +34,20 @@
  {
 diff -P -r -U 5 nqc-3.1.r4.orig/Makefile nqc-3.1.r4/Makefile
 --- nqc-3.1.r4.orig/Makefile	2005-03-16 10:49:40.000000000 -0700
-+++ nqc-3.1.r4/Makefile	2006-08-19 17:50:54.000000000 -0600
-@@ -84,11 +84,11 @@
++++ nqc-3.1.r4/Makefile	2007-02-03 20:22:17.000000000 -0700
+@@ -64,10 +64,11 @@
+ MKDIR?=mkdir
+ MV?=mv -f
+ RM?=rm -f
+ 
+ # CFLAGS
++CFLAGS = $(RPM_OPT_FLAGS)
+ #CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
+ 
+ USBOBJ = rcxlib/RCX_USBTowerPipe_none.o
+ 
+@@ -84,11 +85,11 @@
    CXX = c++
  else
  ifneq (,$(strip $(findstring $(OSTYPE), Linux)))


Index: nqc.spec
===================================================================
RCS file: /cvs/extras/rpms/nqc/FC-6/nqc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nqc.spec	28 Aug 2006 02:16:21 -0000	1.5
+++ nqc.spec	4 Feb 2007 05:40:18 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           nqc
 Version:        3.1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Not Quite C compiler
 
 Group:          Development/Languages
 License:        MPL
 URL:            http://bricxcc.sourceforge.net/nqc/
 Source0:        http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r4.tgz
-Source1:	60-legousbtower.rules
+Source1:        60-legousbtower.rules
 Source2:	http://bricxcc.sourceforge.net/nqc/doc/faq.html
 Source3:	http://bricxcc.sourceforge.net/nqc/doc/NQC_Manual.pdf
 Source4:	http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Feb 03 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.4-6
+- Added RPM_OPTS to Makefile in patch
+
 * Sun Aug 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.4-5
 - Readded BuildRequires for bison