Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19614
Modified Files:
Tag: MonetDB_5-0
MonetDB-server.spec.in rpm.mk.in
Log Message:
Don't put configuration info of the machine on which the .spec file was
generated into same.
Acutally honor oid32 setting of current build when doing make rpm without
putting that information into the source RPM.
Index: MonetDB-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -u -d -r1.5.2.7 -r1.5.2.8
--- MonetDB-server.spec.in 31 Jul 2007 13:31:13 -0000 1.5.2.7
+++ MonetDB-server.spec.in 22 Aug 2007 10:41:44 -0000 1.5.2.8
@@ -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
%if !%{?buildsystem}
BuildRequires: MonetDB-devel >= 1.18
@@ -66,6 +66,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.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- rpm.mk.in 26 Jul 2007 14:25:58 -0000 1.3.2.3
+++ rpm.mk.in 22 Aug 2007 10:41:51 -0000 1.3.2.4
@@ -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
