Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3206
Modified Files:
MonetDB-SQL.spec.in rpm.mk.in vertoo.config
Log Message:
propagated changes of Tuesday Aug 21 2007 - Thursday Aug 23 2007
from the SQL_2-18 branch to the development trunk
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.config,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- vertoo.config 21 Aug 2007 14:40:50 -0000 1.24
+++ vertoo.config 23 Aug 2007 13:00:43 -0000 1.25
@@ -17,12 +17,16 @@
main.addAnchor("VERSION", "%v")
main.addAnchor("configure.ag", "[MonetDB SQL Server], [%v]")
main.addAnchor("NT/rules.msc", "VERSION = %v")
-main.addAnchors("NT/MonetDB4-SQL/MonetDB4-SQL-Installer.vdproj",
- arguments(pattern = "MonetDB-SQL-%v",
- format = '@normal'))
-main.addAnchors("NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj",
- arguments(pattern = "MonetDB-SQL-%v",
- format = '@normal'))
+main.addAnchors("NT/MonetDB4-SQL/MonetDB4-Installer.vdproj",
+ arguments(pattern = "MonetDB-SQL-%v",
+ format = '@normal'),
+ arguments(pattern = "\"ProductVersion\" = \"8:%v\"",
+ format = '@normal'),
+main.addAnchors("NT/MonetDB5-SQL/MonetDB5-Installer.vdproj",
+ arguments(pattern = "MonetDB-SQL-%v",
+ format = '@normal'),
+ arguments(pattern = "\"ProductVersion\" = \"8:%v\"",
+ format = '@normal'))
main.addAnchor("src/backends/monet4/sql_server.mx", "MonetDB/SQL module v%v")
monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
@@ -40,9 +44,6 @@
monetdb4.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
monetdb4.addAnchor("MonetDB-SQL.pc.in", "^Requires: MonetDB = %v")
-monetdb4.addAnchors("NT/MonetDB4-SQL/MonetDB4-SQL-Installer.vdproj",
- arguments(pattern = "\"ProductVersion\" = \"8:%v\"",
- format = '@normal'))
monetdb4.addAnchors("MonetDB-SQL.spec.in",
arguments(pattern = "^Requires: MonetDB4-server = %v",
format = "%major.%minor"),
@@ -51,9 +52,6 @@
monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
-monetdb5.addAnchors("NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj",
- arguments(pattern = "\"ProductVersion\" = \"8:%v\"",
- format = '@normal'))
monetdb5.addAnchors("MonetDB-SQL.spec.in",
arguments(pattern = "^Requires: MonetDB5-server = %v",
format = "%major.%minor"),
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- MonetDB-SQL.spec.in 18 Aug 2007 22:38:01 -0000 1.49
+++ MonetDB-SQL.spec.in 23 Aug 2007 13:00:42 -0000 1.50
@@ -1,6 +1,15 @@
+# groups of related archs
+%define all_x86 i386 i586 i686
+
+%ifarch %{all_x86}
+%define bits 32
+%else
+%define bits 64
+%endif
+
%define name MonetDB-SQL
%define version @VERSION@
-%define release [EMAIL PROTECTED]@[EMAIL PROTECTED]@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
%define prefix /usr
@@ -19,11 +28,13 @@
%{!?_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!
# Contact [EMAIL PROTECTED] for details and/or assistance.
-BuildRequires: MonetDB-client-devel >= 1.18
+BuildRequires: MonetDB-client-devel >= 1.19
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -35,15 +46,6 @@
%endif
%endif
-# groups of related archs
-%define all_x86 i386 i586 i686
-
-%ifarch %{all_x86}
-%define bits 32
-%else
-%define bits 64
-%endif
-
%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
%package server4
Summary: MonetDB4 SQL server modules
@@ -114,6 +116,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
+ %{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--libdir=%{_libdir} \
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/sql/rpm.mk.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- rpm.mk.in 26 Jul 2007 14:27:34 -0000 1.16
+++ rpm.mk.in 23 Aug 2007 13:00:43 -0000 1.17
@@ -44,6 +44,8 @@
echo "%tmpdir %{_tmppath}" >> $(rpmtopdir)/rpmmacros
echo "%rpmcflags -O2 " >> $(rpmtopdir)/rpmmacros
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
+ echo "%dist [EMAIL PROTECTED]@" >>
$(rpmtopdir)/rpmmacros
+ if test "@oids@" -eq 32; then echo "%oid32 1" >>
$(rpmtopdir)/rpmmacros; fi
rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
$(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
${python} ${monetdb4} ${monetdb5} --define="buildsystem 1" --define="comp_cc
@CC@" $(top_builddir)/$(distdir).tar.gz
-------------------------------------------------------------------------
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
