packages: mongodb/mongodb.spec - initial pldize - gcc epoch - non integer r...

[glen]

Author: glen                         Date: Thu Oct 28 08:36:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- initial pldize
- gcc epoch
- non integer release

---- Files affected:
packages/mongodb:
   mongodb.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/mongodb/mongodb.spec
diff -u packages/mongodb/mongodb.spec:1.3 packages/mongodb/mongodb.spec:1.4
--- packages/mongodb/mongodb.spec:1.3	Thu Oct 28 10:21:48 2010
+++ packages/mongodb/mongodb.spec	Thu Oct 28 10:36:41 2010
@@ -1,18 +1,20 @@
 # $Revision$, $Date$
+# TODO
+# - pld useradd/groupadd (register uid/gid)
 Summary:	MongoDB client shell and tools
 Name:		mongodb
 Version:	1.6.2
-Release:	0
+Release:	0.1
 License:	AGPL 3.0
 Group:		Applications/Databases
-URL:		http://www.mongodb.org
+URL:		http://www.mongodb.org/
 Source0:	http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
 # Source0-md5:	358bfc52855a66d3c954e7f6f51bcd12
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
 # BuildRequires:  libpcap-devel
 BuildRequires:	boost-devel >= 1.42
-BuildRequires:	gcc >= 4.0
+BuildRequires:	gcc >= 6:4.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libstdc++-devel >= 4.0
 BuildRequires:	pcre-cxx-devel
@@ -59,43 +61,49 @@
 %prep
 %setup -q -n %{name}-src-r%{version}
 
+# Fix permissions
+find -type f -executable | xargs chmod a-x
+
 %build
-# Fix permission
-find %{_builddir}/%{name}-src-r%{version} -type f -executable -exec chmod a-x '{}' \;
+%scons \
+	--prefix=$RPM_BUILD_ROOT%{_prefix} \
+	--sharedclient \
+	--full all \
+	--usev8
 
-%scons -j 3 --prefix=$RPM_BUILD_ROOT%{_prefix} --sharedclient --full all --usev8
 # XXX really should have shared library here
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons --prefix=$RPM_BUILD_ROOT%{_usr} --sharedclient --full --usev8 install
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1} \
+	$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d} \
+	$RPM_BUILD_ROOT%{_var}/{lib,log}/mongo
+%scons install \
+	--prefix=$RPM_BUILD_ROOT%{_prefix} \
+	--sharedclient \
+	--full \
+	--usev8
 
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp -a debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 #install -d $RPM_BUILD_ROOT%{_sysconfdir}/init.d
 #cp rpm/init.d-mongod $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
 #chmod a+x $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
+cp -a rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
 #install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 #cp rpm/mongod.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mongod
 #cp rpm/mongod.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mongod
 
-install -d $RPM_BUILD_ROOT%{_var}/lib/mongo
-install -d $RPM_BUILD_ROOT%{_var}/log/mongo
 touch $RPM_BUILD_ROOT%{_var}/log/mongo/mongod.log
-# install logrotate
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mongod
-# install init script
-install -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
+cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/mongod
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mongod
 
 #install -d $RPM_BUILD_ROOT%{_sbindir}
 #ln -s %{_sysconfdir}/init.d/mongod $RPM_BUILD_ROOT%{_sbindir}/rcmongod
-ln -s ../..%{_sysconfdir}/init.d/mongod $RPM_BUILD_ROOT%{_sbindir}/rcmongod
+# XXX PFF?
+ln -s ../../etc/rc.d/init.d/mongod $RPM_BUILD_ROOT%{_sbindir}/rcmongod
 
 %clean
-scons -c --usev8
 rm -rf $RPM_BUILD_ROOT
 
 %pre server
@@ -111,9 +119,8 @@
 
 %postun server
 
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
+%post	devel -p /sbin/ldconfig
+%postun	devel -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -163,6 +170,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/10/28 08:36:41  glen
+- initial pldize
+- gcc epoch
+- non integer release
+
 Revision 1.3  2010/10/28 08:21:48  lisu
 - pcre-devel still required to build
 
@@ -174,4 +186,3 @@
 
 Revision 1.1  2010/09/17 03:26:13  aredridel
 - added. NFY
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mongodb/mongodb.spec?r1=1.3&r2=1.4&f=u