Update of /cvsroot/monetdb/pathfinder
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7621/pathfinder
Modified Files:
Tag: Nov2009
INSTALL MonetDB-XQuery.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/pathfinder/vertoo.config,v
retrieving revision 1.26
retrieving revision 1.26.8.1
diff -u -d -r1.26 -r1.26.8.1
--- vertoo.config 17 Feb 2009 10:51:38 -0000 1.26
+++ vertoo.config 18 Nov 2009 22:26:59 -0000 1.26.8.1
@@ -11,7 +11,7 @@
# %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("VERSION", "%v")
main.addAnchor("configure.ag", "[MonetDB XQuery], [%v]")
main.addAnchor("NT/rules.msc", "VERSION = %v")
@@ -29,7 +29,7 @@
format = '@normal'))
main.addAnchor("debian/changelog", "monetdb-xquery (%v-1)")
-monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb.setVersionFormat('@normal')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
monetdb.addAnchors("MonetDB-XQuery.spec.in",
arguments(pattern = "\nBuildRequires: MonetDB-devel >= %v",
@@ -43,10 +43,10 @@
arguments(pattern = r'"Condition" = "8:COMMONVERSION >=
\"%v\""',
format = "@normal"))
-clients.setVersionFormat('@normal%[rc?%rc%build:]')
+clients.setVersionFormat('@normal')
clients.addAnchor("configure.ag", "req_clients_ver=%q")
-monetdb4.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb4.setVersionFormat('@normal')
monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
monetdb4.addAnchor("INSTALL", "It depends on a version that is at least %v.")
monetdb4.addAnchors("MonetDB-XQuery.spec.in",
@@ -63,5 +63,5 @@
arguments(pattern = r'"Condition" = "8:MONETDB4VERSION >=
\"%v\""',
format = "@normal"))
-monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb5.setVersionFormat('@normal')
monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.63
retrieving revision 1.63.2.1
diff -u -d -r1.63 -r1.63.2.1
--- MonetDB-XQuery.spec.in 18 Aug 2009 01:51:18 -0000 1.63
+++ MonetDB-XQuery.spec.in 18 Nov 2009 22:26:59 -0000 1.63.2.1
@@ -24,18 +24,18 @@
Source:
http://downloads.sourceforge.net/monetdb/MonetDB-XQuery-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-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.
%{!?buildsystem: %define buildsystem 0}
%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.
-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.
@@ -54,11 +54,11 @@
Summary: MonetDB XQuery development package
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
-Requires: MonetDB-devel >= 1.32
+Requires: MonetDB-devel >= 1.34
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
-Requires: MonetDB4-server-devel >= 4.32
+Requires: MonetDB4-server-devel >= 4.34
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/vertoo.data,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -u -d -r1.42 -r1.42.2.1
--- vertoo.data 28 Sep 2009 14:50:46 -0000 1.42
+++ vertoo.data 18 Nov 2009 22:26:59 -0000 1.42.2.1
@@ -1,5 +1,5 @@
-monetdb = major:1; minor:32; release:0; rc:x; build:1;
-monetdb5 = major:5; minor:14; release:0; rc:x; build:1;
-pathfinder = major:0; minor:34; release:0; rc:x; build:1;
-clients = major:1; minor:32; release:0; rc:x; build:1;
-monetdb4 = major:4; minor:32; release:0; rc:x; build:1;
\ No newline at end of file
+monetdb = major:1; minor:34; release:0;
+monetdb5 = major:5; minor:16; release:0;
+pathfinder = major:0; minor:34; release:0;
+clients = major:1; minor:34; release:0;
+monetdb4 = major:4; minor:34; release:0;
\ No newline at end of file
Index: INSTALL
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/INSTALL,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -d -r1.33 -r1.33.2.1
--- INSTALL 18 Aug 2009 01:51:14 -0000 1.33
+++ INSTALL 18 Nov 2009 22:26:59 -0000 1.33.2.1
@@ -27,7 +27,7 @@
-- MonetDB (the MonetDB main-memory database system)
Pathfinder is quite tightly coupled to the MonetDB database system.
- It depends on a version that is at least 4.32.0.
+ It depends on a version that is at least 4.34.0.
Some libraries are used or even required by the Pathfinder compiler:
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v
retrieving revision 1.154
retrieving revision 1.154.2.1
diff -u -d -r1.154 -r1.154.2.1
--- configure.ag 28 Sep 2009 14:50:45 -0000 1.154
+++ configure.ag 18 Nov 2009 22:26:59 -0000 1.154.2.1
@@ -61,7 +61,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.
@@ -81,7 +81,7 @@
AC_MSG_ERROR([Pathfinder requires a C99 compliant C compiler, but your
C compiler does not seem to be C99 compliant.])
fi
-req_clients_ver='1.32.0'
+req_clients_ver='1.34.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
@@ -101,13 +101,13 @@
dnl since they use AM_CONDITIONAL. So we do both tests, but
dnl ignore their outcome if we haven't found MonetDB common before.
-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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
