up to 2.2.4

diff --git a/mongodb.init b/mongodb.init
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/mongodb.spec b/mongodb.spec
index 8443be5075149bd92fd2296bbe7140a43c3c49c3..b5a662a3972d0c5811a7b28467c7ad77b3d71ed6 100644 (file)
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -5,12 +5,12 @@
 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
-Release:       4
+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
@@ -181,17 +181,17 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1} \
 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/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
 
@@ -283,12 +283,13 @@ fi
 
 %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*
@@ -297,5 +298,3 @@ fi
 %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
-%{systemdunitdir}/mongod.service
-%{systemdunitdir}/mongod@.service