Update of /cvsroot/monetdb/sql
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8092/sql
Modified Files:
Tag: Feb2010
Makefile.ag vertoo.config
Added Files:
Tag: Feb2010
MonetDB-SQL.spec
Removed Files:
Tag: Feb2010
MonetDB-SQL.spec.in
Log Message:
Renamed *.spec.in files to *.spec: the only configure-expanded
value in there was @VERSION@ which we can easily expand using our
vertoo scheme.
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.config,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -d -r1.38 -r1.38.2.1
--- vertoo.config 19 Nov 2009 09:19:28 -0000 1.38
+++ vertoo.config 2 Feb 2010 14:42:33 -0000 1.38.2.1
@@ -37,10 +37,11 @@
arguments(pattern = '"Value" = "8:%v"',
format = '@normal'))
main.addAnchor("debian/changelog", "monetdb-sql (%v-1)")
+main.addAnchor("MonetDB-SQL.spec", "%define version %v")
monetdb.setVersionFormat('@normal')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
-monetdb.addAnchors("MonetDB-SQL.spec.in",
+monetdb.addAnchors("MonetDB-SQL.spec",
arguments(pattern = "\nBuildRequires: MonetDB-devel >= %v",
format = "%major.%minor"))
monetdb.addAnchors("NT/MonetDB5-SQL/MonetDB5-SQL.vdproj",
@@ -52,7 +53,7 @@
clients.setVersionFormat('@normal')
clients.addAnchor("configure.ag", "req_clients_ver=%q")
-clients.addAnchors("MonetDB-SQL.spec.in",
+clients.addAnchors("MonetDB-SQL.spec",
arguments(pattern = "\nBuildRequires: MonetDB-client-devel
>= %v",
format = "%major.%minor"))
clients.addAnchors("NT/MonetDB5-SQL/MonetDB5-SQL.vdproj",
@@ -65,7 +66,7 @@
monetdb5.setVersionFormat('@normal')
monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
monetdb5.addAnchor("MonetDB-SQL.pc.in", "\nRequires: MonetDB >= %v")
-monetdb5.addAnchors("MonetDB-SQL.spec.in",
+monetdb5.addAnchors("MonetDB-SQL.spec",
arguments(pattern = "\nRequires: MonetDB5-server >= %v",
format = "%major.%minor"),
arguments(pattern = "\nBuildRequires:
MonetDB5-server-devel >= %v",
--- MonetDB-SQL.spec.in DELETED ---
--- NEW FILE: MonetDB-SQL.spec ---
%define name MonetDB-SQL
%define version 2.36.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
# groups of related archs
%define all_x86 i386 i586 i686
%ifarch %{all_x86}
%define bits 32
%else
%define bits 64
%endif
# 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
Vendor: MonetDB BV <[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/MonetDB-SQL-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: e2fsprogs-devel
%if !%{?buildsystem}
BuildRequires: MonetDB-devel >= 1.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
BuildRequires: MonetDB-client-devel >= 1.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%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
accelerators, SQL- and XML- frontends.
This package contains some common files for the %{name}-server5 packages.
%package server5
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
Requires: MonetDB5-server >= 5.18
# ^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%if !%{?buildsystem}
BuildRequires: MonetDB5-server-devel >= 5.18
# ^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%endif
%description server5
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 the SQL frontend for MonetDB5.
%package devel
Summary: MonetDB SQL development package
Group: Applications/Databases
Requires: %{name}-server5
Requires: MonetDB5-server-devel
Requires: MonetDB-devel
Requires: MonetDB-client-devel
%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
accelerators, SQL- and XML- frontends.
This package contains the files needed to develop with %{name}.
%prep
rm -rf $RPM_BUILD_ROOT
%setup -q -n MonetDB-SQL-%{version}
%build
%configure \
--enable-strict=no \
--enable-assert=no \
--enable-debug=no \
--enable-optimize=yes \
--enable-bits=%{bits} \
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--with-monetdb=%{_prefix} \
--with-clients=%{_prefix}
make
%install
rm -rf $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
rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*/python*/site-packages
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/MonetDB
$RPM_BUILD_ROOT/%{_localstatedir}/run/MonetDB
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%dir %{_datadir}/MonetDB/sql
%{_datadir}/MonetDB/sql/*
%dir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}/*
%files server5
%defattr(-,root,root)
%{_bindir}/Mbeddedsql5
%{_libdir}/libembeddedsql5.so.*
%{_libdir}/MonetDB5/lib/lib_sql*
%{_libdir}/MonetDB5/*.mal
%dir %{_includedir}/MonetDB5/sql
%{_includedir}/MonetDB5/sql/embeddedclient.h
%{_bindir}/merovingian
%{_bindir}/monetdb
%{_mandir}/man1/monetdb.1.gz
%{_mandir}/man1/merovingian.1.gz
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/MonetDB
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/MonetDB
%files devel
%defattr(-,root,root)
%{_libdir}/pkgconfig/MonetDB-SQL.pc
%{_bindir}/monetdb-sql-config
%{_libdir}/libembeddedsql5.so
%changelog
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/Makefile.ag,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- Makefile.ag 7 Jan 2010 15:24:31 -0000 1.39
+++ Makefile.ag 2 Feb 2010 14:42:32 -0000 1.39.2.1
@@ -19,7 +19,7 @@
EXTRA_DIST = RunMtest.in RunMtest.bat.in \
RunMapprove.in RunMapprove.bat.in \
RunMserver.in RunMserver.bat.in \
- MonetDB-SQL.spec.in MonetDB-SQL.spec \
+ MonetDB-SQL.spec MonetDB-SQL.spec \
rpm.mk.in RunMserver.bat.in
EXTRA_DIST_DIR = NT debian
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
