From 061e3ecf15265d2dbb547307337771c60fda6b71 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Jul 25 2006 17:14:49 +0000
Subject: - fix libblktap symlinks (#199820)

- make libxenstore executable (#197316)
- version libxenstore (markmc)

---

diff --git a/xen.spec b/xen.spec
index 8c3cbc2..8bd2da2 100644
--- a/xen.spec
+++ b/xen.spec
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 18
+Release: 19
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -23,6 +23,11 @@ Patch100: xen-config-dom0-minmem.patch
 Patch102: xen-3.0.2-config-allow-unix-server.patch
 Patch103: xen-3.0.2-config-disable-reloc.patch
 
+# upstream already
+Patch200: xen-libxenstore-exec.patch
+Patch201: xen-libblktap-symlinks.patch
+Patch202: xen-xenstore-version.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
 BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
@@ -91,6 +96,11 @@ virtual machines.
 %patch102 -p1
 %patch103 -p1
 
+# upstream'd patches
+%patch200 -p1
+%patch201 -p1 
+%patch202 -p1
+
 cp %{SOURCE2} .
 
 %build
@@ -188,8 +198,6 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%{_libdir}/libxenstore.so
-%{_libdir}/libblktap.so
 
 %files devel
 %defattr(-,root,root)
@@ -197,14 +205,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xen/*.h
 %{_includedir}/xen/io/*.h
 %{_includedir}/xen/linux/*.h
-%{_libdir}/libxenctrl.so
-%{_libdir}/libxenctrl.a
-%{_libdir}/libxenguest.so
-%{_libdir}/libxenguest.a
-%{_libdir}/libxenstore.a
-%{_libdir}/libblktap.a
+%{_libdir}/*.so
+%{_libdir}/*.a
 
 %changelog
+* Tue Jul 25 2006 Jeremy Katz <katzj@redhat.com> - 3.0.2-19
+- fix libblktap symlinks (#199820)
+- make libxenstore executable (#197316)
+- version libxenstore (markmc) 
+
 * Fri Jul 21 2006 Jeremy Katz <katzj@redhat.com> - 3.0.2-18
 - include /var/xen/dump in file list
 - load blkbk, netbk and netloop when xend starts