rpms/vbetool/devel vbetool-0.7-CFLAGS.patch, NONE, 1.1 vbetool.spec, 1.5, 1.6

Till Maas (till) fedora-extras-commits at redhat.com
Tue Mar 25 19:44:05 UTC 2008


Author: till

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

Modified Files:
	vbetool.spec 
Added Files:
	vbetool-0.7-CFLAGS.patch 
Log Message:
* Tue Mar 25 2008 Till Maas <opensource till name> - 0.7-6
- remove overriding of CFLAGS for x86emu


vbetool-0.7-CFLAGS.patch:

--- NEW FILE vbetool-0.7-CFLAGS.patch ---
diff -up vbetool-0.7/x86emu/makefile.linux.CFLAGS vbetool-0.7/x86emu/makefile.linux
--- vbetool-0.7/x86emu/makefile.linux.CFLAGS	2005-07-21 19:14:56.000000000 +0200
+++ vbetool-0.7/x86emu/makefile.linux	2008-03-25 20:31:27.000000000 +0100
@@ -47,7 +47,7 @@ $(TARGETLIB): $(OBJS)
 	ar rv $(TARGETLIB) $(OBJS)
 
 INCS   = -I. -Ix86emu -I../../include -I../x86emu_include
-CFLAGS = -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG -DDEBUG
+CFLAGS += -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG -DDEBUG
 
 .c.o:
 	gcc -g -O -Wall -c $(CFLAGS) $(INCS) $*.c


Index: vbetool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/vbetool.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vbetool.spec	20 Feb 2008 05:20:28 -0000	1.5
+++ vbetool.spec	25 Mar 2008 19:43:25 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           vbetool
 Version:        0.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Run real-mode video BIOS code to alter hardware state
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://www.srcf.ucam.org/~mjg59/vbetool/
 Source0:        http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{version}-1.tar.gz
+Patch1:         vbetool-0.7-CFLAGS.patch
 Patch10:        vbetool-0.3-fix-gcc4bug.patch
 Patch11:        vbetool-libz.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .CFLAGS
 %patch10 -p1 -b .gcc4
 %patch11 -p1 -b .zlib
 
@@ -54,6 +56,9 @@
 
 
 %changelog
+* Tue Mar 25 2008 Till Maas <opensource till name> - 0.7-6
+- remove overriding of CFLAGS for x86emu
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7-5
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list