devel/qemu qemu-0.6.1-build.patch,NONE,1.1 qemu.spec,1.1,1.2

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/devel/qemu
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11088

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.6.1-build.patch 
Log Message:
Clean up according to Enrico's comments


qemu-0.6.1-build.patch:

--- NEW FILE qemu-0.6.1-build.patch ---
--- qemu-0.6.1/Makefile.strip	2005-02-13 14:38:23.000000000 +0000
+++ qemu-0.6.1/Makefile	2005-02-13 14:42:27.000000000 +0000
@@ -1,6 +1,6 @@
 -include config-host.mak
 
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing 
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
@@ -45,7 +45,7 @@
 install: all 
 	mkdir -p "$(bindir)"
 ifndef CONFIG_WIN32
-	install -m 755 -s $(TOOLS) "$(bindir)"
+	install -m 755 $(TOOLS) "$(bindir)"
 endif
 	mkdir -p "$(datadir)"
 	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
--- qemu-0.6.1/Makefile.target.strip	2005-02-13 14:38:19.000000000 +0000
+++ qemu-0.6.1/Makefile.target	2005-02-13 14:42:49.000000000 +0000
@@ -7,7 +7,7 @@
 VPATH+=:$(SRC_PATH)/linux-user
 DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
 endif
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing
 LDFLAGS=-g
 LIBS=
 HELPER_CFLAGS=$(CFLAGS)
@@ -148,7 +148,7 @@
 ifeq ($(ARCH),alpha)
 # -msmall-data is not used because we want two-instruction relocations
 # for the constant constructions
-OP_CFLAGS=-Wall -O2 -g
+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall
 # Ensure there's only a single GP
 CFLAGS += -msmall-data
 LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld
@@ -397,7 +397,7 @@
 
 install: all 
 ifneq ($(PROGS),)
-	install -m 755 -s $(PROGS) "$(bindir)"
+	install -m 755 $(PROGS) "$(bindir)"
 endif
 
 ifneq ($(wildcard .depend),)


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/devel/qemu/qemu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu.spec	13 Feb 2005 12:57:23 -0000	1.1
+++ qemu.spec	13 Feb 2005 16:08:11 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.6.1
-Release: 1
-License: LGPL
+Release: 2
+License: GPL/LGPL
 Group: Development/Tools
 URL: http://fabrice.bellard.free.fr/qemu
 Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz
 Source1: qemu.init
+Patch0: qemu-0.6.1-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: SDL-devel
 PreReq: /sbin/chkconfig
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 ./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M
@@ -43,7 +45,7 @@
 	bindir="${RPM_BUILD_ROOT}%{_bindir}" \
 	sharedir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" \
 	mandir="${RPM_BUILD_ROOT}%{_mandir}" \
-	docdir="${RPM_BUILD_ROOT}%{_docdir}" \
+	docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
 	datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
 	
 install -D $RPM_SOURCE_DIR/qemu.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu 
@@ -58,19 +60,22 @@
 if [ $1 = 0 ]; then
         /sbin/service qemu stop > /dev/null 2>&1
 fi
+/sbin/chkconfig --del qemu
 
 %files
 %defattr(-,root,root)
 %doc Changelog README README.distrib TODO
 %doc qemu-tech.texi qemu-doc.texi 
-%doc linux-2.6-qemu-fast.patch
-%doc %{_docdir}
-%{_bindir}
+%doc linux-2.6-qemu-fast.patch *.html
+%{_bindir}/qemu*
 %{_prefix}/share/qemu
-%{_mandir}
-%{_sysconfdir}/rc.d/init.d/qemu
+%{_mandir}/man?/*
+%config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0.6.1-2
+- Package cleanup
+
 * Sun Nov 21 2004 David Woodhouse <dwmw2 at redhat.com> 0.6.1-1
 - Update to 0.6.1