Merge branch 'master' of git://git.pld-linux.org/packages/mongodb

diff --combined mongodb.spec
index d8276e4ae7281f9dd4c79ddfa81978604b5e4291,b5a662a3972d0c5811a7b28467c7ad77b3d71ed6..cfd59eb32773cf06801b1facbf4ee9547c67aedd
--- 1/mongodb.spec
--- 2/mongodb.spec
+++ b/mongodb.spec
@@@ -1,15 -1,16 +1,15 @@@
  # TODO:
  #     - add support for sharding server (init scripts, systemd units, sample config)
 -#     - fix 'libs' subpackage (disabled due to broken 'sharedclient' build option)
  #
  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.2
+ Version:      2.2.4
  Release:      1
  License:      AGPL v3
  Group:                Applications/Databases
  Source0:      http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
- # Source0-md5:        697c448271358545a8a40a973f88edf4
+ # Source0-md5:        033354c543c053f5d539b573ac8c28b0
  Source1:      %{name}.logrotate
  Source2:      %{name}.init
  Source3:      mongod-default.conf
@@@ -18,12 -19,11 +18,12 @@@ Patch0:            %{name}-cflags.patc
  Patch1:               %{name}-system-libs.patch
  Patch2:               boost-1.50.patch
  Patch3:               %{name}-install.patch
 +Patch4:               %{name}-shared.patch
  URL:          http://www.mongodb.org/
  BuildRequires:        boost-devel >= 1.50
  BuildRequires:        libpcap-devel
  BuildRequires:        libstdc++-devel >= 6:4.0
- %ifarch x86_64
+ %ifarch %{x8664}
  BuildRequires:        libtcmalloc-devel
  %endif
  BuildRequires:        pcre-cxx-devel
@@@ -34,7 -34,7 +34,7 @@@ BuildRequires:        scons >= 1.
  BuildRequires:        sed >= 4.0
  BuildRequires:        snappy-devel
  BuildRequires:        v8-devel
 -#Requires:    %{name}-libs = %{version}-%{release}
 +Requires:     %{name}-libs = %{version}-%{release}
  BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  %description
@@@ -75,7 -75,8 +75,7 @@@ Ten pakiet zawiera bibliotekÄ\99 klienckÄ
  Summary:      Header files for MongoDB client library
  Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki klienckiej MongoDB
  Group:                Development/Libraries
 -#Requires:    %{name}-libs = %{version}-%{release}
 -Requires:     %{name}-static = %{version}-%{release}
 +Requires:     %{name}-libs = %{version}-%{release}
  
  %description devel
  Mongo (from "huMONGOus") is a schema-free document-oriented database.
@@@ -94,7 -95,7 +94,7 @@@ oprogramowania klienckiego dla MongoDB
  Summary:      Static MongoDB client library
  Summary(pl.UTF-8):    Statyczna biblioteka kliencka MongoDB
  Group:                Development/Libraries
 -#Requires:    %{name}-libs = %{version}-%{release}
 +Requires:     %{name}-devel = %{version}-%{release}
  
  %description static
  Mongo (from "huMONGOus") is a schema-free document-oriented database.
@@@ -144,7 -145,6 +144,7 @@@ konfiguracji oraz skrypty init.d
  %patch1 -p1
  %patch2 -p1
  %patch3 -p1
 +%patch4 -p1
  
  # Fix permissions
  find -type f -executable | xargs chmod a-x
@@@ -159,7 -159,6 +159,7 @@@
        --extralib=pcrecpp,pcre,snappy \
        --prefix=$RPM_BUILD_ROOT%{_prefix} \
        --full=all \
 +      --sharedclient \
        --usev8 \
        --cxx=%{__cxx}
  
@@@ -167,34 -166,32 +167,34 @@@
  rm -rf $RPM_BUILD_ROOT
  install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1} \
        $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mongod} \
-       $RPM_BUILD_ROOT%{_var}/{lib,log{,/archive}}/mongo \
+       $RPM_BUILD_ROOT%{_var}/{lib,log{,/archive}}/mongodb \
        $RPM_BUILD_ROOT%{systemdunitdir}
  
  # XXX: scons is so great, recompiles everything here!
  %scons install \
 +      CPPFLAGS="%{rpmcppflags} -DXP_UNIX" \
        --use-system-all=yes \
        --extralib=pcrecpp,pcre,snappy \
        --prefix=$RPM_BUILD_ROOT%{_prefix} \
        --full=all \
 +      --sharedclient \
        --usev8 \
        --cxx=%{__cxx}
  
  cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/mongod
  install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mongod
  cp -p rpm/mongod.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/mongod
- install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mongod/default.conf
+ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mongod/default.conf
  cp -p debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
  
  # mask out the LSB service
  ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/mongod.service
- install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/mongod@.service
+ cp -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/mongod@.service
  
- touch $RPM_BUILD_ROOT%{_var}/log/mongo/mongod.log
+ touch $RPM_BUILD_ROOT%{_var}/log/mongodb/mongod.log
  
  # for some reason these are installed twice, remove unwanted copies
- for f in $RPM_BUILD_ROOT%{_includedir}/mongo/* ; do
+ for f in $RPM_BUILD_ROOT%{_includedir}/mongo/*; do
        rm -r "$RPM_BUILD_ROOT%{_includedir}/$(basename $f)" || :
  done
  
@@@ -206,7 -203,7 +206,7 @@@ rm -rf $RPM_BUILD_ROO
  
  %pre server
  %groupadd -g 258 -r mongod
- %useradd -u 258 -r -g mongod -d %{_var}/lib/mongo -s /bin/false -c "MongoDB Database Server" mongod
+ %useradd -u 258 -r -g mongod -d %{_var}/lib/mongodb -s /bin/false -c "MongoDB Database Server" mongod
  
  %post server
  /sbin/chkconfig --add mongod
@@@ -270,9 -267,11 +270,9 @@@ f
  %{_mandir}/man1/mongostat.1*
  %{_mandir}/man1/mongorestore.1*
  
 -%if 0
  %files libs
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_libdir}/libmongoclient.so
 -%endif
  
  %files devel
  %defattr(644,root,root,755)
@@@ -284,19 -283,18 +284,18 @@@
  
  %files server
  %defattr(644,root,root,755)
- #%dir %{_sysconfdir}
  %dir %{_sysconfdir}/mongod
  %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mongod/default.conf
  %attr(754,root,root) /etc/rc.d/init.d/mongod
  %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mongod
  %config(noreplace) /etc/logrotate.d/mongod
+ %{systemdunitdir}/mongod.service
+ %{systemdunitdir}/mongod@.service
  %attr(755,root,root) %{_bindir}/mongod
  %attr(755,root,root) %{_bindir}/mongos
  %{_mandir}/man1/mongod.1*
  %{_mandir}/man1/mongos.1*
- %attr(755,mongod,mongod) %dir %{_var}/lib/mongo
- %attr(775,root,mongod) %dir %{_var}/log/mongo
- %attr(775,root,mongod) %dir %{_var}/log/archive/mongo
- %attr(640,mongod,mongod) %config(noreplace) %verify(not md5 mtime size) %{_var}/log/mongo/mongod.log
- %{systemdunitdir}/mongod.service
- %{systemdunitdir}/mongod@.service
+ %attr(755,mongod,mongod) %dir %{_var}/lib/mongodb
+ %attr(775,root,mongod) %dir %{_var}/log/mongodb
+ %attr(775,root,mongod) %dir %{_var}/log/archive/mongodb
+ %attr(640,mongod,mongod) %config(noreplace) %verify(not md5 mtime size) %{_var}/log/mongodb/mongod.log