Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19702
Modified Files:
MonetDB-server.spec.in rpm.mk.in
Log Message:
propagated changes of Tuesday Aug 21 2007 - Thursday Aug 23 2007
from the MonetDB_5-0 branch to the development trunk
Index: MonetDB-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- MonetDB-server.spec.in 21 Aug 2007 10:26:01 -0000 1.17
+++ MonetDB-server.spec.in 23 Aug 2007 12:46:31 -0000 1.18
@@ -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 MonetDB5-server
%define version @VERSION@
-%define release [EMAIL PROTECTED]@[EMAIL PROTECTED]@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
%define prefix /usr
%define sysconfdir /etc
@@ -24,15 +33,6 @@
%{!?buildsystem: %define buildsystem 0}
%define builddoc 0
-# groups of related archs
-%define all_x86 i386 i586 i686
-
-%ifarch %{all_x86}
-%define bits 32
-%else
-%define bits 64
-%endif
-
Requires: MonetDB-client >= 1.18
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
@@ -75,6 +75,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
+ %{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--sysconfdir=%{sysconfdir} \
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/rpm.mk.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rpm.mk.in 26 Jul 2007 14:27:23 -0000 1.7
+++ rpm.mk.in 23 Aug 2007 12:46:31 -0000 1.8
@@ -46,6 +46,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-server.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
$(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m` ${php}
${perl} ${python} ${java} --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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
