Ovirt devel - May 2008 - [PATCH] A few specfile tweaks

This patch ups the ovirt rpm version to 0.5 to avoid file conflicts with the 0.4
release.  It also makes ovirt-wui-install install into /usr/sbin instead of
/usr/bin.

We should really be upping the version every time a file changes.

diff --git a/wui/ovirt-wui.spec b/wui/ovirt-wui.spec
index 74ee4ba..c8f84a3 100644
--- a/wui/ovirt-wui.spec
+++ b/wui/ovirt-wui.spec
@@ -87,7 +87,7 @@ touch
%{buildroot}%{_localstatedir}/log/%{name}/host-status.log
 %{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore
 
 %{__cp} -a %{pbuild}/scripts/ovirt-add-host %{buildroot}%{_bindir}
-%{__cp} -a %{pbuild}/scripts/ovirt-wui-install %{buildroot}%{_bindir}
+%{__cp} -a %{pbuild}/scripts/ovirt-wui-install %{buildroot}%{_sbindir}
 %{__cp} -a %{pbuild}/scripts/ovirt-fix-ipa %{buildroot}%{_bindir}
 %{__rm} -rf %{buildroot}%{app_root}/tmp 
 %{__mkdir} %{buildroot}%{_localstatedir}/lib/%{name}/tmp
@@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)
-%{_bindir}/ovirt-wui-install
+%{_sbindir}/ovirt-wui-install
 %{_bindir}/ovirt-add-host
 %{_bindir}/ovirt-fix-ipa
 %{_initrddir}/%{name}
diff --git a/wui/version b/wui/version
index 6848c9e..d4480df 100644
--- a/wui/version
+++ b/wui/version
@@ -1 +1 @@
-0.0.4 1
+0.0.5 1

D'oh, need this too..  Consider it an addendum :)

diff --git a/wui-appliance/common-post.ks b/wui-appliance/common-post.ks
index 3bd6b4d..d50436a 100644
--- a/wui-appliance/common-post.ks
+++ b/wui-appliance/common-post.ks
@@ -34,7 +34,7 @@ cat > /etc/init.d/ovirt-wui-first-run << \EOF
 start() {
 	echo -n "Starting ovirt-wui-first-run: "
 
-	/usr/bin/ovirt-wui-install > /var/log/ovirt-wui-first-run.log 2>&1
+	/usr/sbin/ovirt-wui-install > /var/log/ovirt-wui-first-run.log 2>&1
 
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then

Ian Main wrote:
> This patch ups the ovirt rpm version to 0.5 to avoid file conflicts with
the 0.4 release.  It also makes ovirt-wui-install install into /usr/sbin instead
of /usr/bin.
> 
> We should really be upping the version every time a file changes.
ACK for this change, but I don't think we should bump the version every
time.
The reason is that we want the version number to match up with the next release.
 What we should probably do is just bump the release number during a development
cycle, and then bump the version at the end; that seems to work pretty well for
me.

Chris Lalancette