Update of /cvsroot/monetdb/clients
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17458
Modified Files:
MonetDB-client.spec.in configure.ag rpm.mk.in vertoo.data
Log Message:
Updates to the .spec files to be ever so slightly more compatible with
the Fedora packaging guidelines.
Use %configure instead of ./configure. This implies removing the
--prefix, --bindir, etc. options. This also implies that the compiler
will be called with -D_FORTIFY_SOURCE=2 which makes that the compiler
is even stricter than before. So we do that now as well.
Some fixes to get things compiled with -D_FORTIFY_SOURCE=2. Mostly,
we need to do something with the result of functions such as fwrite,
fread, ftruncate, system.
Added descriptions to all packages.
Created a MonetDB-testing package.
Enabled the MonetDB-SQL-devel package.
When creating the tar balls, remove extraneous execute bits, and don't
include files that are generated by configure (i.e. files for which
there is a corresponding .in file).
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/clients/vertoo.data,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- vertoo.data 3 Jun 2007 21:02:08 -0000 1.7
+++ vertoo.data 5 Sep 2007 17:05:50 -0000 1.8
@@ -1,3 +1,3 @@
-monetdb = major:1; minor:18; release:0; rc:x; build:1;
+monetdb = major:1; minor:19; release:0; rc:x; build:1;
clients = major:1; minor:19; release:0; rc:x; build:1;
sql = major:2; minor:18; release:0; rc:x; build:1;
\ No newline at end of file
Index: MonetDB-client.spec.in
===================================================================
RCS file: /cvsroot/monetdb/clients/MonetDB-client.spec.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- MonetDB-client.spec.in 31 Aug 2007 15:55:44 -0000 1.22
+++ MonetDB-client.spec.in 5 Sep 2007 17:05:50 -0000 1.23
@@ -1,3 +1,7 @@
+%define name MonetDB-client
+%define version @VERSION@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
+
# groups of related archs
%define all_x86 i386 i586 i686
@@ -7,22 +11,23 @@
%define bits 64
%endif
-%define name MonetDB-client
-%define version @VERSION@
-%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
-
-%define prefix /usr
+# buildsystem is set to 1 when building an rpm from within the build
+# directory; it should be set to 0 (or not set) when building a proper
+# rpm
+%{!?buildsystem: %define buildsystem 0}
Name: %{name}
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Group: System
-Source: clients-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-root
-Packager: Niels Nes <[EMAIL PROTECTED]>
-License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-Requires: MonetDB >= 1.18
+
+Group: Applications/Databases
+License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+URL: http://monetdb.cwi.nl/
+Source: http://downloads.sourceforge.net/monetdb/clients-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires: MonetDB >= 1.19
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -33,15 +38,9 @@
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
%{!?_with_perl: %{!?_without_perl: %define _with_perl --with-perl}}
%{!?_with_java: %{!?_without_java: %define _with_java --with-java}}
-%{!?buildsystem: %define buildsystem 0}
-%define builddoc 0
%if !%{?buildsystem}
-# this only needed due to faulty packaging of MonetDB/MonetDB-devel 1.18.0
-BuildRequires: %{_libdir}/libstream.so
-# this only needed due to faulty BuildRequires in MonetDB 1.18.0
-BuildRequires: zlib-devel, bzip2-devel
-BuildRequires: MonetDB-devel >= 1.18
+BuildRequires: MonetDB-devel >= 1.19
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -49,9 +48,9 @@
%package devel
Summary: MonetDB Client development package
-Group: System
+Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
-Requires: MonetDB-devel >= 1.18
+Requires: MonetDB-devel >= 1.19
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -75,19 +74,19 @@
%endif
%endif
%if %{?_with_java:1}%{!?_with_java:0}
-Requires: ant, java
+Requires: ant, java
%endif
%package odbc
Summary: MonetDB SQL odbc
-Group: System
+Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
%if %{?_with_php:1}%{!?_with_php:0}
%package php
Summary: MonetDB php interface
-Group: System
+Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
Requires: php
%define php_extensiondir %(php-config --extension-dir)
@@ -99,7 +98,7 @@
%if %{?_with_python:1}%{!?_with_python:0}
%package python
Summary: MonetDB python interface
-Group: System
+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,"")')
@@ -111,7 +110,7 @@
%if %{?_with_perl:1}%{!?_with_perl:0}
%package perl
Summary: MonetDB perl interface
-Group: System
+Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
Requires: perl
%define perl_libdir %(perl -MConfig -e '$x=$Config{installvendorarch}; $x =~
s|$Config{vendorprefix}/||; print $x;')
@@ -131,10 +130,10 @@
%if %{?_with_java:1}%{!?_with_java:0}
%package java
Summary: MonetDB java interface
-Group: System
+Group: Applications/Databases
Requires: java
%if !%{?buildsystem}
-BuildRequires: ant, java
+BuildRequires: ant, java
%endif
%endif
@@ -144,30 +143,70 @@
automatic index management, extensibility of data types and search
accellerators, SQL- and XML- frontends.
+This package contains mclient, the main client program to communicate
+with the database server, and msqldump, a program to dump the SQL
+database so that it can be loaded back later.
+
%description devel
-Add the MonetDB client 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 needed to develop with
+MonetDB-clients.
%description odbc
-Add the MonetDB SQL odbc 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 ODBC driver.
%if %{?_with_php:1}%{!?_with_php:0}
%description php
-Add the MonetDB php 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 needed to use MonetDB from a PHP
+program.
%endif
%if %{?_with_python:1}%{!?_with_python:0}
%description python
-Add the MonetDB python 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 needed to use MonetDB from a Python
+program.
%endif
%if %{?_with_perl:1}%{!?_with_perl:0}
%description perl
-Add the MonetDB perl 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 needed to use MonetDB from a Perl
+program.
%endif
%if %{?_with_java:1}%{!?_with_java:0}
%description java
-Add the MonetDB java 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 JDBC driver and mjclient, a client program
+written in Java that uses the JDBC driver to communicate with the
+database server.
%endif
%prep
@@ -177,89 +216,95 @@
%build
-./configure \
+%configure \
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
- --prefix=%{prefix} \
- --libdir=%{_libdir} \
%{?_with_php} %{?_without_php} \
%{?_with_python} %{?_without_python} \
%{?_with_perl} %{?_without_perl} \
- %{?_with_java} %{?_without_java}
+ %{?_with_java} %{?_without_java}
make
%install
rm -rf $RPM_BUILD_ROOT
-make install \
- DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
# cleanup stuff we don't want to install
+rm -rf $RPM_BUILD_ROOT%{_datadir}/MonetDB/Tests
+rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB/Tests
find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
-rm -rf $RPM_BUILD_ROOT%{_datadir}/MonetDB/Tests/*
-rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB/Tests/*
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
%clean
rm -fr $RPM_BUILD_ROOT
-%files
-%defattr(-,root,root)
-%{prefix}/bin/mclient*
-%{prefix}/bin/msqldump
+%files
+%defattr(-,root,root)
+%{_bindir}/mclient*
+%{_bindir}/msqldump
%{_libdir}/libMapi.so.*
%files devel
%defattr(-,root,root)
-%{prefix}/bin/monetdb-clients-config
+%{_bindir}/monetdb-clients-config
%{_libdir}/libMapi.so
-%{prefix}/include/MonetDB/mapilib/Mapi.h
+%dir %{_includedir}/MonetDB/mapilib
+%{_includedir}/MonetDB/mapilib/Mapi.h
# todo odbc-devel package ?
%files odbc
-%defattr(-,root,root)
-%{_libdir}/libMonetODBC.*
-%{_libdir}/libMonetODBCs.*
-%{prefix}/include/MonetDB/odbc/odbcinst.h
-%{prefix}/include/MonetDB/odbc/sql.h
-%{prefix}/include/MonetDB/odbc/sqlext.h
-%{prefix}/include/MonetDB/odbc/sqltypes.h
-%{prefix}/include/MonetDB/odbc/sqlucode.h
+%defattr(-,root,root)
+%{_libdir}/libMonetODBC.*
+%{_libdir}/libMonetODBCs.*
+%dir %{_includedir}/MonetDB/odbc
+%{_includedir}/MonetDB/odbc/odbcinst.h
+%{_includedir}/MonetDB/odbc/sql.h
+%{_includedir}/MonetDB/odbc/sqlext.h
+%{_includedir}/MonetDB/odbc/sqltypes.h
+%{_includedir}/MonetDB/odbc/sqlucode.h
%if %{?_with_php:1}%{!?_with_php:0}
%files php
-%defattr(-,root,root)
+%defattr(-,root,root)
%{php_extensiondir}/*
-%{prefix}/share/MonetDB/php/*
+%dir %{_datadir}/MonetDB/php
+%{_datadir}/MonetDB/php/*
%endif
%if %{?_with_python:1}%{!?_with_python:0}
%files python
-%defattr(-,root,root)
-%{prefix}/%{python_libdir}/*
-%{prefix}/share/MonetDB/python/Mapi.py*
+%defattr(-,root,root)
+%{_prefix}/%{python_libdir}/*
+%dir %{_datadir}/MonetDB/python
+%{_datadir}/MonetDB/python/Mapi.py*
%endif
%if %{?_with_perl:1}%{!?_with_perl:0}
%files perl
-%defattr(-,root,root)
-%{prefix}/%{perl_libdir}/*
-%{prefix}/share/MonetDB/perl/*
+%defattr(-,root,root)
+%{_prefix}/%{perl_libdir}/*
+%dir %{_datadir}/MonetDB/perl
+%{_datadir}/MonetDB/perl/*
%endif
%if %{?_with_java:1}%{!?_with_java:0}
%files java
-%defattr(-,root,root)
-%{prefix}/bin/mjclient
-%{prefix}/share/MonetDB/lib/*jar
+%defattr(-,root,root)
+%{_bindir}/mjclient
+%dir %{_datadir}/MonetDB/lib
+%{_datadir}/MonetDB/lib/*jar
%endif
%changelog
-* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
+* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL
PROTECTED]:.oid32}%{!?oid32:.oid%{bits}}
- Built.
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/configure.ag,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- configure.ag 14 Aug 2007 10:35:03 -0000 1.22
+++ configure.ag 5 Sep 2007 17:05:50 -0000 1.23
@@ -73,7 +73,7 @@
AC_SUBST(Qexec_prefix)
# Check for Monet
-req_monetdb_ver='1.18.0'
+req_monetdb_ver='1.19.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/clients/rpm.mk.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rpm.mk.in 23 Aug 2007 13:01:42 -0000 1.10
+++ rpm.mk.in 5 Sep 2007 17:05:50 -0000 1.11
@@ -61,3 +61,9 @@
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
+
+cleanup_distr:
+ find clients-* -perm -0111 -type f ! -name \*.bat ! -name \*.sh ! -exec
grep -q '^#!' {} \; -print | xargs --no-run-if-empty chmod -x
+ find clients-* -name \*.in ! -name configure.in ! -name \*.spec.in
-print | while read i; do test -f $${i%.in} && rm -f $${i%.in}; done || true
+
+dist-hook: cleanup_distr
-------------------------------------------------------------------------
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
