X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=mongodb.spec;h=d8276e4ae7281f9dd4c79ddfa81978604b5e4291;hb=a4de68f;hp=14a1235dd1585541cf7ef0e654066a0445de44a8;hpb=7165862fbc25d1446b8eae48cdcfdd76a8447bc2;p=packages%2Fmongodb.git

diff --git a/mongodb.spec b/mongodb.spec
index 14a1235..d8276e4 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -1,30 +1,40 @@
-#
-# TODO
-# - pass our rpm*cflags
+# TODO:
+#	- add support for sharding server (init scripts, systemd units, sample config)
 #
 Summary:	MongoDB client shell and tools
 Summary(pl.UTF-8):	Powłoka kliencka i narzędzia dla bazy danych MongoDB
 Name:		mongodb
-Version:	1.8.3
-Release:	0.1
-License:	AGPL 3.0
+Version:	2.2.2
+Release:	1
+License:	AGPL v3
 Group:		Applications/Databases
 Source0:	http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
-# Source0-md5:	662e7ad6ff9f8e4d16c72c038b4a0c60
+# Source0-md5:	697c448271358545a8a40a973f88edf4
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
-Patch0:		config.patch
+Source3:	mongod-default.conf
+Source4:	mongod@.service
+Patch0:		%{name}-cflags.patch
+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.42
-#BuildRequires:	libpcap-devel
+BuildRequires:	boost-devel >= 1.50
+BuildRequires:	libpcap-devel
 BuildRequires:	libstdc++-devel >= 6:4.0
+%ifarch x86_64
+BuildRequires:	libtcmalloc-devel
+%endif
 BuildRequires:	pcre-cxx-devel
-BuildRequires:	pcre-devel
+BuildRequires:	pcre-devel >= 8.30
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	rpmbuild(macros) >= 1.644
 BuildRequires:	scons >= 1.2
 BuildRequires:	sed >= 4.0
+BuildRequires:	snappy-devel
 BuildRequires:	v8-devel
+Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,32 +55,64 @@ obiektów danych binarnych oraz automatyczne dzielenie.
 Ten pakiet zawiera powłokę mongo, narzędzia do eksportu/importu danych
 oraz inne narzędzia klienckie.
 
+%package libs
+Summary:	MongoDB client library
+Summary(pl.UTF-8):	Biblioteka kliencka MongoDB
+Group:		Libraries
+
+%description libs
+Mongo (from "huMONGOus") is a schema-free document-oriented database.
+
+This package provides the mongo client library.
+
+%description libs -l pl.UTF-8
+Mongo (od "huMONGOus") to baza danych zorientowana na dokumenty
+pozbawione schematu.
+
+Ten pakiet zawiera bibliotekę kliencką mongo.
+
 %package devel
-Summary:	Header files and libraries for MongoDB clients development
-Summary(pl.UTF-8):	Pliki nagłówkowe i biblioteki do programowania klientów MongoDB
+Summary:	Header files for MongoDB client library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki klienckiej MongoDB
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
 Mongo (from "huMONGOus") is a schema-free document-oriented database.
 
-This package provides the mongo static library and header files needed
-to develop mongo client software.
+This package provides the header files needed to develop MongoDB
+client software.
 
 %description devel -l pl.UTF-8
 Mongo (od "huMONGOus") to baza danych zorientowana na dokumenty
 pozbawione schematu.
 
-Ten pakiet zawiera bibliotekę statyczną mongo oraz pliki nagłówkowe
-potrzebne do tworzenia oprogramowania klienckiego dla MongoDB
+Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia
+oprogramowania klienckiego dla MongoDB.
+
+%package static
+Summary:	Static MongoDB client library
+Summary(pl.UTF-8):	Statyczna biblioteka kliencka MongoDB
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Mongo (from "huMONGOus") is a schema-free document-oriented database.
+
+This package provides the MongoDB static client library.
+
+%description static -l pl.UTF-8
+Mongo (od "huMONGOus") to baza danych zorientowana na dokumenty
+pozbawione schematu.
+
+Ten pakiet zawiera statyczną bibliotekę kliencką MongoDB.
 
 %package server
 Summary:	MongoDB server, sharding server, and support scripts
 Summary(pl.UTF-8):	Serwer MongoDB, serwer dzielący oraz skrypty pomocnicze
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
-Provides:	group(mongod)
-Provides:	user(mongod)
+Requires:	systemd-units >= 38
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -79,6 +121,9 @@ Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	rc-scripts
+Provides:	group(mongod)
+Provides:	user(mongod)
+Conflicts:	logrotate < 3.8.0
 
 %description server
 Mongo (from "huMONGOus") is a schema-free document-oriented database.
@@ -96,44 +141,69 @@ konfiguracji oraz skrypty init.d.
 %prep
 %setup -q -n %{name}-src-r%{version}
 %patch0 -p1
-%{__sed} -i 's,-O3,%{rpmcxxflags},;/,\.\.\/v8/d' SConstruct
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # Fix permissions
 find -type f -executable | xargs chmod a-x
 
+# force system pcre/js/snappy
+%{__rm} -r src/third_party/{js-1.7,pcre-8.30,snappy,boost}
+
 %build
 %scons \
+	CPPFLAGS="%{rpmcppflags} -DXP_UNIX" \
+	--use-system-all=yes \
+	--extralib=pcrecpp,pcre,snappy \
 	--prefix=$RPM_BUILD_ROOT%{_prefix} \
+	--full=all \
 	--sharedclient \
-	--full all \
 	--usev8 \
 	--cxx=%{__cxx}
 
-# XXX really should have shared library here
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1} \
-	$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
-	$RPM_BUILD_ROOT%{_var}/{lib,log}/mongo
+	$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mongod} \
+	$RPM_BUILD_ROOT%{_var}/{lib,log{,/archive}}/mongo \
+	$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 \
-	--full \
-	--usev8
+	--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
-cp -p rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
+install %{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
+
 touch $RPM_BUILD_ROOT%{_var}/log/mongo/mongod.log
 
+# for some reason these are installed twice, remove unwanted copies
+for f in $RPM_BUILD_ROOT%{_includedir}/mongo/* ; do
+	rm -r "$RPM_BUILD_ROOT%{_includedir}/$(basename $f)" || :
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %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
@@ -141,11 +211,23 @@ rm -rf $RPM_BUILD_ROOT
 %post server
 /sbin/chkconfig --add mongod
 %service mongod restart
+# our systemd macros cannot handle template (multi-instance) units yet
+export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog
+/bin/systemd_booted && /bin/systemctl --quiet daemon-reload || :
+if [ $1 -eq 1 ]; then
+	/bin/systemctl --quiet enable mongod@.service || : 
+	/bin/systemd_booted && echo 'Run "/bin/systemctl start mongod@default.service" to start mongod.' || :
+else
+	/bin/systemd_booted && /bin/systemctl --quiet try-restart mongod@default.service || :
+fi
 
 %preun server
 if [ "$1" = "0" ]; then
 	%service -q mongod stop
 	/sbin/chkconfig --del mongod
+	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog
+	/bin/systemd_booted && /bin/systemctl --quiet stop mongod@default.service || :
+	/bin/systemctl --quiet disable mongod@.service || :
 fi
 
 %postun server
@@ -153,21 +235,33 @@ if [ "$1" = "0" ]; then
 	%userremove mongod
 	%groupremove mongod
 fi
+%systemd_reload
+
+%triggerpostun server -- %{name}-server < 2.0.6-3
+if [ -f %{_sysconfdir}/mongod.conf.rpmsave ] ; then
+	cp -f %{_sysconfdir}/mongod/default.conf{,.rpmnew} || :
+	echo "Moving %{_sysconfdir}/mongod.conf to %{_sysconfdir}/mongod/default.conf"
+	mv -f %{_sysconfdir}/mongod.conf.rpmsave %{_sysconfdir}/mongod/default.conf
+	%service mongod restart
+fi
 
 %files
 %defattr(644,root,root,755)
 %doc README GNU-AGPL-3.0.txt
+%attr(755,root,root) %{_bindir}/bsondump
 %attr(755,root,root) %{_bindir}/mongo
 %attr(755,root,root) %{_bindir}/mongodump
 %attr(755,root,root) %{_bindir}/mongoexport
 %attr(755,root,root) %{_bindir}/mongofiles
 %attr(755,root,root) %{_bindir}/mongoimport
+%attr(755,root,root) %{_bindir}/mongooplog
+%attr(755,root,root) %{_bindir}/mongoperf
 %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
+%attr(755,root,root) %{_bindir}/mongotop
+%{_mandir}/man1/bsondump.1*
 %{_mandir}/man1/mongo.1*
-%{_mandir}/man1/mongod.1*
 %{_mandir}/man1/mongodump.1*
 %{_mandir}/man1/mongoexport.1*
 %{_mandir}/man1/mongofiles.1*
@@ -176,23 +270,33 @@ fi
 %{_mandir}/man1/mongostat.1*
 %{_mandir}/man1/mongorestore.1*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmongoclient.so
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/mongo
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libmongoclient.a
+
 %files server
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mongod.conf
+#%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
 %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(755,mongod,mongod) %dir %{_var}/log/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
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmongoclient.so
-%{_libdir}/libmongoclient.a
-#%{_libdir}/libmongotestfiles.a
-%{_includedir}/mongo
+%{systemdunitdir}/mongod.service
+%{systemdunitdir}/mongod@.service