rpms/kvm/devel kvm.spec,1.7,1.8 kvm-qemu-ide-dma.patch,1.1,NONE

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22923

Modified Files:
	kvm.spec 
Removed Files:
	kvm-qemu-ide-dma.patch 
Log Message:
* Mon Feb 26 2007 Jeremy Katz <katzj at redhat.com> - 14-2
- use default optflags for non-qemu pieces (#230012)



Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kvm.spec	23 Feb 2007 17:01:01 -0000	1.7
+++ kvm.spec	26 Feb 2007 21:00:45 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 14
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -33,7 +33,14 @@
 # we need to install the data bits in a different path
 sed -i 's/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/qemu\"/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/kvm\"/' qemu/config-host.h
 sed -i 's/datadir=\/usr\/share\/qemu/datadir=\/usr\/share\/kvm/' qemu/config-host.mak
-make %{?_smp_mflags}
+
+# we can't use RPM_OPT_FLAGS for the same reasons as qemu (#208026) for the
+# qemu bits.  so let's set it for the other pieces.  this requires some
+# manual keeping up of what is in the kvm tree.
+sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile
+echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
+make %{?_smp_mflags} 
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +67,9 @@
 %{_datadir}/kvm
 
 %changelog
+* Mon Feb 26 2007 Jeremy Katz <katzj at redhat.com> - 14-2
+- use default optflags for non-qemu pieces (#230012)
+
 * Fri Feb 23 2007 Jeremy Katz <katzj at redhat.com> - 14-1
 - update to kvm-14
 - note: this requires a kernel that's 2.6.21-rc1 or newer


--- kvm-qemu-ide-dma.patch DELETED ---