Update of /cvsroot/monetdb/clients
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4241
Modified Files:
MonetDB-client.spec.in rpm.mk.in
Log Message:
propagated changes of Tuesday Aug 21 2007 - Thursday Aug 23 2007
from the Clients_1-18 branch to the development trunk
Index: MonetDB-client.spec.in
===================================================================
RCS file: /cvsroot/monetdb/clients/MonetDB-client.spec.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- MonetDB-client.spec.in 21 Aug 2007 09:37:53 -0000 1.16
+++ MonetDB-client.spec.in 23 Aug 2007 13:01:41 -0000 1.17
@@ -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-client
%define version @VERSION@
-%define release [EMAIL PROTECTED]@[EMAIL PROTECTED]@
+%define release 1%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
%define prefix /usr
@@ -18,6 +27,7 @@
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
+BuildRequires: readline-devel, openssl-devel
%{!?_with_php: %{!?_without_php: %define _with_php --with-php}}
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
@@ -26,15 +36,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
-
%if !%{?buildsystem}
BuildRequires: MonetDB-devel >= 1.18
# ^^^^
@@ -153,6 +154,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
+ %{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--libdir=%{_libdir} \
@@ -169,9 +171,8 @@
make install \
DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
-
# cleanup stuff we don't want to install
+find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f
rm -rf $RPM_BUILD_ROOT%{_datadir}/MonetDB/Tests/*
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB/Tests/*
rm -rf $RPM_BUILD_ROOT%{prefix}/bin/monetdb-clients-config.bat
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/clients/rpm.mk.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rpm.mk.in 26 Jul 2007 14:27:05 -0000 1.9
+++ rpm.mk.in 23 Aug 2007 13:01:42 -0000 1.10
@@ -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-client.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
