Setting tag vsys-0.99-1

[vsys.git] / vsys.spec

diff --git a/vsys.spec b/vsys.spec
index 567948c..f8fc812 100644 (file)
--- a/vsys.spec
+++ b/vsys.spec
@@ -2,22 +2,17 @@
 # Vsys filesystem
 #
 # RPM spec file
 # Vsys filesystem
 #
 # RPM spec file

-#
-# $Id$
-#
-
-%define url $URL$

 
 %define name vsys
 
 %define name vsys

-%define version 0.95
-%define taglevel 0
+%define version 0.99
+%define taglevel 1

 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}

-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}

 
 Summary: Vsys filesystem 
 Name: %{name}
 
 Summary: Vsys filesystem 
 Name: %{name}


@@ -29,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #Requires: 
 BuildRequires: inotify-tools-devel
 BuildRequires: ocaml
 #Requires: 
 BuildRequires: inotify-tools-devel
 BuildRequires: ocaml

-BuildRequires: ocaml-docs
+BuildRequires: ocaml-ocamldoc

 
 Source0: vsys-%{version}.tar.gz
 
 
 Source0: vsys-%{version}.tar.gz
 


@@ -39,34 +34,48 @@ invoke services installed by the PlanetLab administration. Slices invoke and
 interact with these services through fifo pipes. Services can be added and
 removed dynamically.
 
 interact with these services through fifo pipes. Services can be added and
 removed dynamically.
 

+%package -n vsyssh
+Summary: Vsys client
+Group: System Environment/Libraries
+
+%description -n vsyssh
+vsyssh is a simple shell to use vsys through.
+

 %prep
 %setup
 
 %build
 rm -rf $RPM_BUILD_ROOT
 make
 %prep
 %setup
 
 %build
 rm -rf $RPM_BUILD_ROOT
 make

+make -C vsyssh

 
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/vsys
 #cp factory/* $RPM_BUILD_ROOT/vsys
 
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/vsys
 #cp factory/* $RPM_BUILD_ROOT/vsys

-cp vsys $RPM_BUILD_ROOT/usr/bin
-cp vsys-initscript $RPM_BUILD_ROOT/etc/init.d/vsys
-cp vsys.conf $RPM_BUILD_ROOT/etc
+cp -p vsys $RPM_BUILD_ROOT/usr/bin
+cp -p vsys-initscript $RPM_BUILD_ROOT/etc/init.d/vsys
+cp -p vsys.conf $RPM_BUILD_ROOT/etc
+cp -p vsyssh/vsyssh $RPM_BUILD_ROOT/usr/bin

 
 

-install -D -m 644 vsys.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vsys
+install -D -p -m 644 vsys.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vsys

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files

+%defattr(-,root,root,-)

 /usr/bin/vsys
 /etc/init.d/vsys
 /vsys
 %config(noreplace) /etc/vsys.conf
 %{_sysconfdir}/logrotate.d/vsys
 
 /usr/bin/vsys
 /etc/init.d/vsys
 /vsys
 %config(noreplace) /etc/vsys.conf
 %{_sysconfdir}/logrotate.d/vsys
 

+%files -n vsyssh
+%defattr(-,root,root,-)
+/usr/bin/vsyssh
+

 %post
 chkconfig --add vsys
 chkconfig vsys on
 %post
 chkconfig --add vsys
 chkconfig vsys on


@@ -77,6 +86,14 @@ fi
 %postun
 
 %changelog
 %postun
 
 %changelog

+* Thu Jan 27 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vsys-0.99-1
+- vsyssh is a simple shell to use vsys through, in the vsys-vsyssh rpm
+- fix build dep to require ocaml-ocamldoc instead of ocaml-docs
+
+* Thu Dec 16 2010 Sapan Bhatia <sapanb@cs.princeton.edu> - vsys-0.99-0
+- Fixed a memory leak, mainly. The other changes are simply commits that got lost between the move from svn/head to
+- git/master.
+

 * Sun Dec 27 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vsys-0.9-4
 - fix build for f12
 
 * Sun Dec 27 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vsys-0.9-4
 - fix build for f12