packages: xen/xen.spec - fix for python 2.7 and ncurses headers

marcus marcus at pld-linux.org
Mon Jan 31 13:20:30 CET 2011


Author: marcus                       Date: Mon Jan 31 12:20:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for python 2.7 and ncurses headers

---- Files affected:
packages/xen:
   xen.spec (1.84 -> 1.85) 

---- Diffs:

================================================================
Index: packages/xen/xen.spec
diff -u packages/xen/xen.spec:1.84 packages/xen/xen.spec:1.85
--- packages/xen/xen.spec:1.84	Fri Jan 21 15:53:39 2011
+++ packages/xen/xen.spec	Mon Jan 31 13:20:25 2011
@@ -31,6 +31,8 @@
 Patch0:		%{name}-python_scripts.patch
 Patch1:		%{name}-gcc.patch
 Patch2:		%{name}-symbols.patch
+Patch3:		%{name}-curses.patch
+Patch4:		%{name}-python27.patch
 URL:		http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 BuildRequires:	SDL-devel
 %{?with_hvm:BuildRequires:	bcc}
@@ -179,6 +181,8 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -fv
 
@@ -218,19 +222,10 @@
 # remove unneeded files
 %{__rm} $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xen
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
 %{__rm} -r $RPM_BUILD_ROOT/''etc/init.d
 %{__rm} $RPM_BUILD_ROOT/boot/xen-3.4.gz
 %{__rm} $RPM_BUILD_ROOT/boot/xen-3.gz
 
-# strip - Unable to recognise the format of the input file
-# %{__rm} $RPM_BUILD_ROOT%{_datadir}/xen/qemu/openbios-sparc32
-# %{__rm} $RPM_BUILD_ROOT%{_datadir}/xen/qemu/openbios-sparc64
-
-# conflict with qemu
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/qemu-img.1
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/qemu.1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -339,6 +334,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2011/01/31 12:20:25  marcus
+- fix for python 2.7 and ncurses headers
+
 Revision 1.84  2011/01/21 14:53:39  glen
 - use __rm macro, to encourage cleaning up outdated rm (like xen-3.2 likely was)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xen/xen.spec?r1=1.84&r2=1.85&f=u



More information about the pld-cvs-commit mailing list