[mongodb/f15: 23/23] merge master into f15

[Nathaniel McCallum]

commit 5b7e706b6c0c7112800bd09b349c0ccd18445ae5
Merge: f620d41 09481f4
Author: Nathaniel McCallum <nathaniel at themccallums.org>
Date:   Mon Jan 16 15:15:59 2012 -0500

    merge master into f15

 .gitignore                  |    2 +
 mongod.service              |   13 +
 mongod.sysconf              |    1 +
 mongodb-fix-fork.patch      |   14 +-
 mongodb-fix-pcre.patch      |   13 +
 mongodb-sm-pkgconfig.patch  |   19 +
 mongodb-src-r2.0.2-js.patch | 1597 +++++++++++++++++++++++++++++++++++++++++++
 mongodb.init                |   93 ---
 mongodb.spec                |  122 +++-
 sources                     |    2 +-
 10 files changed, 1737 insertions(+), 139 deletions(-)
---
diff --cc mongodb.spec
index bc8c407,edf1d40..0a0f17c
--- a/mongodb.spec
+++ b/mongodb.spec
@@@ -14,16 -11,19 +11,23 @@@ License:        AGPLv3 and zlib and AS
  URL:            http://www.mongodb.org
  
  Source0:        http://fastdl.mongodb.org/src/%{name}-src-r%{version}.tar.gz
- Source1:        %{name}.init
- Source2:        %{name}.logrotate
- Source3:        %{name}.conf
- Source4:        %{name}-tmpfile
- BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ Source1:        %{daemon}.service
+ Source2:        %{daemon}.sysconf
+ Source3:        %{name}.logrotate
+ Source4:        %{name}.conf
+ Source5:        %{name}-tmpfile
+ Patch1:         mongodb-no-term.patch
+ Patch2:         mongodb-fix-fork.patch
+ # https://github.com/mongodb/mongo/pull/161
+ Patch3:         mongodb-fix-pcre.patch
+ # https://github.com/mongodb/mongo/pull/160
+ Patch4:         mongodb-src-r2.0.2-js.patch
+ Patch5:         mongodb-sm-pkgconfig.patch
  
 +Patch0:         mongodb-src-r1.8.0-js.patch
 +Patch1:         mongodb-no-term.patch
 +Patch2:         mongodb-fix-fork.patch
 +
  BuildRequires:  python-devel
  BuildRequires:  scons
  BuildRequires:  boost-devel