Update of /cvsroot/monetdb/clients
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32010
Modified Files:
MonetDB-client.spec.in rpm.mk.in
Log Message:
added "rpuy" RPM --- seem to work (at least for me)
Index: MonetDB-client.spec.in
===================================================================
RCS file: /cvsroot/monetdb/clients/MonetDB-client.spec.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- MonetDB-client.spec.in 3 Dec 2007 08:24:16 -0000 1.30
+++ MonetDB-client.spec.in 12 Dec 2007 19:43:33 -0000 1.31
@@ -37,6 +37,7 @@
%{!?_with_php: %{!?_without_php: %define _with_php --with-php}}
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
%{!?_with_perl: %{!?_without_perl: %define _with_perl --with-perl}}
+%{!?_with_ruby: %{!?_without_ruby: %define _with_ruby --with-ruby}}
%if !%{?buildsystem}
BuildRequires: MonetDB-devel >= 1.20
@@ -69,6 +70,10 @@
Requires: perl-devel
%endif
%endif
+%if %{?_with_ruby:1}%{!?_with_ruby:0}
+Requires: ruby, swig
+Requires: ruby-devel
+%endif
%package odbc
@@ -118,6 +123,19 @@
%endif
%endif
+%if %{?_with_ruby:1}%{!?_with_ruby:0}
+%package ruby
+Summary: MonetDB ruby interface
+Group: Applications/Databases
+Requires: %{name} = %{version}-%{release}
+Requires: ruby
+%define ruby_libdir %(ruby_prefix="`ruby -e 'require "rbconfig.rb";include
Config;print CONFIG["prefix"];'`"; ruby_libdir="`ruby -e 'require
"rbconfig.rb";include Config;print CONFIG["sitearchdir"];'`"; echo $ruby_libdir
| sed -e "s|^$ruby_prefix||g")
+%if !%{?buildsystem}
+BuildRequires: ruby, swig
+BuildRequires: ruby-devel
+%endif
+%endif
+
%description
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -178,6 +196,17 @@
program.
%endif
+%if %{?_with_ruby:1}%{!?_with_ruby:0}
+%description ruby
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators, SQL- and XML- frontends.
+
+This package contains the files needed to use MonetDB from a Ruby
+program.
+%endif
+
%prep
rm -rf $RPM_BUILD_ROOT
@@ -194,7 +223,8 @@
%{?comp_cc:CC="%{comp_cc}"} \
%{?_with_php} %{?_without_php} \
%{?_with_python} %{?_without_python} \
- %{?_with_perl} %{?_without_perl}
+ %{?_with_perl} %{?_without_perl} \
+ %{?_with_ruby} %{?_without_ruby}
make
@@ -268,6 +298,12 @@
%{_datadir}/MonetDB/perl/*
%endif
+%if %{?_with_ruby:1}%{!?_with_ruby:0}
+%files ruby
+%defattr(-,root,root)
+%{_prefix}/%{ruby_libdir}/*
+%endif
+
%changelog
* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL
PROTECTED]:.oid32}%{!?oid32:.oid%{bits}}
- Built.
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/clients/rpm.mk.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- rpm.mk.in 11 Dec 2007 12:00:07 -0000 1.20
+++ rpm.mk.in 12 Dec 2007 19:43:33 -0000 1.21
@@ -26,6 +26,8 @@
@[EMAIL PROTECTED] perl
@[EMAIL PROTECTED] python
@[EMAIL PROTECTED] python
[EMAIL PROTECTED]@ruby=--without ruby
[EMAIL PROTECTED]@ruby=--with ruby
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
@@ -48,14 +50,14 @@
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} --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m` ${php}
${perl} ${python} ${ruby} --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
rm -rf $(rpmtopdir)/BUILD
srpm: MonetDB-client.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${php} ${perl} ${python}
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${php} ${perl} ${python}
${ruby} --define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins