Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9676
Modified Files:
MonetDB-XQuery.spec.in rpm.mk.in
Log Message:
Moved the XRPC Wrapper to the new "java" module
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- MonetDB-XQuery.spec.in 4 Dec 2007 01:04:29 -0000 1.46
+++ MonetDB-XQuery.spec.in 5 Dec 2007 17:00:36 -0000 1.47
@@ -62,8 +62,6 @@
# Contact [EMAIL PROTECTED] for details and/or assistance.
Requires: libxml2-devel
-%{!?_with_java: %{!?_without_java: %define _with_java --with-java}}
-
%description devel
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -73,41 +71,6 @@
This package contains the files needed to develop with
MonetDB4-XQuery.
-%if %{?_with_java:1}%{!?_with_java:0}
-%package xrpcwrapper
-Summary: XRPC Java request handler
-Group: Applications/Databases
-Requires: java
-%if !%{?buildsystem}
-BuildRequires: ant, java
-%endif
-%endif
-
-%if %{?_with_java:1}%{!?_with_java:0}
-%description xrpcwrapper
-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 XQuery- frontends.
-
-This package contains three Java Archives
-- xrpcwrapper.jar: the XRPC Wrapper, which is a stand-alone Java program
- that can be plugged in on top of an XQuery engine to handle non-nested
- XRPC requests (i.e. requests that do not trigger another XRPC
- request).
-
-- xrpcwrapper-test.jar: an example client program, which (i) can be used
- to test the XRPC Wrapper, and (ii) shows how to write an XRPC Java
- client.
-
-- xrpcutil.jar: the XRPC Java API, which includes functions for
- -- creating XRPC request messages,
- -- parsing XRPC response messages,
- -- send and/or receive XRPC messages using HTTP connection,
- -- XRPC specific exception classes
-
-%endif
-
%prep
rm -rf $RPM_BUILD_ROOT
@@ -122,7 +85,6 @@
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--with-monet=%{_prefix} \
- %{?_with_java} %{?_without_java}
make
@@ -165,13 +127,6 @@
%{_datadir}/MonetDB/xrpc/export/*
-%if %{?_with_java:1}%{!?_with_java:0}
-%files xrpcwrapper
-%defattr(-,root,root)
-%dir %{_datadir}/MonetDB/lib
-%{_datadir}/MonetDB/lib/xrpc*.jar
-%endif
-
%files devel
%defattr(-,root,root)
%{_libdir}/libembeddedxq.so
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/rpm.mk.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- rpm.mk.in 3 Dec 2007 08:24:54 -0000 1.21
+++ rpm.mk.in 5 Dec 2007 17:00:37 -0000 1.22
@@ -24,9 +24,6 @@
rpmtopdir = $(shell cd $(top_builddir) && pwd)/rpm
[EMAIL PROTECTED]@java=--without java
[EMAIL PROTECTED]@java=--with java
-
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
@@ -48,14 +45,14 @@
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` ${java}
--define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
--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-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${java}
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts --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: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
