Update of /cvsroot/monetdb/clients
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17693
Modified Files:
MonetDB-client.spec.in
Log Message:
Put Python files in their own Python module MonetDB.
In the RPMs, put Python files in the Python hierarchy.
Created a new RPM MonetDB-python which contains monet_options.py and other such
files.
Added merovingian man page to RPM.
Fixed MonetDB5 spec file.
Removed Python ODBC interface: it was not directly related to MonetDB.
Index: MonetDB-client.spec.in
===================================================================
RCS file: /cvsroot/monetdb/clients/MonetDB-client.spec.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- MonetDB-client.spec.in 7 Sep 2007 13:13:06 -0000 1.24
+++ MonetDB-client.spec.in 11 Sep 2007 11:11:39 -0000 1.25
@@ -60,7 +60,7 @@
Requires: php, php-devel
%endif
%if %{?_with_python:1}%{!?_with_python:0}
-Requires: python, python-devel, swig
+Requires: python-devel, swig
%endif
%if %{?_with_perl:1}%{!?_with_perl:0}
Requires: perl, swig
@@ -98,9 +98,10 @@
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
Requires: python
-%define python_libdir %(python -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(1,0,"")')
+Requires: MonetDB-python
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%if !%{?buildsystem}
-BuildRequires: python, python-devel, swig
+BuildRequires: python-devel, swig
%endif
%endif
@@ -280,9 +281,9 @@
%{_bindir}/mclient.py
%exclude %{_bindir}/mclient.pyc
%exclude %{_bindir}/mclient.pyo
-%{_prefix}/%{python_libdir}/*
-%dir %{_datadir}/MonetDB/python
-%{_datadir}/MonetDB/python/Mapi.py*
+%{python_sitearch}/MonetDB/*
+%dir %{python_sitearch}/MonetSQLdb
+%{python_sitearch}/MonetSQLdb/*
%endif
%if %{?_with_perl:1}%{!?_with_perl:0}
-------------------------------------------------------------------------
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
