rpms/xen/devel xen-no-werror.patch,NONE,1.1 xen.spec,1.239,1.240

Gerd Hoffmann kraxel at fedoraproject.org
Wed Aug 5 11:49:57 UTC 2009


Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27722

Modified Files:
	xen.spec 
Added Files:
	xen-no-werror.patch 
Log Message:
fix build

xen-no-werror.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-no-werror.patch ---
diff -up xen-3.4.0/tools/libxc/Makefile.werror xen-3.4.0/tools/libxc/Makefile
--- xen-3.4.0/tools/libxc/Makefile.werror	2009-08-05 13:40:32.000000000 +0200
+++ xen-3.4.0/tools/libxc/Makefile	2009-08-05 13:40:52.000000000 +0200
@@ -52,7 +52,7 @@ GUEST_SRCS-$(CONFIG_IA64)    += xc_dom_i
 
 -include $(XEN_TARGET_ARCH)/Makefile
 
-CFLAGS   += -Werror -Wmissing-prototypes
+CFLAGS   += -Wmissing-prototypes
 CFLAGS   += $(INCLUDES) -I. -I../xenstore -I../include
 
 # Needed for posix_fadvise64() in xc_linux.c


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- xen.spec	27 Jul 2009 07:47:01 -0000	1.239
+++ xen.spec	5 Aug 2009 11:49:56 -0000	1.240
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -36,6 +36,8 @@ Patch3: xen-xenstore-cli.patch
 Patch4: xen-dumpdir.patch
 Patch5: xen-net-disable-iptables-on-bridge.patch
 
+Patch10: xen-no-werror.patch
+
 Patch100: xen-configure-xend.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -132,6 +134,8 @@ which manage Xen virtual machines.
 %patch4 -p1
 %patch5 -p1
 
+%patch10 -p1
+
 %patch100 -p1
 
 # stubdom sources
@@ -190,6 +194,9 @@ done
 # README's not intended for end users
 rm -f %{buildroot}/%{_sysconfdir}/xen/README*
 
+# standard gnu info files
+rm -rf %{buildroot}/usr/info
+
 ############ fixup files in /etc ############
 
 # udev
@@ -219,14 +226,6 @@ install -m 644 %{SOURCE30} %{buildroot}%
 install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled
 install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl
 
-############ fixup info files ############
-
-mkdir -p %{buildroot}/usr/share/info
-for info in %{buildroot}/usr/info/*info*; do
-	mv "$info" "%{buildroot}/usr/share/info/xen-$(basename $info)"
-done
-rmdir %{buildroot}/usr/info
-
 ############ create dirs in /var ############
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/domain
@@ -280,16 +279,6 @@ fi
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%post doc
-/sbin/install-info --info-dir=/usr/share/info /usr/share/info/xen-configure.info
-/sbin/install-info --info-dir=/usr/share/info /usr/share/info/xen-standards.info
-
-%preun doc
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete --info-dir=/usr/share/info /usr/share/info/xen-configure.info
-  /sbin/install-info --delete --info-dir=/usr/share/info /usr/share/info/xen-standards.info
-fi
-
 %clean
 rm -rf %{buildroot}
 
@@ -450,7 +439,6 @@ rm -rf %{buildroot}
 %doc docs/misc/
 %doc dist/install/usr/share/doc/xen/html
 %doc dist/install/usr/share/doc/xen/pdf/*.pdf
-/usr/share/info/*info*
 
 %files devel
 %defattr(-,root,root)
@@ -461,6 +449,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Wed Aug 5 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.0-4
+- Kill info files.  No xen docs, just standard gnu stuff.
+- kill -Werror in tools/libxc to fix build.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list