- Version: 2.0.6

Changed files:
    config.patch -> 1.3
    mongodb-build.patch -> 1.3
    mongodb.spec -> 1.23

diff --git a/config.patch b/config.patch
index 7ddb51a8704a7d32fac0a2c2b41aaff091492e8d..3365b5b4c44c3054a52d3cba17e7e63b121d8991 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -8,16 +8,6 @@
          if not has_option('clang'): 
              env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
  
-@@ -684,7 +683,8 @@
- 
-     #make scons colorgcc friendly
-     env['ENV']['HOME'] = os.environ['HOME']
--    env['ENV']['TERM'] = os.environ['TERM']
-+    if 'TERM' in os.environ:
-+        env['ENV']['TERM'] = os.environ['TERM']
- 
-     if linux and has_option( "sharedclient" ):
-         env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
 @@ -732,10 +732,6 @@
          print( "removing precompiled headers" )
          os.unlink('pch.h.gch') # gcc uses the file if it exists

diff --git a/mongodb-build.patch b/mongodb-build.patch
index 48db3bd46ee15296c9bec2a23e2aab0ee165f4d7..ef076af51c4358870147f85cb7798488f5730a3e 100644 (file)
--- a/mongodb-build.patch
+++ b/mongodb-build.patch
@@ -1,29 +1,11 @@
---- mongodb-src-r2.0.1/SConstruct.orig 2011-11-07 17:32:11.944223596 +0100
-+++ mongodb-src-r2.0.1/SConstruct      2011-11-07 17:35:10.547562910 +0100
-@@ -327,7 +327,7 @@
+--- mongodb-src-r2.0.6/SConstruct.orig 2012-06-13 13:02:51.000000000 +0200
++++ mongodb-src-r2.0.6/SConstruct      2012-06-13 13:03:02.000000000 +0200
+@@ -196,7 +196,7 @@
+ for shortName in getThirdPartyShortNames():
+     add_option( "use-system-" + shortName , "use system version of library " + shortName , 0 , True )
  
- # ------    SOURCE FILE SETUP -----------
+-add_option( "use-system-all" , "use all system libraries " + shortName , 0 , True )
++add_option( "use-system-all" , "use all system libraries ", 0 , True )
  
--commonFiles = Split( "pch.cpp buildinfo.cpp db/indexkey.cpp db/jsobj.cpp bson/oid.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp db/querypattern.cpp db/projection.cpp shell/mongo.cpp db/security_common.cpp db/security_commands.cpp" )
-+commonFiles = Split( "pch.cpp buildinfo.cpp db/indexkey.cpp db/jsobj.cpp bson/oid.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp db/querypattern.cpp db/projection.cpp shell/mongo.cpp" )
- commonFiles += [ "util/background.cpp" , "util/util.cpp" , "util/file_allocator.cpp" ,
-                  "util/assert_util.cpp" , "util/log.cpp" , "util/ramlog.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/concurrency/vars.cpp", "util/concurrency/task.cpp", "util/debug_util.cpp",
-                  "util/concurrency/thread_pool.cpp", "util/password.cpp", "util/version.cpp", "util/signal_handlers.cpp",  
-@@ -343,7 +343,7 @@
- coreServerFiles = [ "util/net/message_server_port.cpp" , 
-                     "client/parallel.cpp" , "db/common.cpp", 
-                     "util/net/miniwebserver.cpp" , "db/dbwebserver.cpp" , 
--                    "db/matcher.cpp" , "db/dbcommands_generic.cpp" , "db/dbmessage.cpp" ]
-+                    "db/matcher.cpp" , "db/dbcommands_generic.cpp" , "db/dbmessage.cpp", "db/security_common.cpp", "db/security_commands.cpp"]
- 
- mmapFiles = [ "util/mmap.cpp" ]
- 
-@@ -1131,7 +1131,7 @@
-         sniffEnv.Append( LIBS=[ "wpcap" ] )
- 
-     sniffEnv.Prepend( LIBPATH=["."] )
--    sniffEnv.Append( LIBS=[ "mongotestfiles" ] )
-+    sniffEnv.Prepend( LIBS=[ "mongotestfiles" ] )
- 
-     sniffEnv.Program( "mongosniff" , "tools/sniffer.cpp" )
+ # --- environment setup ---
  

diff --git a/mongodb.spec b/mongodb.spec
index 496e06c12b84b9aa0707819dc6d8bceecb1d8586..07074870547033265b5c74ae2b0c97ca54ffe04d 100644 (file)
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -2,12 +2,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.0.1
-Release:       4
+Version:       2.0.6
+Release:       1
 License:       AGPL v3
 Group:         Applications/Databases
 Source0:       http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
-# Source0-md5: cb8579074b7c9752eb382a2094ac4523
+# Source0-md5: b3b32fecdcbe8e8068ec2989be9d2da4
 Source1:       %{name}.logrotate
 Source2:       %{name}.init
 Patch0:                config.patch