packages: mongodb/mongodb.spec, mongodb/config.patch (NEW) - 1.8.3

[patrys]

Author: patrys                       Date: Thu Sep  1 17:35:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.8.3

---- Files affected:
packages/mongodb:
   mongodb.spec (1.12 -> 1.13) , config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mongodb/mongodb.spec
diff -u packages/mongodb/mongodb.spec:1.12 packages/mongodb/mongodb.spec:1.13
--- packages/mongodb/mongodb.spec:1.12	Thu Dec  9 12:15:41 2010
+++ packages/mongodb/mongodb.spec	Thu Sep  1 19:35:22 2011
@@ -5,15 +5,16 @@
 #
 Summary:	MongoDB client shell and tools
 Name:		mongodb
-Version:	1.6.5
+Version:	1.8.3
 Release:	0.1
 License:	AGPL 3.0
 Group:		Applications/Databases
 URL:		http://www.mongodb.org/
 Source0:	http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
-# Source0-md5:	99f1c4c256be1611da6068aea30f9a30
+# Source0-md5:	662e7ad6ff9f8e4d16c72c038b4a0c60
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
+Patch0:		config.patch
 # BuildRequires:  libpcap-devel
 BuildRequires:	boost-devel >= 1.42
 BuildRequires:	libstdc++-devel >= 6:4.0
@@ -69,6 +70,7 @@
 
 %prep
 %setup -q -n %{name}-src-r%{version}
+%patch0 -p1
 %{__sed} -i 's,-O3,,' SConstruct
 
 # Fix permissions
@@ -138,7 +140,7 @@
 %attr(755,root,root) %{_bindir}/mongofiles
 %attr(755,root,root) %{_bindir}/mongoimport
 %attr(755,root,root) %{_bindir}/mongorestore
-%attr(755,root,root) %{_bindir}/mongosniff
+#%%attr(755,root,root) %{_bindir}/mongosniff
 %attr(755,root,root) %{_bindir}/mongostat
 %attr(755,root,root) %{_bindir}/bsondump
 %{_mandir}/man1/mongo.1*
@@ -178,6 +180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/09/01 17:35:22  patrys
+- 1.8.3
+
 Revision 1.12  2010/12/09 11:15:41  lisu
 - up to 1.6.5
 - use arch dependend compiler

================================================================
Index: packages/mongodb/config.patch
diff -u /dev/null packages/mongodb/config.patch:1.1
--- /dev/null	Thu Sep  1 19:35:27 2011
+++ packages/mongodb/config.patch	Thu Sep  1 19:35:22 2011
@@ -0,0 +1,20 @@
+--- mongodb-src-r1.8.3/SConstruct~	2011-09-01 19:06:02.082655213 +0200
++++ mongodb-src-r1.8.3/SConstruct	2011-09-01 19:07:59.250802930 +0200
+@@ -671,7 +671,6 @@
+     env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
+     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+     if linux:
+-        env.Append( CPPFLAGS=" -Werror " )
+         env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
+     env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
+     env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
+@@ -679,7 +678,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 " )
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mongodb/mongodb.spec?r1=1.12&r2=1.13&f=u