Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12834
Modified Files:
Tag: GDK-2
MonetDB-SQL.spec.in rpm.mk.in
Log Message:
propagated changes of Monday Sep 03 2007 - Thursday Sep 06 2007
from the development trunk to the GDK-2 branch
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.48.2.4
retrieving revision 1.48.2.5
diff -u -d -r1.48.2.4 -r1.48.2.5
--- MonetDB-SQL.spec.in 3 Sep 2007 13:10:50 -0000 1.48.2.4
+++ MonetDB-SQL.spec.in 6 Sep 2007 13:51:57 -0000 1.48.2.5
@@ -1,3 +1,7 @@
+%define name MonetDB-SQL
+%define version @VERSION@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
+
# groups of related archs
%define all_x86 i386 i586 i686
@@ -7,29 +11,27 @@
%define bits 64
%endif
-%define name MonetDB-SQL
-%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 SQL - Monet Database Management System
-Group: System
-Source: sql-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-root
-Packager: Niels Nes <[EMAIL PROTECTED]>
+
+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/sql-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
%{!?_with_monetdb4: %{!?_without_monetdb4: %define _with_monetdb4
--with-monetdb4}}
%{!?_with_monetdb5: %{!?_without_monetdb5: %define _with_monetdb5
--with-monetdb5}}
-%{!?buildsystem: %define buildsystem 0}
+
%if !%{?buildsystem}
-# this only needed due to faulty BuildRequires in MonetDB 1.18.0
-BuildRequires: zlib-devel, bzip2-devel
BuildRequires: MonetDB-devel >= 1.18
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
@@ -46,10 +48,19 @@
%endif
%endif
+%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.
+
+This package contains some common files for the %{name}-server4 and
+%{name}-server5 packages.
+
%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
%package server4
Summary: MonetDB4 SQL server modules
-Group: System
+Group: Applications/Databases
Requires: MonetDB4-server >= 4.19
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
@@ -62,14 +73,19 @@
%endif
%description server4
-Add the MonetDB4 SQL server module 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 SQL frontend for MonetDB4.
%endif
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%package server5
Summary: MonetDB5 SQL server modules
-Group: System
+Group: Applications/Databases
Requires: MonetDB5-server >= 5.1
# ^^^
# Maintained via vertoo. Please don't modify by hand!
@@ -82,32 +98,36 @@
%endif
%description server5
-Add the MonetDB5 SQL server module 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 SQL frontend for MonetDB5.
%endif
-# %package devel
-# Summary: MonetDB SQL development package
-# Group: System
-# %if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-# Requires: %{name}-server4
-# Requires: MonetDB4-server-devel
-# %endif
-# %if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
-# Requires: %{name}-server5
-# Requires: MonetDB5-server-devel
-# %endif
-# Requires: MonetDB-devel
-# Requires: MonetDB-client-devel
+%package devel
+Summary: MonetDB SQL development package
+Group: Applications/Databases
+%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+Requires: %{name}-server4
+Requires: MonetDB4-server-devel
+%endif
+%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
+Requires: %{name}-server5
+Requires: MonetDB5-server-devel
+%endif
+Requires: MonetDB-devel
+Requires: MonetDB-client-devel
-%description
+%description devel
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.
-# %description devel
-# Add the MonetDB devel description here
+This package contains the files needed to develop with %{name}.
%prep
rm -rf $RPM_BUILD_ROOT
@@ -116,75 +136,69 @@
%build
-./configure \
+%configure \
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
- --prefix=%{prefix} \
- --libdir=%{_libdir} \
- --with-monetdb=%{prefix} \
- --with-clients=%{prefix} \
+ --with-monetdb=%{_prefix} \
+ --with-clients=%{_prefix} \
%{?_with_monetdb4} %{?_without_monetdb4} \
- %{?_with_monetdb5} %{?_without_monetdb5}
+ %{?_with_monetdb5} %{?_without_monetdb5}
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
#find $RPM_BUILD_ROOT -name .incs.in | xargs rm
find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
-
-# cleanup stuff we don't want to install
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB4/Tests/*
-rm -rf $RPM_BUILD_ROOT%{prefix}/lib*/python*/site-packages
-rm -rf $RPM_BUILD_ROOT%{prefix}/include/sql
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/MonetDB-SQL.pc
-# remove the following line, once we add it to %files devel, below
-rm -rf $RPM_BUILD_ROOT%{prefix}/bin/monetdb-sql-config
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*/python*/site-packages
-# Fixes monet config script
-#perl -p -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{prefix}/bin/monet_config
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root)
+%dir %{_datadir}/MonetDB/sql
%{_datadir}/MonetDB/sql/*
+%dir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}/*
%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
%files server4
-%defattr(-,root,root)
-%{prefix}/bin/Mbeddedsql
-%{_libdir}/libembeddedsql.*
+%defattr(-,root,root)
+%{_bindir}/Mbeddedsql
+%{_libdir}/libembeddedsql.so.*
%{_libdir}/MonetDB4/lib/lib_sql_server*
%{_libdir}/MonetDB4/*.mil
-%{prefix}/include/embeddedclient.h
+%{_includedir}/embeddedclient.h
%endif
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%files server5
-%defattr(-,root,root)
-#%{prefix}/bin/Mbeddedsql
-#%{_libdir}/libembeddedsql.*
-%{prefix}/bin/Mbeddedsql5
-%{_libdir}/libembeddedsql5.*
+%defattr(-,root,root)
+%{_bindir}/Mbeddedsql5
+%{_libdir}/libembeddedsql5.so.*
%{_libdir}/MonetDB5/lib/lib_sql*
%{_libdir}/MonetDB5/*.mal
%endif
-# %files devel
-# %defattr(-,root,root)
-# %{_libdir}/pkgconfig/MonetDB-SQL.pc
-# # when activating the following line, don't remove the file during cleanup
above
-# %{prefix}/bin/monetdb-sql-config
+%files devel
+%defattr(-,root,root)
+%{_libdir}/pkgconfig/MonetDB-SQL.pc
+%{_bindir}/monetdb-sql-config
+%{_libdir}/libembeddedsql.so
+%{_libdir}/libembeddedsql5.so
%changelog
* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/sql/rpm.mk.in,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- rpm.mk.in 24 Aug 2007 09:39:40 -0000 1.16.2.1
+++ rpm.mk.in 6 Sep 2007 13:51:57 -0000 1.16.2.2
@@ -59,3 +59,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 sql-* -perm -0100 -type f ! -name \*.bat ! -name \*.sh ! -exec
grep -q '^#!' {} \; -exec chmod a-x {} \;
+ find sql-* -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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
