Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22749
Modified Files:
Tag: GDK-2
MonetDB-server.spec.in RunMtest.in
Log Message:
propagated changes of Tuesday Aug 28 2007 - Monday Sep 03 2007
from the development trunk to the GDK-2 branch
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/RunMtest.in,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -d -r1.28.2.1 -r1.28.2.2
--- RunMtest.in 21 Aug 2007 13:23:43 -0000 1.28.2.1
+++ RunMtest.in 3 Sep 2007 13:08:00 -0000 1.28.2.2
@@ -35,7 +35,7 @@
fi
# enhance various paths to find our stuff
-for x in "${builddir}/src/tools/monetdb5-config"
"${srcdir}/src/tools/mchkpnt" "${srcdir}/src/tools/mrecover" ; do
+for x in "${builddir}/src/tools/monetdb5-config"
"${srcdir}/src/tools/mcheckpoint" "${srcdir}/src/tools/mrecover" ; do
if [ -s $x ] ; then
chmod +x $x
fi
Index: MonetDB-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -d -r1.15.2.4 -r1.15.2.5
--- MonetDB-server.spec.in 24 Aug 2007 09:01:18 -0000 1.15.2.4
+++ MonetDB-server.spec.in 3 Sep 2007 13:08:00 -0000 1.15.2.5
@@ -15,9 +15,6 @@
%define sysconfdir /etc
%define localstatedir /var/lib
-%define monetdb_uid 85
-%define monetdb_gid 85
-
Name: %{name}
Version: %{version}
Release: %{release}
@@ -27,7 +24,7 @@
BuildRoot: /var/tmp/%{name}-root
Packager: Niels Nes <[EMAIL PROTECTED]>
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-BuildRequires: python
+BuildRequires: python
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
%{!?buildsystem: %define buildsystem 0}
@@ -51,8 +48,8 @@
PreReq: %{_sbindir}/groupadd, %{_sbindir}/useradd
%package devel
-Summary: MonetDB development package
-Group: System
+Summary: MonetDB development package
+Group: System
Requires: %{name} = %{version}-%{release}
Requires: MonetDB-devel
Requires: MonetDB-client-devel
@@ -63,8 +60,16 @@
automatic index management, extensibility of data types and search
accellerators, SQL- and XML- frontends.
+This package contains the MonetDB5 server component.
+
%description devel
-Add the MonetDB devel description here
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accellerators, SQL- and XML- frontends.
+
+This package contains the files that are needed to develop for and
+with MonetDB5.
%prep
rm -rf $RPM_BUILD_ROOT
@@ -82,7 +87,7 @@
--prefix=%{prefix} \
--sysconfdir=%{sysconfdir} \
--localstatedir=%{localstatedir} \
- --libdir=%{_libdir}
+ --libdir=%{_libdir}
make
@@ -90,7 +95,7 @@
rm -rf $RPM_BUILD_ROOT
make install \
- DESTDIR=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{localstatedir}/MonetDB5
# insert example db here!
@@ -99,7 +104,6 @@
# cleanup stuff we don't want to install
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB5/Tests/*
-rm -rf $RPM_BUILD_ROOT%{prefix}/bin/monetdb5-config.bat
# Fixes monet config script
#perl -p -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{prefix}/bin/monet_config
@@ -108,10 +112,10 @@
rm -fr $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
-%{prefix}/bin/mserver5
+%defattr(-,root,root)
+%{prefix}/bin/mserver5
%{prefix}/bin/Mbeddedmal
-%{prefix}/bin/mchkpnt
+%{prefix}/bin/mcheckpoint
%{prefix}/bin/merovingian
%{prefix}/bin/monetdb
%{prefix}/bin/mrecover
@@ -119,25 +123,25 @@
%{_libdir}/*.so.*
%{_libdir}/MonetDB5/lib/*.so*
-%{_libdir}/MonetDB5/*.mal
+%{_libdir}/MonetDB5/*.mal
%attr(770,monetdb,monetdb) %dir %{localstatedir}/MonetDB5
%config(noreplace) %{sysconfdir}/monetdb5.conf
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root)
%{prefix}/bin/monetdb5-config
%{prefix}/include/MonetDB5/*.h
%{prefix}/include/MonetDB5/*/*.[hcm]
-%{_libdir}/*.so
+%{_libdir}/*.so
-%pre
-%{_sbindir}/groupadd -g %{monetdb_gid} -r monetdb 2>/dev/null || :
-%{_sbindir}/useradd -d %{localstatedir}/MonetDB5 -s /bin/true -g monetdb -M -r
-u %{monetdb_uid} monetdb 2>/dev/null || :
+%pre
+%{_sbindir}/groupadd -r monetdb 2>/dev/null || :
+%{_sbindir}/useradd -d %{localstatedir}/MonetDB5 -s /bin/true -g monetdb -M -r
monetdb 2>/dev/null || :
-%post
+%post
umask 022
#create monetdb init script
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
