[packages/mongodb/dev-2.6] start update to 2.6.12

[glen]

commit 6efcea5d7ec413fac46a9d204bdf95694b668a82
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 4 11:09:31 2017 +0300

    start update to 2.6.12

 mongodb-cflags.patch      | 16 ++++++++--------
 mongodb-system-libs.patch | 32 ++++----------------------------
 mongodb.spec              | 14 +++++++-------
 3 files changed, 19 insertions(+), 43 deletions(-)
---
diff --git a/mongodb.spec b/mongodb.spec
index a40cfbc..b843dd9 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -7,12 +7,12 @@
 Summary:	MongoDB client shell and tools
 Summary(pl.UTF-8):	Powłoka kliencka i narzędzia dla bazy danych MongoDB
 Name:		mongodb
-Version:	2.2.4
-Release:	8
+Version:	2.6.12
+Release:	0.1
 License:	AGPL v3
 Group:		Applications/Databases
 Source0:	http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
-# Source0-md5:	033354c543c053f5d539b573ac8c28b0
+# Source0-md5:	d0d193f864e04df9366b2d4338bd62d2
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
 Source3:	mongod-default.conf
@@ -148,16 +148,16 @@ konfiguracji oraz skrypty init.d.
 %setup -q -n %{name}-src-r%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch2 -p1
+#%patch3 -p1
+#%patch4 -p1
 %patch5 -p1
 
 # Fix permissions
 find -type f -executable | xargs chmod a-x
 
 # force system pcre/js/snappy
-%{__rm} -r src/third_party/{js-1.7,pcre-8.30,snappy,boost}
+%{__rm} -r src/third_party/{pcre-8.30,snappy,boost}
 
 %build
 %scons \
diff --git a/mongodb-cflags.patch b/mongodb-cflags.patch
index c58001c..0950ad1 100644
--- a/mongodb-cflags.patch
+++ b/mongodb-cflags.patch
@@ -1,12 +1,12 @@
---- mongodb-src-r2.2.0.orig/SConstruct	2012-08-28 07:28:11.000000000 +0200
-+++ mongodb-src-r2.2.0/SConstruct	2012-09-28 13:17:32.000000000 +0200
-@@ -712,7 +712,8 @@
-         env.Append( CCFLAGS=["-O0", "-fstack-protector"] )
-         env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
-     else:
+--- mongodb-src-r2.6.12/SConstruct~	2016-03-21 18:09:46.000000000 +0200
++++ mongodb-src-r2.6.12/SConstruct	2017-04-04 11:01:42.056852157 +0300
+@@ -879,7 +879,8 @@
+         env.Append( LINKFLAGS=" -fprofile-arcs -ftest-coverage " )
+ 
+     if optBuild:
 -        env.Append( CCFLAGS=["-O3"] )
 +        env.Append( CCFLAGS=ARGUMENTS.get("CXXFLAGS", "-O3").split() )
 +        env.Append( CPPDEFINES=ARGUMENTS.get("CPPFLAGS", "").split() )
+     else:
+         env.Append( CCFLAGS=["-O0"] )
  
-     if debugLogging:
-         env.Append( CPPDEFINES=["_DEBUG"] );
diff --git a/mongodb-system-libs.patch b/mongodb-system-libs.patch
index fb464c5..89c6633 100644
--- a/mongodb-system-libs.patch
+++ b/mongodb-system-libs.patch
@@ -1,35 +1,11 @@
---- mongodb-src-r2.2.0.orig/src/mongo/util/compress.cpp	2012-08-28 07:28:11.000000000 +0200
-+++ mongodb-src-r2.2.0/src/mongo/util/compress.cpp	2012-09-28 14:07:08.000000000 +0200
-@@ -2,7 +2,7 @@
+--- mongodb-src-r2.6.12/src/mongo/util/compress.cpp~	2016-03-21 18:09:46.000000000 +0200
++++ mongodb-src-r2.6.12/src/mongo/util/compress.cpp	2017-04-04 11:02:36.062842963 +0300
+@@ -30,7 +30,7 @@
  
  #include "mongo/util/compress.h"
  
--#include "third_party/snappy/snappy.h"
+-#include "snappy.h"
 +#include <snappy.h>
  
  namespace mongo {
  
-diff -dur mongodb-src-r2.2.0.orig/src/mongo/scripting/engine_spidermonkey.cpp mongodb-src-r2.2.0/src/mongo/scripting/engine_spidermonkey.cpp
---- mongodb-src-r2.2.0.orig/src/mongo/scripting/engine_spidermonkey.cpp	2012-08-28 07:28:11.000000000 +0200
-+++ mongodb-src-r2.2.0/src/mongo/scripting/engine_spidermonkey.cpp	2012-10-08 12:27:07.000000000 +0200
-@@ -25,7 +25,7 @@
- #include <boost/date_time/posix_time/posix_time.hpp>
- #endif
- 
--#include <third_party/js-1.7/jsdate.h>
-+#include <js/jsdate.h>
- 
- #include "mongo/util/mongoutils/str.h"
- 
-diff -dur mongodb-src-r2.2.0.orig/src/mongo/scripting/engine_spidermonkey.h mongodb-src-r2.2.0/src/mongo/scripting/engine_spidermonkey.h
---- mongodb-src-r2.2.0.orig/src/mongo/scripting/engine_spidermonkey.h	2012-08-28 07:28:11.000000000 +0200
-+++ mongodb-src-r2.2.0/src/mongo/scripting/engine_spidermonkey.h	2012-10-08 12:27:55.000000000 +0200
-@@ -29,7 +29,7 @@
- #define JS_PUBLIC_DATA(t)   t
- #endif
- 
--#include <third_party/js-1.7/jsapi.h>
-+#include <js/jsapi.h>
- 
- // END inc hacking
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mongodb.git/commitdiff/6efcea5d7ec413fac46a9d204bdf95694b668a82