fix directories regarding of config

[packages/mongodb.git] / mongodb.spec

diff --git a/mongodb.spec b/mongodb.spec
index 5848e409e57101fd9d39e09dc56d8f042cc4b491..8443be5075149bd92fd2296bbe7140a43c3c49c3 100644 (file)
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -6,7 +6,7 @@ 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:       3
+Release:       4
 License:       AGPL v3
 Group:         Applications/Databases
 Source0:       http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
@@ -23,7 +23,7 @@ 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
@@ -166,7 +166,7 @@ find -type f -executable | xargs chmod a-x
 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!
@@ -188,7 +188,7 @@ cp -p debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 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
+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
@@ -203,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -293,9 +293,9 @@ fi
 %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
+%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
 %{systemdunitdir}/mongod.service
 %{systemdunitdir}/mongod@.service