Update of /cvsroot/monetdb/geom
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7621/geom

Modified Files:
      Tag: Nov2009
        MonetDB-geom.spec.in configure.ag vertoo.config vertoo.data 
Log Message:
Get rid or rc and build stuff in vertoo configuration since it was in the way 
of the script that did the second part of this checkin.
The minimum required MonetDB packages are now the packages of the current 
release.

Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/geom/vertoo.config,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -d -r1.8 -r1.8.6.1
--- vertoo.config       17 Feb 2009 10:49:21 -0000      1.8
+++ vertoo.config       18 Nov 2009 22:26:58 -0000      1.8.6.1
@@ -10,18 +10,18 @@
 # %q - version number surrounded by single quotes
 # %Q - version number surrounded by double quotes
 
-main.setVersionFormat('@normal%[rc?_rc%build:]')
+main.setVersionFormat('@normal')
 main.addAnchor("configure.ag", "[MonetDB geometry module], [%v]")
 main.addAnchor("NT/rules.msc", "VERSION = %v")
 main.addAnchor("debian/changelog", "monetdb-geom (%v-1)")
 
-monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb.setVersionFormat('@normal')
 monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
 monetdb.addAnchors("MonetDB-geom.spec.in",
                    arguments(pattern = "\nBuildRequires: MonetDB-devel >= %v",
                              format = "%major.%minor"))
 
-monetdb4.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb4.setVersionFormat('@normal')
 monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
 monetdb4.addAnchors("MonetDB-geom.spec.in",
                     arguments(pattern = "\nRequires: MonetDB4-server >= %v",
@@ -29,7 +29,7 @@
                     arguments(pattern = "\nBuildRequires: 
MonetDB4-server-devel >= %v",
                               format = "%major.%minor"))
 
-monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb5.setVersionFormat('@normal')
 monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
 monetdb5.addAnchors("MonetDB-geom.spec.in",
                     arguments(pattern = "\nRequires: MonetDB5-server >= %v",

Index: MonetDB-geom.spec.in
===================================================================
RCS file: /cvsroot/monetdb/geom/MonetDB-geom.spec.in,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- MonetDB-geom.spec.in        18 Aug 2009 01:50:20 -0000      1.17
+++ MonetDB-geom.spec.in        18 Nov 2009 22:26:58 -0000      1.17.2.1
@@ -33,7 +33,7 @@
 %{!?_with_monetdb5: %{!?_without_monetdb5: %define _with_monetdb5 
--with-monetdb5}}
 
 %if !%{?buildsystem}
-BuildRequires: MonetDB-devel >= 1.32
+BuildRequires: MonetDB-devel >= 1.34
 #                               ^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
@@ -53,12 +53,12 @@
 %package MonetDB4
 Summary: MonetDB4 SQL GIS modules
 Group: Applications/Databases
-Requires: MonetDB4-server >= 4.32
+Requires: MonetDB4-server >= 4.34
 #                            ^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
 %if !%{?buildsystem}
-BuildRequires: MonetDB4-server-devel >= 4.32
+BuildRequires: MonetDB4-server-devel >= 4.34
 #                                       ^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
@@ -79,12 +79,12 @@
 %package MonetDB5
 Summary: MonetDB5 SQL GIS modules
 Group: Applications/Databases
-Requires: MonetDB5-server >= 5.14
+Requires: MonetDB5-server >= 5.16
 #                            ^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
 %if !%{?buildsystem}
-BuildRequires: MonetDB5-server-devel >= 5.14
+BuildRequires: MonetDB5-server-devel >= 5.16
 #                                       ^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.

Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/geom/vertoo.data,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- vertoo.data 28 Sep 2009 14:59:12 -0000      1.22
+++ vertoo.data 18 Nov 2009 22:26:58 -0000      1.22.2.1
@@ -1,4 +1,4 @@
-monetdb = major:1; minor:32; release:0; rc:x; build:1;
-monetdb4 = major:4; minor:32; release:0; rc:x; build:1;
-geom = major:0; minor:14; release:0; rc:x; build:1;
-monetdb5 = major:5; minor:14; release:0; rc:x; build:1;
\ No newline at end of file
+monetdb = major:1; minor:34; release:0;
+monetdb4 = major:4; minor:34; release:0;
+geom = major:0; minor:14; release:0;
+monetdb5 = major:5; minor:16; release:0;
\ No newline at end of file

Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/geom/configure.ag,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -d -r1.37 -r1.37.2.1
--- configure.ag        28 Sep 2009 14:59:12 -0000      1.37
+++ configure.ag        18 Nov 2009 22:26:58 -0000      1.37.2.1
@@ -53,7 +53,7 @@
 
 
 dnl Check for Monet
-req_monetdb_ver='1.32.0'
+req_monetdb_ver='1.34.0'
 #                ^^^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
@@ -67,12 +67,12 @@
 AM_MONETDB_OPTIONS()
 AM_MONETDB_LIBS()
 AM_MONETDB_UTILS()
-req_monetdb4_ver='4.32.0'
+req_monetdb4_ver='4.34.0'
 #                 ^^^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
 AM_MONETDB4($req_monetdb4_ver)
-req_monetdb5_ver='5.14.0'
+req_monetdb5_ver='5.16.0'
 #                 ^^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to