SPECS: xen.spec - -doc subpackage removed, docs moved to %doc (a s...

Sun Apr 30 21:00:01 CEST 2006

Author: jajcus                       Date: Sun Apr 30 19:00:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -doc subpackage removed, docs moved to %doc (a subpackage for a short
  documentation is overkill and installing documentation in %{_datadir} seems
  like a mistake)
- R: latex2html
- s,#!/bin/sh,#!/bin/bash, in many scripts -- they were written with Bash in mind
- s,#!/usr/bin/env python,#!/usr/bin/python, for all Python scripts
- Python scripts installed in %{py_scriptdir} and %{py_sitescriptdir}
- missing directories in /var/run added
- syms filename fixed
- many previously unpackaged files added to the package

---- Files affected:
SPECS:
   xen.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/xen.spec
diff -u SPECS/xen.spec:1.25 SPECS/xen.spec:1.26

--- SPECS/xen.spec:1.25	Thu Apr 20 19:59:48 2006
+++ SPECS/xen.spec	Sun Apr 30 20:59:56 2006
@@ -6,7 +6,7 @@
 Summary(pl):	Xen - monitor maszyny wirtualnej
 Name:		xen
 Version:	3.0.2
-Release:	0.1
+Release:	0.2
 Epoch:		0
 License:	GPL
 Group:		Applications/System
@@ -14,9 +14,12 @@
 # Source0-md5:	544eab940a0734a55459d648e5c3b224
 Source1:	%{name}-xend.init
 Source2:	%{name}-xendomains.init
+Patch0:		%{name}-python_scripts.patch
+Patch1:		%{name}-bash_scripts.patch
 URL:		http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 BuildRequires:	XFree86-devel
 BuildRequires:	curl-devel
+BuildRequires:	latex2html
 BuildRequires:	libidn-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	python-Twisted
@@ -89,36 +92,27 @@
 %description static -l pl
 Statyczne biblioteki xena.
 
-%package doc
-Summary:	Xen documentation
-Summary(pl):	Dokumentacja xena
-Group:		Applications/System
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description doc
-Xen documentation.
-
-%description doc -l pl
-Dokumentacja xena.
-
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 chmod -R u+w .
-#echo 'CXXFLAGS+=-I/usr/include/ncurses' >> tools/ioemu/gui/Makefile
 
 %build
-CFLAGS="%{rpmcflags}" \
-CXXFLAGS="%{rpmcflags}" \
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
+CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
 %{__make} xen tools docs \
 	CC="%{__cc}" \
-	CXX="%{__cxx}"
+	CXX="%{__cxx}" 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/var/run/{xen-hotplug,xend,xenstored}
 
 %{__make} install-xen install-tools install-docs \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	XEN_PYTHON_NATIVE_INSTALL=1
 
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/xend
@@ -126,25 +120,18 @@
 
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/xend-db/{domain,vnet}
 
-#install -d $RPM_BUILD_ROOT%{_mandir}
-#cp -a $RPM_BUILD_ROOT%{_prefix}/man/* $RPM_BUILD_ROOT%{_mandir}
+rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 
-#install -d doc-html-install/{interface,user}
-#cp -a docs/html/interface/*.{png,html,css} doc-html-install/interface
-#cp -a docs/html/user/*.{png,html,css} doc-html-install/user
+%{py_comp} $RPM_BUILD_ROOT%{py_sitedir}
+%{py_ocomp} $RPM_BUILD_ROOT%{py_sitedir}
+%{py_comp} $RPM_BUILD_ROOT%{py_sitescriptdir}
+%{py_ocomp} $RPM_BUILD_ROOT%{py_sitescriptdir}
 
-rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 
-%{py_comp} $RPM_BUILD_ROOT%{_libdir}/python
-%{py_ocomp} $RPM_BUILD_ROOT%{_libdir}/python
-find $RPM_BUILD_ROOT%{_libdir}/python -name '*.py' -exec rm "{}" ";"
-
-install -d $RPM_BUILD_ROOT%{_datadir}/xen/
-cp -f $RPM_BUILD_ROOT%{_datadir}/doc/xen/pdf/*.pdf $RPM_BUILD_ROOT%{_datadir}/xen/
-
-install -d $RPM_BUILD_ROOT%{_sharedstatedir}/xen
-install -d $RPM_BUILD_ROOT%{_sharedstatedir}/xen/{sv,xend-db}
-install -d $RPM_BUILD_ROOT%{_sharedstatedir}/xen/xend-db/{domain,vnet,migrate}
+find $RPM_BUILD_ROOT%{py_sitedir} -name '*.py' -exec rm "{}" ";"
+find $RPM_BUILD_ROOT%{py_sitescriptdir} -name '*.py' -exec rm "{}" ";"
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen
+rm -rf $RPM_BUILD_ROOT/etc/init.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -167,13 +154,16 @@
 
 %files
 %defattr(644,root,root,755)
-#%doc COPYING ChangeLog README docs/misc/* doc-html-install/*
 %doc COPYING ChangeLog README docs/misc/*
-/boot/%{name}-%{version}-syms
+%doc docs/html/*
+/boot/%{name}-syms-%{version}
 /boot/%{name}-%{version}.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/*
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/*
 %dir %{_sysconfdir}/xen
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/qemu-ifup
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/*.*
 #%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/b*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xmexample[12]
@@ -183,15 +173,27 @@
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*
-%{_libdir}/python/%{name}
-%attr(755,root,root) %{_libdir}/python/%{name}/lowlevel/*.so
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/bin
+%attr(744,root,root) %{_libdir}/%{name}/bin/*
+%{_datadir}/xen
+%dir %{py_sitedir}/%{name}
+%dir %{py_sitedir}/%{name}/lowlevel
+%{py_sitedir}/%{name}/lowlevel/*.py*
+%attr(755,root,root) %{py_sitedir}/%{name}/lowlevel/*.so
+%{py_sitedir}/%{name}/sv
+%{py_sitedir}/%{name}/util
+%{py_sitedir}/%{name}/web
+%{py_sitedir}/%{name}/xend
+%{py_sitedir}/%{name}/xm
+%{py_sitedir}/%{name}/*.py*
+%{py_sitescriptdir}/*
 %{_mandir}/man?/*
-%dir %{_sharedstatedir}/xen
-%dir %{_sharedstatedir}/xen/sv
-%dir %{_sharedstatedir}/xen/xend-db
-%dir %{_sharedstatedir}/xen/xend-db/domain
-%dir %{_sharedstatedir}/xen/xend-db/vnet
-%dir %{_sharedstatedir}/xen/xend-db/migrate
+%{_sharedstatedir}/xen
+%{_sharedstatedir}/xenstored
+%dir /var/run/xen-hotplug
+%dir %attr(700,root,root) /var/run/xend
+%dir /var/run/xenstored
 
 %files devel
 %defattr(644,root,root,755)
@@ -202,17 +204,24 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%files doc
-%defattr(644,root,root,755)
-%dir %{_datadir}/xen
-%{_datadir}/xen/*.pdf
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/04/30 18:59:56  jajcus
+- -doc subpackage removed, docs moved to %doc (a subpackage for a short
+  documentation is overkill and installing documentation in %{_datadir} seems
+  like a mistake)
+- R: latex2html
+- s,#!/bin/sh,#!/bin/bash, in many scripts -- they were written with Bash in mind
+- s,#!/usr/bin/env python,#!/usr/bin/python, for all Python scripts
+- Python scripts installed in %{py_scriptdir} and %{py_sitescriptdir}
+- missing directories in /var/run added
+- syms filename fixed
+- many previously unpackaged files added to the package
+
 Revision 1.25  2006/04/20 17:59:48  glen
 - cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xen.spec?r1=1.25&r2=1.26&f=u

