[mongodb] use external snappy build

Nathaniel McCallum npmccallum at fedoraproject.org
Tue Jan 17 16:24:34 UTC 2012


commit d7dd75d075bced36e161b53c93d7b489df8006cf
Author: Nathaniel McCallum <nathaniel at themccallums.org>
Date:   Tue Jan 17 11:24:30 2012 -0500

    use external snappy build

 mongodb-enable-external-snappy.patch |    9 +++++++++
 mongodb.spec                         |    9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/mongodb-enable-external-snappy.patch b/mongodb-enable-external-snappy.patch
new file mode 100644
index 0000000..cc60d6b
--- /dev/null
+++ b/mongodb-enable-external-snappy.patch
@@ -0,0 +1,9 @@
+diff -Nru mongodb-src-r2.0.2.orig/third_party/snappy.py mongodb-src-r2.0.2/third_party/snappy.py
+--- mongodb-src-r2.0.2.orig/third_party/snappy.py	2011-12-14 12:18:48.000000000 -0500
++++ mongodb-src-r2.0.2/third_party/snappy.py	2012-01-17 10:39:21.534074727 -0500
+@@ -11,4 +11,4 @@
+     fileLists["serverOnlyFiles"] += [ myenv.Object(f) for f in files ]
+ 
+ def configureSystem( env , fileLists , options ):
+-    configure( env , fileLists , options )
++    env.Append( LIBS=[ "snappy" ] )
diff --git a/mongodb.spec b/mongodb.spec
index b8ce0f4..89063d5 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -5,7 +5,7 @@
 
 Name:           mongodb
 Version:        2.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        High-performance, schema-free document-oriented database
 Group:          Applications/Databases
 License:        AGPLv3 and zlib and ASL 2.0
@@ -29,6 +29,8 @@ Patch3:         mongodb-fix-pcre.patch
 Patch4:         mongodb-src-r2.0.2-js.patch
 # https://jira.mongodb.org/browse/SERVER-4591
 Patch5:         mongodb-fix-oldpython.patch
+# https://jira.mongodb.org/browse/SERVER-4634
+Patch6:         mongodb-enable-external-snappy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -38,6 +40,7 @@ BuildRequires:  pcre-devel
 BuildRequires:  js-devel
 BuildRequires:  readline-devel
 BuildRequires:  libpcap-devel
+BuildRequires:  snappy-devel
 # to run tests
 BuildRequires:  unittest
 
@@ -114,6 +117,7 @@ software, default configuration files, and init scripts.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # spurious permissions
 chmod -x README
@@ -267,6 +271,9 @@ fi
 %{_includedir}/mongo
 
 %changelog
+* Tue Jan 17 2012 Nathaniel McCallum <nathaniel at natemccallum.com> - 2.0.2-5
+- Enable build using external snappy
+
 * Tue Jan 17 2012 Nathaniel McCallum <nathaniel at natemccallum.com> - 2.0.2-4
 - Patch buildsystem for building on older pythons (RHEL5)
 


More information about the scm-commits mailing list