[octave] Update to 3.4.3 Drop upstreamed patches

Orion Poplawski orion at fedoraproject.org
Tue Oct 25 03:45:13 UTC 2011


commit a4a8bae8e3be491392a10f49f4c0b7ee1f7f4b61
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 24 21:45:12 2011 -0600

    Update to 3.4.3
    Drop upstreamed patches

 .gitignore              |    1 +
 octave-3.4.2-curl.patch |   11 -----------
 octave-tar.patch        |   12 ------------
 octave-xzip.patch       |   25 -------------------------
 octave.spec             |   19 ++++++-------------
 sources                 |    2 +-
 6 files changed, 8 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 824a8b5..266ab26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ 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 --git a/octave.spec b/octave.spec
index 819593f..108515e 100644
--- a/octave.spec
+++ b/octave.spec
@@ -2,25 +2,17 @@
 %global octave_api api-v45+
 
 Name:           octave
-Version:        3.4.2
-Release:        3%{?dist}
+Version:        3.4.3
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
 License:        GPLv3+
 Source0:        ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2
 Source1:        macros.octave
-# Don't include <curl/types.h> which isn't used and is missing on newer versions of libcurl
-Patch0:		octave-3.4.2-curl.patch
-# https://savannah.gnu.org/bugs/index.php?33988
-# Fix tar argument handling
-Patch1:         octave-tar.patch
 # https://savannah.gnu.org/bugs/index.php?32839
 # Fix building packages from directories
 Patch2:         octave-3.4.0-pkgbuilddir.patch
-# https://savannah.gnu.org/bugs/index.php?33993
-# Fix xzip
-Patch3:         octave-xzip.patch
 URL:            http://www.octave.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,10 +70,7 @@ This package contains documentation for Octave.
 
 %prep
 %setup -q
-%patch0 -p1 -b .curl
-%patch1 -p1 -b .tar
 %patch2 -p1 -b .pkgbuilddir
-%patch3 -p1 -b .xzip
 
 # Check permissions
 find -name *.cc -exec chmod 644 {} \;
@@ -253,6 +242,10 @@ fi
 
 
 %changelog
+* Mon Oct 24 2011 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.
 
diff --git a/sources b/sources
index 51f6ebc..8cefd2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31c744ab4555a2bf04d5e644b93f9b51  octave-3.4.2.tar.bz2
+185b08f4e4a7b646d76e4d33b77fa87e  octave-3.4.3.tar.bz2


More information about the scm-commits mailing list