Changeset: bade9880d595 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bade9880d595
Modified Files:
MonetDB5/MonetDB-server.spec
geom/MonetDB-geom.spec
sql/MonetDB-SQL.spec
Branch: default
Log Message:
Merge from Jun2010: Fixed building of RPMs.
diffs (55 lines):
diff -r cbbfb77ab516 -r bade9880d595 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed May 19 14:35:55 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Wed May 19 16:04:25 2010 +0200
@@ -72,6 +72,9 @@
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
diff -r cbbfb77ab516 -r bade9880d595 geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.spec Wed May 19 14:35:55 2010 +0200
+++ b/geom/MonetDB-geom.spec Wed May 19 16:04:25 2010 +0200
@@ -163,6 +163,7 @@
%files MonetDB5
%{_libdir}/MonetDB5/lib/lib_geom.so*
%{_libdir}/MonetDB5/geom.mal
+%{_libdir}/MonetDB5/autoload/*_geom.mal
%endif
%files devel
diff -r cbbfb77ab516 -r bade9880d595 sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec Wed May 19 14:35:55 2010 +0200
+++ b/sql/MonetDB-SQL.spec Wed May 19 16:04:25 2010 +0200
@@ -48,7 +48,8 @@
automatic index management, extensibility of data types and search
accelerators, SQL- and XML- frontends.
-This package contains some common files for the %{name}-server5 packages.
+This package contains some common files for the %{name}-server5 package.
+You really need to install %{name}-server5.
%package server5
Summary: MonetDB5 SQL server modules
@@ -129,8 +130,6 @@
%files
%defattr(-,root,root)
-%dir %{_datadir}/MonetDB/sql
-%{_datadir}/MonetDB/sql/*
%dir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}/*
@@ -140,6 +139,8 @@
%{_libdir}/libembeddedsql5.so.*
%{_libdir}/MonetDB5/lib/lib_sql*
%{_libdir}/MonetDB5/*.mal
+%{_libdir}/MonetDB5/*.sql
+%{_libdir}/MonetDB5/autoload/*_sql.mal
%dir %{_includedir}/MonetDB5/sql
%{_includedir}/MonetDB5/sql/embeddedclient.h
%{_bindir}/merovingian
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
