From a02a3266e95abf89c7189da9b70e2e56f218cfff Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Fri, 16 Dec 2005 13:27:23 +0000
Subject: [PATCH] * libvir.spec.in src/Makefile.am: cleaned up the spec file,
 removed   static libraries, adding virsh as an installed program Daniel

---
 ChangeLog       | 5 +++++
 libvir.spec.in  | 9 ++++++---
 src/Makefile.am | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4cd93b532..08843d7d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 16 14:26:05 CET 2005 Daniel Veillard <veillard@redhat.com>
+
+	* libvir.spec.in src/Makefile.am: cleaned up the spec file, removed
+	  static libraries, adding virsh as an installed program
+
 Fri Dec 16 13:59:35 CET 2005 Daniel Veillard <veillard@redhat.com>
 
 	* src/libvir_sym.version: oops forgot to export the new symbol
diff --git a/libvir.spec.in b/libvir.spec.in
index 74edfce53a..686de2e90f 100644
--- a/libvir.spec.in
+++ b/libvir.spec.in
@@ -11,7 +11,8 @@ BuildRequires: xen
 Requires: xen
 
 %description
-This C library provides an API to use the Xen virtualization framework
+This C library provides an API to use the Xen virtualization framework,
+and the virsh command line tool to control virtual domains.
 
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvir library
@@ -19,7 +20,8 @@ Group: Development/Libraries
 Requires: libvir = %{version}
 
 %description devel
-This C library provides an API to use the Xen virtualization framework
+Includes and documantations for the C library providing an API to use
+the Xen virtualization framework
 
 %prep
 %setup -q
@@ -33,6 +35,7 @@ rm -fr %{buildroot}
 
 %makeinstall
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %clean
 rm -fr %{buildroot}
@@ -47,13 +50,13 @@ rm -fr %{buildroot}
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
+%{_bindir}/virsh
 %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-, root, root)
 
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_includedir}/libvir/*.h
 %{_libdir}/pkgconfig/libvir.pc
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5abb20f9d3..55e17d7912 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ libvir_la_SOURCES =						\
 		xen_internal.c xen_internal.h			\
 		xml.c
 
-noinst_PROGRAMS=virsh
+bin_PROGRAMS=virsh
 
 virsh_SOURCES=virsh.c
 virsh_LDFLAGS =