SPECS (XEN_3_0_4): xen.spec - update to 3.0.4-1

Fri May 23 23:27:35 CEST 2008

Author: glen                         Date: Fri May 23 21:27:35 2008 GMT
Module: SPECS                         Tag: XEN_3_0_4
---- Log message:
- update to 3.0.4-1

---- Files affected:
SPECS:
   xen.spec (1.34.2.11 -> 1.34.2.11.2.1) 

---- Diffs:

================================================================
Index: SPECS/xen.spec
diff -u SPECS/xen.spec:1.34.2.11 SPECS/xen.spec:1.34.2.11.2.1

--- SPECS/xen.spec:1.34.2.11	Fri May 23 22:52:07 2008
+++ SPECS/xen.spec	Fri May 23 23:27:30 2008
@@ -5,25 +5,32 @@
 #
 # Conditional build:
 %bcond_without	pae		# build without PAE (HIGHMEM64G) support (PLD Xen* kernels require PAE)
-#
+
+%ifnarch %{ix86}
+%undefine	with_pae
+%endif
+%ifarch i386 i486 i586
+%undefine	with_pae
+%endif
+
+%define		subver	_1
+%define		extraver	-1
 Summary:	Xen - a virtual machine monitor
 Summary(pl.UTF-8):	Xen - monitor maszyny wirtualnej
 Name:		xen
-Version:	3.0.2
-Release:	3
+Version:	3.0.4
+Release:	0.1
 License:	GPL
 Group:		Applications/System
-Source0:	http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/%{name}-%{version}-src.tgz
-# Source0-md5:	544eab940a0734a55459d648e5c3b224
+Source0:	http://bits.xensource.com/oss-xen/release/%{version}%{subver}/src.tgz/%{name}-%{version}%{subver}-src.tgz
+# Source0-md5:	e85e16ad3dc354338e3ac4a8951f9649
 Source1:	%{name}-xend.init
 Source2:	%{name}-xendomains.init
 Patch0:		%{name}-python_scripts.patch
 Patch1:		%{name}-bash_scripts.patch
 Patch2:		%{name}-bridge_setup.patch
-Patch3:		%{name}-xenstore-version.patch
-Patch4:		%{name}-reisermodule.patch
-Patch5:		%{name}-libvncserver-detect-fix.patch
-URL:		http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
+Patch3:		%{name}-python-devel.patch
+URL:		http://www.cl.cam.ac.uk/research/srg/netos/xen/index.html
 BuildRequires:	SDL-devel
 BuildRequires:	XFree86-devel
 %ifarch %{ix86}
@@ -60,10 +67,6 @@
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifnarch i686 athlon pentium3 pentium4
-%undefine	with_pae
-%endif
-
 %description
 This package contains the Xen hypervisor and Xen tools, needed to run
 virtual machines on x86 systems, together with the kernel-xen*
@@ -138,21 +141,18 @@
 ModuĹ‚y Pythona dla xena.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?subver}-src
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-chmod -R u+w .
 
 %build
 CFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
 CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
 %{__make} xen tools docs \
 	%{?with_pae:XEN_TARGET_X86_PAE=y} \
+	XENFB_TOOLS=y \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
@@ -179,11 +179,13 @@
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 
 %py_postclean
+
 rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 rm -rf $RPM_BUILD_ROOT%{_docdir}/xen
 rm -rf $RPM_BUILD_ROOT/etc/init.d
 rm -f $RPM_BUILD_ROOT/boot/xen-3.0.gz
 rm -f $RPM_BUILD_ROOT/boot/xen-3.gz
+rm -f $RPM_BUILD_ROOT/usr/share/doc/qemu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -208,8 +210,8 @@
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog README docs/misc/*
 %doc docs/html/*
-/boot/%{name}-syms-%{version}
-/boot/%{name}-%{version}.gz
+/boot/%{name}-syms-%{version}%{extraver}
+/boot/%{name}-%{version}%{extraver}.gz
 /boot/%{name}.gz
 %attr(754,root,root) /etc/rc.d/init.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
@@ -242,7 +244,24 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*
+%attr(755,root,root) %ghost %{_libdir}/libblktap.so.3.0
+%attr(755,root,root) %{_libdir}/libblktap.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfsimage.so.1.0
+%attr(755,root,root) %{_libdir}/libfsimage.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxenctrl.so.3.0
+%attr(755,root,root) %{_libdir}/libxenctrl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxenguest.so.3.0
+%attr(755,root,root) %{_libdir}/libxenguest.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxenstore.so.3.0
+%attr(755,root,root) %{_libdir}/libxenstore.so.*.*.*
+
+# subpackages? python part apparently uses these
+%dir %{_libdir}/fs/ext2fs-lib
+%dir %{_libdir}/fs/reiserfs
+%dir %{_libdir}/fs/ufs
+%attr(755,root,root) %{_libdir}/fs/ext2fs-lib/fsimage.so
+%attr(755,root,root) %{_libdir}/fs/reiserfs/fsimage.so
+%attr(755,root,root) %{_libdir}/fs/ufs/fsimage.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -255,20 +274,14 @@
 
 %files -n python-xen
 %defattr(644,root,root,755)
+
 %dir %{py_sitedir}/grub
 %{py_sitedir}/grub/*.py[co]
-%dir %{py_sitedir}/grub/fsys
-%{py_sitedir}/grub/fsys/*.py[co]
-%dir %{py_sitedir}/grub/fsys/reiser
-%{py_sitedir}/grub/fsys/reiser/*.py[co]
-%attr(755,root,root) %{py_sitedir}/grub/fsys/reiser/*.so
-%dir %{py_sitedir}/grub/fsys/ext2
-%{py_sitedir}/grub/fsys/ext2/*.py[co]
-%attr(755,root,root)  %{py_sitedir}/grub/fsys/ext2/*.so
 %dir %{py_sitedir}/xen
 %dir %{py_sitedir}/xen/lowlevel
 %{py_sitedir}/xen/lowlevel/*.py[co]
 %attr(755,root,root) %{py_sitedir}/xen/lowlevel/*.so
+%attr(755,root,root) %{py_sitedir}/fsimage.so
 %{py_sitedir}/xen/sv
 %{py_sitedir}/xen/util
 %{py_sitedir}/xen/web
@@ -282,6 +295,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34.2.11.2.1  2008-05-23 21:27:30  glen
+- update to 3.0.4-1
+
 Revision 1.34.2.11  2008-05-23 20:52:07  glen
 - separate python-xen; rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xen.spec?r1=1.34.2.11&r2=1.34.2.11.2.1&f=u

