[octave/el6: 15/15] Cleanup merge from f16 3.4.3

[Orion Poplawski]

commit 9d8976875c782c225f10275282b07a4cf34a41ce
Merge: 2b085af e575215
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jun 4 15:52:57 2012 -0600

    Cleanup merge from f16 3.4.3

 .gitignore              |    2 ++
 octave-3.4.2-curl.patch |   11 -----------
 octave-tar.patch        |   12 ------------
 octave-xzip.patch       |   25 -------------------------
 octave.spec             |   22 ++++++++--------------
 sources                 |    2 +-
 6 files changed, 11 insertions(+), 63 deletions(-)
---
diff --cc .gitignore
index 8946804,266ab26..9391838
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,3 @@@
 -octave-3.2.4.tar.bz2
 -/octave-3.3.54.tar.bz2
  /octave-3.4.0.tar.bz2
+ /octave-3.4.2.tar.bz2
+ /octave-3.4.3.tar.bz2
diff --cc octave.spec
index 20afd67,108515e..b513036
--- a/octave.spec
+++ b/octave.spec
@@@ -253,6 -242,13 +242,11 @@@ f
  
  
  %changelog
 -* Mon Oct 24 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.3-1
++* Mon Jun 4 2012 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.3-1
+ - Update to 3.4.3
+ - Drop upstreamed patches
 -
 -* Wed Aug 24 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6:3.4.2-3
+ - Place rpm macros in -devel.
+ 
  * Thu Aug 11 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.2-2
  - Drop smp build - seems to be failing
  - Add patch to fix tar argument handling