Update of /cvsroot/monetdb/MonetDB
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv689
Modified Files:
Tag: GDK-2
MonetDB.spec.in configure.ag rpm.mk.in
Log Message:
propagated changes of Monday Sep 10 2007 - Tuesday Sep 18 2007
from the development trunk to the GDK-2 branch
Index: MonetDB.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/MonetDB.spec.in,v
retrieving revision 1.52.2.4
retrieving revision 1.52.2.5
diff -u -d -r1.52.2.4 -r1.52.2.5
--- MonetDB.spec.in 6 Sep 2007 13:50:51 -0000 1.52.2.4
+++ MonetDB.spec.in 18 Sep 2007 12:51:09 -0000 1.52.2.5
@@ -30,11 +30,13 @@
BuildRequires: python
BuildRequires: zlib-devel, bzip2-devel, openssl-devel
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
%description
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.
+accelerators, SQL- and XML- frontends.
This package contains the core components of MonetDB. If you want to
use MonetDB, you will certainly need this package.
@@ -50,20 +52,35 @@
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.
+accelerators, SQL- and XML- frontends.
This package contains the files needed to develop with MonetDB.
+%package python
+Summary: MonetDB development package
+Group: Applications/Databases
+Requires: %{name} = %{version}-%{release}
+Requires: python
+
+%description python
+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
+accelerators, SQL- and XML- frontends.
+
+This package contains Python support files.
+
%package testing
Summary: MonetDB testing package
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-python
%description testing
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.
+accelerators, SQL- and XML- frontends.
This package contains the programs and files needed for testing the
MonetDB packages. You probably don't need this, unless you are a
@@ -96,7 +113,6 @@
# cleanup stuff we don't want to have installed
find $RPM_BUILD_ROOT -name .incs.in -delete -o -name \*.la -delete
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/Mprofile-commands.lst
%post -p /sbin/ldconfig
@@ -114,7 +130,6 @@
%files devel
%defattr(-,root,root)
%{_bindir}/monetdb-config
-%{_datadir}/%{name}/python/*
%dir %{_includedir}/%{name}
%dir %{_includedir}/%{name}/*
@@ -124,16 +139,18 @@
%{_libdir}/libstream.so
%{_libdir}/libbat.so
+%files python
+%dir %{python_sitearch}/%{name}
+%{python_sitearch}/%{name}/*
+
%files testing
%{_bindir}/Mtest.py*
%{_bindir}/Mapprove.py*
-%{_bindir}/Mprofile.py*
%{_bindir}/Mdiff
%{_bindir}/Mfilter.py*
%{_bindir}/MkillUsers
%{_bindir}/Mlog
%{_bindir}/Mtimeout
-%{_bindir}/prof.py*
%changelog
* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL
PROTECTED]:.oid32}%{!?oid32:.oid%{bits}}
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/configure.ag,v
retrieving revision 1.183
retrieving revision 1.183.2.1
diff -u -d -r1.183 -r1.183.2.1
--- configure.ag 15 Jul 2007 20:47:23 -0000 1.183
+++ configure.ag 18 Sep 2007 12:51:22 -0000 1.183.2.1
@@ -57,23 +57,8 @@
MONETDB_SOURCE=[`(cd $srcdir && pwd)`]
AC_SUBST(MONETDB_SOURCE)
-# if no --prefix option, we must set Qprefix to the default value
-# the problem is that prefix is set very late in the process if it
-# wasn't set by --prefix
-if test "${prefix}x" = "NONEx"; then
- Qprefix="${ac_default_prefix}"
-else
- Qprefix="${prefix}"
-fi
-Qprefix="`echo "$Qprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qprefix)
-# exec_prefix is created very late, so let make do the expansion
-if test "${exec_prefix}x" = "NONEx"; then
- Qexec_prefix='${prefix}'
-else
- Qexec_prefix="`echo "$exec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-AC_SUBST(Qexec_prefix)
+AM_MONETDB_XQ_VARS_1()
+
AM_MONETDB_DEFAULTS()
@@ -117,26 +102,10 @@
AC_CHECK_FUNCS([fcntl ftime getopt getrlimit getuid kill lockf madvise
nanosleep pipe posix_fadvise posix_madvise setenv shutdown strdup strtof
sysconf uname strtoll fsync fdatasync])
AC_CHECK_DECLS([strdup, strtof])
+
dnl provide different versions of the paths derived above
-if test "${prefix}x" = "NONEx"; then
- Xprefix="`$translatepath "$Qprefix"`"
- QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-else
- Xprefix="`$translatepath "$prefix"`"
- QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-if test "${exec_prefix}x" = "NONEx"; then
- Xexec_prefix="`$translatepath "$Qexec_prefix"`"
- QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-else
- Xexec_prefix="`$translatepath "$exec_prefix"`"
- QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-AC_SUBST(Xprefix)
-AC_SUBST(QXprefix)
+AM_MONETDB_XQ_VARS_2()
AC_DEFINE_UNQUOTED(MONETDB_PREFIX,"$QXprefix",[architecture-independent files])
-AC_SUBST(Xexec_prefix)
-AC_SUBST(QXexec_prefix)
AC_DEFINE_UNQUOTED(MONETDB_EXEC_PREFIX,"$QXexec_prefix",[architecture-dependent
files])
QMONETDB_BUILD="$MONETDB_BUILD"
XMONETDB_BUILD="`$translatepath "$MONETDB_BUILD"`"
@@ -150,75 +119,10 @@
AC_SUBST(QMONETDB_SOURCE)
AC_SUBST(XMONETDB_SOURCE)
AC_SUBST(QXMONETDB_SOURCE)
-Qsrcdir="$srcdir"
-Xsrcdir="`$translatepath "$srcdir"`"
-QXsrcdir="`echo "$Xsrcdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qsrcdir)
-AC_SUBST(Xsrcdir)
-AC_SUBST(QXsrcdir)
-Qlocalstatedir="$localstatedir"
-Xlocalstatedir="`$translatepath "$localstatedir"`"
-QXlocalstatedir="`echo "$Xlocalstatedir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_DEFINE_UNQUOTED(MONETDB_LOCALSTATEDIR,"$QXlocalstatedir",[modifiable
single-machine data])
-AC_SUBST(Qlocalstatedir)
-AC_SUBST(Xlocalstatedir)
-AC_SUBST(QXlocalstatedir)
-Qlibdir="$libdir"
-Xlibdir="`$translatepath "$libdir"`"
-QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlibdir)
-AC_SUBST(Xlibdir)
-AC_SUBST(QXlibdir)
AC_DEFINE_UNQUOTED(MONETDB_LIBDIR,"$QXlibdir",[object code libraries])
-Qsysconfdir="$sysconfdir"
-Xsysconfdir="`$translatepath "$sysconfdir"`"
-QXsysconfdir="`echo "$Xsysconfdir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_DEFINE_UNQUOTED(MONETDB_SYSCONFDIR,"$QXsysconfdir",[read-only
single-machine data])
-AC_SUBST(Qsysconfdir)
-AC_SUBST(Xsysconfdir)
-AC_SUBST(QXsysconfdir)
-Qbindir="$bindir"
-Xbindir="`$translatepath "$bindir"`"
-QXbindir="`echo "$Xbindir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qbindir)
-AC_SUBST(Xbindir)
-AC_SUBST(QXbindir)
-Qlibexecdir="$libexecdir"
-Xlibexecdir="`$translatepath "$libexecdir"`"
-QXlibexecdir="`echo "$Xlibexecdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlibexecdir)
-AC_SUBST(Xlibexecdir)
-AC_SUBST(QXlibexecdir)
-Qdatarootdir="$datarootdir"
-Xdatarootdir="`$translatepath "$datarootdir"`"
-QXdatarootdir="`echo "$Xdatarootdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qdatarootdir)
-AC_SUBST(Xdatarootdir)
-AC_SUBST(QXdatarootdir)
-Qdatadir="$datadir"
-Xdatadir="`$translatepath "$datadir"`"
-QXdatadir="`echo "$Xdatadir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qdatadir)
-AC_SUBST(Xdatadir)
-AC_SUBST(QXdatadir)
-Qmandir="$mandir"
-Xmandir="`$translatepath "$mandir"`"
-QXmandir="`echo "$Xmandir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qmandir)
-AC_SUBST(Xmandir)
-AC_SUBST(QXmandir)
-Qincludedir="$includedir"
-Xincludedir="`$translatepath "$includedir"`"
-QXincludedir="`echo "$Xincludedir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qincludedir)
-AC_SUBST(Xincludedir)
-AC_SUBST(QXincludedir)
-Qinfodir="$infodir"
-Xinfodir="`$translatepath "$infodir"`"
-QXinfodir="`echo "$Xinfodir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qinfodir)
-AC_SUBST(Xinfodir)
-AC_SUBST(QXinfodir)
+
QPYTHON="$PYTHON"
XPYTHON="`$translatepath "$PYTHON"`"
QXPYTHON="`echo "$XPYTHON" | sed 's/\\\\/\\\\\\\\/g'`"
@@ -226,6 +130,7 @@
AC_SUBST(XPYTHON)
AC_SUBST(QXPYTHON)
+
case "$host_os" in
mac*) DIRSEP=':'
QDIRSEP=':'
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/rpm.mk.in,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -d -r1.19.2.2 -r1.19.2.3
--- rpm.mk.in 6 Sep 2007 13:50:52 -0000 1.19.2.2
+++ rpm.mk.in 18 Sep 2007 12:51:24 -0000 1.19.2.3
@@ -30,7 +30,7 @@
mkdir -p $(rpmtopdir)/BUILD
mkdir -p $(rpmtopdir)/INSTALL
- echo "macrofiles:
/usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros.prelink:/etc/rpm/macros.solve:/etc/rpm/macros.up2date:/etc/rpm/macros:/etc/rpm/%{_target}/macros:$(rpmtopdir)/rpmmacros"
> $(rpmtopdir)/rpmrc
+ echo "macrofiles:
/usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/usr/lib/rpm/redhat/macros:/etc/rpm/macros.specspo:/etc/rpm/macros.prelink:/etc/rpm/macros.solve:/etc/rpm/macros.up2date:/etc/rpm/macros:/etc/rpm/%{_target}/macros:$(rpmtopdir)/rpmmacros"
> $(rpmtopdir)/rpmrc
echo "%_tmppath /tmp" > $(rpmtopdir)/rpmmacros
echo "%_topdir $(rpmtopdir)" >> $(rpmtopdir)/rpmmacros
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
