Changeset: f34bcb57040a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f34bcb57040a Modified Files: MonetDB5/MonetDB-server.spec Branch: default Log Message:
Raptor is no longer optional in .spec file. Since configure no longer supports --with-raptor, we remove it from the .spec file as well. diffs (73 lines): diff -r 2ead00e2bd38 -r f34bcb57040a MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Wed Dec 08 00:49:24 2010 +0100 +++ b/MonetDB5/MonetDB-server.spec Wed Dec 08 11:47:16 2010 +0100 @@ -29,8 +29,6 @@ Source: http://dev.monetdb.org/downloads/sources/Oct2010/MonetDB5-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -%{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}} - Requires(pre): shadow-utils BuildRequires: pcre-devel BuildRequires: libxml2-devel @@ -60,21 +58,17 @@ # Contact [email protected] for details and/or assistance. %endif -%if %{?_with_raptor:1}%{!?_with_raptor:0} %package rdf Summary: MonetDB RDF interface Group: Applications/Databases Requires: %{name} = %{version}-%{release} BuildRequires: raptor-devel >= 1.4.16 -%endif %package devel Summary: MonetDB development package Group: Applications/Databases Requires: %{name} = %{version}-%{release} -%if %{?_with_raptor:1}%{!?_with_raptor:0} Requires: %{name}-rdf = %{version}-%{release} -%endif Requires: MonetDB-devel Requires: MonetDB-client-devel Requires: libxml2-devel @@ -90,7 +84,6 @@ use the SQL frontend (in which case you need MonetDB-SQL-server5 as well). -%if %{?_with_raptor:1}%{!?_with_raptor:0} %description rdf MonetDB is a database management system that is developed from a main-memory perspective with use of a fully decomposed storage model, @@ -98,7 +91,6 @@ accelerators, SQL- and XML- frontends. This package contains the MonetDB5 RDF module. -%endif %description devel MonetDB is a database management system that is developed from a @@ -122,8 +114,7 @@ --enable-optimize=yes \ --enable-bits=%{bits} \ %{?oid32:--enable-oid32} \ - %{?comp_cc:CC="%{comp_cc}"} \ - %{?_with_raptor} %{?_without_raptor} + %{?comp_cc:CC="%{comp_cc}"} make @@ -190,12 +181,10 @@ %config(noreplace) %{_sysconfdir}/monetdb5.conf %{_mandir}/man5/monetdb5.conf.5.gz -%if %{?_with_raptor:1}%{!?_with_raptor:0} %files rdf %{_libdir}/MonetDB5/rdf.mal %{_libdir}/MonetDB5/lib/lib_rdf.so* %{_libdir}/MonetDB5/autoload/*_rdf.mal -%endif %files devel %defattr(-,root,root) _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
