SPECS: xen.spec - remove conflicting manpages with qemu - strict i...

[glen]

Author: glen                         Date: Sun Apr 27 10:09:55 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- remove conflicting manpages with qemu
- strict internal deps for -libs

---- Files affected:
SPECS:
   xen.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SPECS/xen.spec
diff -u SPECS/xen.spec:1.61 SPECS/xen.spec:1.62
--- SPECS/xen.spec:1.61	Sun Apr 27 12:06:19 2008
+++ SPECS/xen.spec	Sun Apr 27 12:09:50 2008
@@ -19,7 +19,7 @@
 Summary(pl.UTF-8):	Xen - monitor maszyny wirtualnej
 Name:		xen
 Version:	%{major}.%{minor}
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		Applications/System
 Source0:	http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
@@ -45,6 +45,7 @@
 BuildRequires:	which
 BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	ZopeInterface
 Requires:	bridge-utils
 Requires:	coreutils
@@ -181,12 +182,17 @@
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 
 %py_postclean
+# remove unneeded files
 rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 rm -rf $RPM_BUILD_ROOT%{_docdir}/xen
-rm -rf $RPM_BUILD_ROOT/etc/init.d
+rm -rf $RPM_BUILD_ROOT/''etc/init.d
 rm -f $RPM_BUILD_ROOT/boot/xen-3.2.gz
 rm -f $RPM_BUILD_ROOT/boot/xen-3.gz
 
+# conflict with qemu
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/qemu-img.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/qemu.1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -293,6 +299,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2008-04-27 10:09:50  glen
+- remove conflicting manpages with qemu
+- strict internal deps for -libs
+
 Revision 1.61  2008-04-27 10:06:19  glen
 - python packaging fixes (merge from XEN_3_0_2)
 
================================================================

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