[stxxl] * Update to 1.3.1

[mycae]

commit 555699bce1f96c262a70126e3592cc339d938f2b
Author: mycae <mycae gmx com>
Date:   Wed Apr 24 17:37:28 2013 -0400

    * Update to 1.3.1

 .gitignore                        |    1 +
 sources                           |    2 +-
 stxxl-build-shared-makefile.patch |   11 -----------
 stxxl-build-shared.patch          |   15 ---------------
 stxxl-gcc-4.7.patch               |   12 ++++++++++++
 stxxl-shared-libs.patch           |   12 ++++++++++++
 stxxl.spec                        |   36 +++++++++++++++++++++---------------
 7 files changed, 47 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5ebc90..5d57efe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 stxxl-1.2.1.tar.gz
+/stxxl-1.3.1.tar.gz
diff --git a/sources b/sources
index ef7a95e..d1309c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e179b4f6b8c82f1996140fc6524e695  stxxl-1.2.1.tar.gz
+8d0e8544c4c830cf9ae81c39b092438c  stxxl-1.3.1.tar.gz
diff --git a/stxxl-gcc-4.7.patch b/stxxl-gcc-4.7.patch
new file mode 100644
index 0000000..3f58efd
--- /dev/null
+++ b/stxxl-gcc-4.7.patch
@@ -0,0 +1,12 @@
+Index: utils/mlock.cpp
+===================================================================
+--- utils/mlock.cpp	2010-08-31 12:22:17.000000000 +0000
++++ utils/mlock.cpp	2012-05-09 00:52:06.136011616 +0000
+@@ -17,6 +17,7 @@
+ #include <cstring>
+ #include <iostream>
+ #include <sys/mman.h>
++#include <unistd.h>
+ 
+ int main(int argc, char ** argv)
+ {
diff --git a/stxxl-shared-libs.patch b/stxxl-shared-libs.patch
new file mode 100644
index 0000000..d05c0b7
--- /dev/null
+++ b/stxxl-shared-libs.patch
@@ -0,0 +1,12 @@
+diff -r 6c7bb1238437 make.settings.gnu
+--- make.settings.gnu	Wed Apr 24 16:43:51 2013 -0400
++++ make.settings.gnu	Wed Apr 24 16:45:09 2013 -0400
+@@ -29,7 +29,7 @@
+ USE_MACOSX	?= no	# set 'yes' if you run Mac OS X, 'no' otherwise
+ USE_FREEBSD	?= no	# set 'yes' if you run FreeBSD, 'no' otherwise
+ USE_PARALLEL_MODE ?= no # set 'yes' to explicitly enable parallel mode for stxxl operations only
+-ENABLE_SHARED	?= no   # set 'yes' to build a shared library instead of a static library (EXPERIMENTAL)
++ENABLE_SHARED	?= yes  # set 'yes' to build a shared library instead of a static library (EXPERIMENTAL)
+ 
+ # internal flags
+ USE_PMODE	?= no	# will be overridden from main Makefile
diff --git a/stxxl.spec b/stxxl.spec
index 1ee7f92..77e85c1 100644
--- a/stxxl.spec
+++ b/stxxl.spec
@@ -1,7 +1,7 @@
 Name:		stxxl
-Version:	1.2.1
-Release:	14%{?dist}
-Summary:	C++ STL drop-in replacement for extremely large datasets 
+Version:	1.3.1
+Release:	1%{?dist}
+Summary:	C++ STL drop-in replacement for extremely large data sets 
 
 Group:		Development/Libraries	
 License:	Boost	
@@ -9,17 +9,18 @@ URL:		http://%{name}.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#Fix gcc 4.7 compilation
+Patch0:		%{name}-gcc-4.7.patch
+
 #Patch enables shared library build modification to makfile
-Patch0:		%{name}-build-shared.patch
-#Second patch required to enable shared libraries
-Patch1:		%{name}-build-shared-makefile.patch 
+Patch1: 	%{name}-shared-libs.patch
 
 %description
 %{name} provides an STL replacement using an abstraction layer to
 storage devices to allow for the optimal layout of data structures. This
-allows for multi-terabyte datasets to be held and manipulated in standard
+allows for multi-terabyte data sets to be held and manipulated in standard
 C++ data structures, whilst abstracting the complexity of managing this
-behaviour efficiently. %{name} utilises multi-disk I/O to speed up
+behavior efficiently. %{name} utilises multi-disk I/O to speed up
 I/O bound calculations. STXXL has been developed at the University
 of Karlsruhe.
 
@@ -34,15 +35,14 @@ Development libraries for the %{name} library.
 %package doc
 Group:		Documentation
 Summary:	HTML documentation and tutorial for the %{name} applications
-# Latex requires texlive for 10 and up 
-%if 0%{?fedora} >= 10
+
 BuildRequires:	texlive-latex
+BuildRequires:	texlive-bbold
+BuildRequires:	texlive-eepic
+BuildRequires:	texlive-moreverb
+BuildRequires:	texlive-comment
 BuildArch:	noarch
-%endif
-%if 0%{?fedora} < 10
-BuildRequires:	tetex-latex
-%endif
-%{?el5:BuildRequires: tetex-latex}
+
 BuildRequires:	doxygen, graphviz, ghostscript
 
 %description doc
@@ -123,6 +123,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 24 2013 <mycae(a!t)yahoo.com> 1.3.1-1
+- Update to upstream 1.3.1
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild