Update of /cvsroot/monetdb/pathfinder
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8092/pathfinder
Modified Files:
Tag: Feb2010
Makefile.ag vertoo.config
Added Files:
Tag: Feb2010
MonetDB-XQuery.spec
Removed Files:
Tag: Feb2010
MonetDB-XQuery.spec.in
Log Message:
Renamed *.spec.in files to *.spec: the only configure-expanded
value in there was @VERSION@ which we can easily expand using our
vertoo scheme.
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/vertoo.config,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -d -r1.27 -r1.27.2.1
--- vertoo.config 19 Nov 2009 09:34:16 -0000 1.27
+++ vertoo.config 2 Feb 2010 14:42:31 -0000 1.27.2.1
@@ -28,10 +28,11 @@
arguments(pattern = '"Value" = "8:%v"',
format = '@normal'))
main.addAnchor("debian/changelog", "monetdb-xquery (%v-1)")
+main.addAnchor("MonetDB-XQuery.spec", "%define version %v")
monetdb.setVersionFormat('@normal')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
-monetdb.addAnchors("MonetDB-XQuery.spec.in",
+monetdb.addAnchors("MonetDB-XQuery.spec",
arguments(pattern = "\nBuildRequires: MonetDB-devel >= %v",
format = "%major.%minor"),
arguments(pattern = "\nRequires: MonetDB-devel >= %v",
@@ -49,7 +50,7 @@
monetdb4.setVersionFormat('@normal')
monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
monetdb4.addAnchor("INSTALL", "It depends on a version that is at least %v.")
-monetdb4.addAnchors("MonetDB-XQuery.spec.in",
+monetdb4.addAnchors("MonetDB-XQuery.spec",
arguments(pattern = "\nRequires: MonetDB4-server >= %v",
format = "%major.%minor"),
arguments(pattern = "\nBuildRequires:
MonetDB4-server-devel >= %v",
--- NEW FILE: MonetDB-XQuery.spec ---
%define name MonetDB4-XQuery
%define version 0.36.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
# groups of related archs
%define all_x86 i386 i586 i686
%ifarch %{all_x86}
%define bits 32
%else
%define bits 64
%endif
Name: %{name}
Version: %{version}
Release: %{release}
Summary: MonetDB XQuery - Monet Database Management System
Vendor: MonetDB BV <[email protected]>
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
URL: http://monetdb.cwi.nl/
Source:
http://downloads.sourceforge.net/monetdb/MonetDB-XQuery-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: MonetDB4-server >= 4.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%{!?buildsystem: %define buildsystem 0}
%if !%{?buildsystem}
BuildRequires: MonetDB-devel >= 1.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
BuildRequires: MonetDB4-server-devel >= 4.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%endif
BuildRequires: libxml2-devel
%description
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 the XQuery frontend.
%package devel
Summary: MonetDB XQuery development package
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
Requires: MonetDB-devel >= 1.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
Requires: MonetDB4-server-devel >= 4.36
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
Requires: libxml2-devel
%description devel
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 the files needed to develop with
MonetDB4-XQuery.
%prep
rm -rf $RPM_BUILD_ROOT
%setup -q -n MonetDB-XQuery-%{version}
%build
%configure \
--enable-strict=no \
--enable-assert=no \
--enable-debug=no \
--enable-optimize=yes \
--enable-bits=%{bits} \
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--with-monet=%{_prefix}
make
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# cleanup stuff we don't want to install
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB5
find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
# even remove DB2 specific stuff
rm -rf $RPM_BUILD_ROOT%{_bindir}/pfserialize.pl
rm -rf $RPM_BUILD_ROOT%{_bindir}/pfloadtables.sh
rm -rf $RPM_BUILD_ROOT%{_bindir}/pfcreatetables.sh
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_bindir}/pf
%{_bindir}/pfopt
%{_bindir}/pfsql
%{_bindir}/pfshred
%{_libdir}/MonetDB4/lib/lib_*
%{_libdir}/MonetDB4/*.mil
%{_bindir}/Mbeddedxq
%{_libdir}/libembeddedxq.so.*
%dir %{_datadir}/MonetDB/xrpc
%dir %{_datadir}/MonetDB/xrpc/admin
%dir %{_datadir}/MonetDB/xrpc/export
%dir %{_datadir}/MonetDB/xrpc/demo
%{_datadir}/MonetDB/xrpc/admin/*
%{_datadir}/MonetDB/xrpc/export/*
%{_datadir}/MonetDB/xrpc/demo/*
%files devel
%defattr(-,root,root)
%{_libdir}/libembeddedxq.so
%{_bindir}/monetdb-xquery-config
%changelog
--- MonetDB-XQuery.spec.in DELETED ---
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/Makefile.ag,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- Makefile.ag 7 Jan 2010 15:24:27 -0000 1.39
+++ Makefile.ag 2 Feb 2010 14:42:30 -0000 1.39.2.1
@@ -30,7 +30,7 @@
EXTRA_DIST = extra.mk.in RunMtest.in RunMtest.bat.in \
RunMapprove.in RunMapprove.bat.in \
RunMserver.in RunMserver.bat.in \
- MonetDB-XQuery.spec.in MonetDB-XQuery.spec rpm.mk.in
+ MonetDB-XQuery.spec MonetDB-XQuery.spec rpm.mk.in
EXTRA_DIST_DIR = NT tests benchmarks debian
TESTS = RunMtest
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
