[octave/f15/master] Fix typo on octave_api macro Remove rm from octave_pkg_preun macro

[Orion Poplawski]

commit 7509ddd86ed26e46b413fd9eb5e178ad61a1d9c7
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Apr 8 10:13:39 2011 -0600

    Fix typo on octave_api macro
    Remove rm from octave_pkg_preun macro

 macros.octave |    5 ++---
 octave.spec   |    6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/macros.octave b/macros.octave
index 5875023..21556b2 100644
--- a/macros.octave
+++ b/macros.octave
@@ -1,7 +1,7 @@
 # Octave packaging macros
 
 # Octave binary API provided
-%octave_api %(octave-config -p API_VERSION || echo 0)}
+%octave_api %(octave-config -p API_VERSION || echo 0)
 
 # Octave Package Directories
 %octshareprefix %{_datadir}/octave
@@ -35,9 +35,8 @@ echo "endfunction" >> %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m \
 # preun script - we need to remove our uninstall protection and perhaps
 # run the package's own uninstall script.
 %octave_pkg_preun \
-rm %{octpkgdir}/packinfo/on_uninstall.m \
 if [ -e %{octpkgdir}/packinfo/on_uninstall.m.orig ]; then \
-  mv %{octpkgdir}/packinfo/on_uninstall.m.orig %{octpkgdir}/packinfo/on_uninstall.m \
+  cp -f %{octpkgdir}/packinfo/on_uninstall.m.orig %{octpkgdir}/packinfo/on_uninstall.m \
   cd %{octpkgdir}/packinfo \
   %octave_cmd l=pkg('list');on_uninstall(l{cellfun(@(x)strcmp(x.name,'%{octpkg}'),l)}); \
 fi \
diff --git a/octave.spec b/octave.spec
index 47ccfc3..7544b7f 100644
--- a/octave.spec
+++ b/octave.spec
@@ -3,7 +3,7 @@
 
 Name:           octave
 Version:        3.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
@@ -248,6 +248,10 @@ fi
 
 
 %changelog
+* Fri Apr 8 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-6
+- Fix typo on octave_api macro
+- Remove rm from octave_pkg_preun macro
+
 * Fri Mar 18 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-5
 - Use libdir instead of libexecdir
 - Rename octave_pkg_preun macro