Update of /cvsroot/monetdb/geom
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8092/geom
Modified Files:
Tag: Feb2010
Makefile.ag vertoo.config
Added Files:
Tag: Feb2010
MonetDB-geom.spec
Removed Files:
Tag: Feb2010
MonetDB-geom.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/geom/vertoo.config,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- vertoo.config 19 Nov 2009 09:20:40 -0000 1.9
+++ vertoo.config 2 Feb 2010 14:42:30 -0000 1.9.2.1
@@ -14,16 +14,17 @@
main.addAnchor("configure.ag", "[MonetDB geometry module], [%v]")
main.addAnchor("NT/rules.msc", "VERSION = %v")
main.addAnchor("debian/changelog", "monetdb-geom (%v-1)")
+main.addAnchor("MonetDB-geom.spec", "%define version %v")
monetdb.setVersionFormat('@normal')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
-monetdb.addAnchors("MonetDB-geom.spec.in",
+monetdb.addAnchors("MonetDB-geom.spec",
arguments(pattern = "\nBuildRequires: MonetDB-devel >= %v",
format = "%major.%minor"))
monetdb4.setVersionFormat('@normal')
monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
-monetdb4.addAnchors("MonetDB-geom.spec.in",
+monetdb4.addAnchors("MonetDB-geom.spec",
arguments(pattern = "\nRequires: MonetDB4-server >= %v",
format = "%major.%minor"),
arguments(pattern = "\nBuildRequires:
MonetDB4-server-devel >= %v",
@@ -31,7 +32,7 @@
monetdb5.setVersionFormat('@normal')
monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
-monetdb5.addAnchors("MonetDB-geom.spec.in",
+monetdb5.addAnchors("MonetDB-geom.spec",
arguments(pattern = "\nRequires: MonetDB5-server >= %v",
format = "%major.%minor"),
arguments(pattern = "\nBuildRequires:
MonetDB5-server-devel >= %v",
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/geom/Makefile.ag,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- Makefile.ag 7 Jan 2010 15:24:19 -0000 1.12
+++ Makefile.ag 2 Feb 2010 14:42:28 -0000 1.12.2.1
@@ -17,7 +17,7 @@
SUBDIRS = conf src
-EXTRA_DIST = RunMtest.in RunMapprove.in rpm.mk.in MonetDB-geom.spec.in
MonetDB-geom.spec
+EXTRA_DIST = RunMtest.in RunMapprove.in rpm.mk.in MonetDB-geom.spec
MonetDB-geom.spec
EXTRA_DIST_DIR = NT debian BugTracker
TESTS = RunMtest
--- MonetDB-geom.spec.in DELETED ---
--- NEW FILE: MonetDB-geom.spec ---
%define name MonetDB-geom
%define version 0.16.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 Geom - 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-geom-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%{!?_with_monetdb4: %{!?_without_monetdb4: %define _without_monetdb4
--without-monetdb4}}
%{!?_with_monetdb5: %{!?_without_monetdb5: %define _with_monetdb5
--with-monetdb5}}
%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: geos-devel
%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 the common parts of the GIS (Geographic
Information System) extensions for MonetDB-SQL.
%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
%package MonetDB4
Summary: MonetDB4 SQL GIS modules
Group: Applications/Databases
Requires: MonetDB4-server >= 4.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%if !%{?buildsystem}
BuildRequires: MonetDB4-server-devel >= 4.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%endif
%description MonetDB4
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automaticautomatic index management, extensibility of data types and search
accelerators, SQL- and XML- frontends.
This package contains the GIS (Geographic Information System)
extensions for MonetDB-SQL-server4.
%endif
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%package MonetDB5
Summary: MonetDB5 SQL GIS 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 MonetDB5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automaticautomatic index management, extensibility of data types and search
accelerators, SQL- and XML- frontends.
This package contains the GIS (Geographic Information System)
extensions for MonetDB-SQL-server5.
%endif
%package devel
Summary: MonetDB SQL GIS development package
Group: Applications/Databases
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
Requires: %{name}-MonetDB5
Requires: MonetDB5-server-devel
%endif
Requires: MonetDB-devel
Requires: geos-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-geom-%{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_monetdb4} %{?_without_monetdb4} \
%{?_with_monetdb5} %{?_without_monetdb5}
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
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_datadir}/MonetDB/sql/geom.sql
%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
%files MonetDB4
%{_libdir}/MonetDB4/lib/lib_geom.so*
%{_libdir}/MonetDB4/geom.mil
%endif
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%files MonetDB5
%{_libdir}/MonetDB5/lib/lib_geom.so*
%{_libdir}/MonetDB5/geom.mal
%endif
%files devel
%{_bindir}/monetdb-geom-config
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%endif
%changelog
------------------------------------------------------------------------------
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
