Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9155
Modified Files:
MonetDB-XQuery.spec.in rpm.mk.in
Log Message:
propagated changes of Tuesday Aug 21 2007 - Thursday Aug 23 2007
from the XQuery_0-18 branch to the development trunk
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- MonetDB-XQuery.spec.in 18 Aug 2007 22:37:59 -0000 1.29
+++ MonetDB-XQuery.spec.in 23 Aug 2007 13:06:43 -0000 1.30
@@ -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 MonetDB4-XQuery
%define version @VERSION@
-%define release [EMAIL PROTECTED]@[EMAIL PROTECTED]@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
%define prefix /usr
@@ -31,15 +40,6 @@
%endif
BuildRequires: libxml2-devel
-# groups of related archs
-%define all_x86 i386 i586 i686
-
-%ifarch %{all_x86}
-%define bits 32
-%else
-%define bits 64
-%endif
-
%description
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -73,6 +73,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/pathfinder/rpm.mk.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rpm.mk.in 26 Jul 2007 14:27:29 -0000 1.14
+++ rpm.mk.in 23 Aug 2007 13:06:43 -0000 1.15
@@ -41,6 +41,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-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
$(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
--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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
