Changeset: 9ee44ef81abf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ee44ef81abf
Modified Files:
MonetDB.spec
debian/control
debian/monetdb5-server.install
debian/monetdb5-sql.install
Branch: Oct2020
Log Message:
Fix dependency issues: move libmonetdbsql.so.* to the main monetdb server
package.
diffs (199 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -257,6 +257,7 @@ Summary: MonetDB - Monet Database Manage
Group: Applications/Databases
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Recommends: MonetDB5-server%{?_isa} = %{version}-%{release}
%endif
%description client
@@ -351,7 +352,7 @@ Requires: %{name}-client-odbc%{?_isa} =
Recommends: perl-DBD-monetdb >= 1.0
Recommends: php-monetdb >= 1.0
%endif
-Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
Requires: python3-pymonetdb >= 1.0.6
%description client-tests
@@ -394,7 +395,7 @@ automatic index management, extensibilit
accelerators. It also has an SQL front end.
This package contains the GIS (Geographic Information System)
-extensions for %{name}-SQL-server5.
+extensions for MonetDB5-server.
%files geom-MonetDB5
%defattr(-,root,root)
@@ -405,7 +406,7 @@ extensions for %{name}-SQL-server5.
%package R
Summary: Integration of MonetDB and R, allowing use of R from within SQL
Group: Applications/Databases
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description R
MonetDB is a database management system that is developed from a
@@ -430,7 +431,7 @@ install it.
%package python3
Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
Group: Applications/Databases
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description python3
MonetDB is a database management system that is developed from a
@@ -454,7 +455,7 @@ install it.
%package cfitsio
Summary: MonetDB: Add on module that provides support for FITS files
Group: Applications/Databases
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description cfitsio
MonetDB is a database management system that is developed from a
@@ -496,8 +497,9 @@ automatic index management, extensibilit
accelerators. It also has an SQL front end.
This package contains the MonetDB server component. You need this
-package if you want to use the MonetDB database system. If you want
-to use the SQL front end, you also need %{name}-SQL-server5.
+package if you want to use the MonetDB database system. If you want to
+use the monetdb and monetdbd programs to manage your databases
+(recommended), you also need %{name}-SQL-server5.
%pre -n MonetDB5-server
%{?sysusers_create_package:echo 'u monetdb - "MonetDB Server"
/var/lib/monetdb' | systemd-sysusers --replace=%_sysusersdir/monetdb.conf -}
@@ -531,6 +533,7 @@ exit 0
%{_bindir}/mserver5
%exclude %{_bindir}/stethoscope
%{_libdir}/libmonetdb5.so.*
+%{_libdir}/libmonetdbsql.so*
%dir %{_libdir}/monetdb5
%if %{with cintegration}
%{_libdir}/monetdb5/lib_capi.so
@@ -584,8 +587,8 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL front end.
-This package contains the SQL front end for MonetDB. If you want to
-use SQL with MonetDB, you will need to install this package.
+This package contains the monetdb and monetdbd programs and the systemd
+configuration.
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
%post SQL-server5
@@ -617,7 +620,6 @@ use SQL with MonetDB, you will need to i
%config(noreplace) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%verify(not mtime) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_lock
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
-%{_libdir}/libmonetdbsql.so*
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -97,7 +97,8 @@ Description: MonetDB client/server inter
Package: monetdb-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: monetdb5-sql (= ${source:Version})
+Recommends: monetdb5-sql (= ${source:Version}),
+ monetdb5-server (= ${source:Version})
Description: MonetDB database client
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -127,7 +128,7 @@ Depends: ${shlibs:Depends}, libmonetdb-c
libdbd-monetdb-perl (>= 1.0),
php-monetdb (>= 1.0),
python3-pymonetdb (>= 1.0.6),
- monetdb5-sql (= ${source:Version})
+ monetdb5-server (= ${source:Version})
Description: MonetDB client testing tools
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -142,7 +143,7 @@ Package: libmonetdb5-server-geom
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version})
+ monetdb5-server (= ${source:Version})
Description: MonetDB5 SQL GIS support module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -150,13 +151,13 @@ Description: MonetDB5 SQL GIS support mo
accelerators. It also has an SQL front end.
.
This package contains the GIS (Geographic Information System)
- extensions for MonetDB-SQL-server5.
+ extensions for monetdb5-server.
Package: libmonetdb5-server-cfitsio
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version})
+ monetdb5-server (= ${source:Version})
Description: MonetDB5 SQL GIS support module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -181,8 +182,9 @@ Description: MonetDB database server ver
accelerators. It also has an SQL front end.
.
This package contains the MonetDB server component. You need this
- package if you want to use the MonetDB database system. If you want
- to use the SQL front end, you also need monetdb5-sql.
+ package if you want to use the MonetDB database system. If you want to
+ use the monetdb and monetdbd programs to manage your databases
+ (recommended), you also need monetdb5-sql.
Package: monetdb5-server-dev
Architecture: any
@@ -210,12 +212,13 @@ Description: MonetDB SQL support for mon
automatic index management, extensibility of data types and search
accelerators. It also has an SQL front end.
.
- This package contains the SQL front end for MonetDB.
+ This package contains the monetdb and monetdbd programs and the systemd
+ configuration.
Package: monetdb-python3
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version}), python3-numpy
+ monetdb5-server (= ${source:Version}), python3-numpy
Description: Integration of MonetDB and Python, allowing use of Python from
within SQL
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -232,7 +235,7 @@ Description: Integration of MonetDB and
Package: monetdb-r
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version}), r-base-core
+ monetdb5-server (= ${source:Version}), r-base-core
Description: Integration of MonetDB and R, allowing use of R from within SQL
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -1,5 +1,6 @@
debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdb5.so.* usr/lib/x86_64-linux-gnu
+debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdbsql.so* usr/lib/x86_64-linux-gnu
# usr/lib/x86_64-linux-gnu/monetdb5/lib_*.so EXCEPT:
lib_{fits,geom,gsl,microbenchmark,opt_sql_append,pyapi*,rapi,run_*,sql}.so
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_capi.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -3,6 +3,5 @@ debian/tmp/usr/bin/monetdb usr/bin
debian/tmp/usr/lib/systemd/system/monetdbd.service lib/systemd/system
debian/tmp/etc/logrotate.d/monetdbd etc/logrotate.d
debian/tmp/etc/tmpfiles.d/monetdbd.conf usr/lib/tmpfiles.d
-debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdbsql.so* usr/lib/x86_64-linux-gnu
debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
debian/tmp/var/monetdb5/dbfarm/.merovingian_lock var/monetdb5/dbfarm
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
