Changeset: 76327c6d427a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/76327c6d427a
Modified Files:
MonetDB.spec
debian/control
debian/monetdb-client-testing.install
Branch: monetdburl
Log Message:
Update RPM and DEB configs.
diffs (53 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -123,6 +123,10 @@ BuildRequires: geos-devel >= 3.10.0
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libxml-2.0)
+%if 0%{?rhel} != 7
+BuildRequires: pkgconfig(openssl) >= 1.1.1
+%global with_openssl 1
+%endif
%if %{with pcre}
BuildRequires: pkgconfig(libpcre) >= 4.5
%endif
@@ -369,6 +373,7 @@ developer.
%{_bindir}/ODBCtester
%{_bindir}/arraytest
%{_bindir}/bincopydata
+%{_bindir}/murltest
%{_bindir}/odbcsample1
%{_bindir}/sample0
%{_bindir}/sample1
@@ -805,6 +810,7 @@ fi
-DWITH_CURL=ON \
-DWITH_LZ4=ON \
-DWITH_LZMA=ON \
+ -DWITH_OPENSSL=%{?with_openssl:ON}%{!?with_openssl:OFF} \
-DWITH_PCRE=ON \
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 12), cmake
libxml2-dev, pkg-config,
python3, python3-dev, python3-numpy,
unixodbc-dev, zlib1g-dev, r-base-dev,
- libcfitsio-dev
+ libcfitsio-dev, openssl-dev (>= 1.1.1)
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
diff --git a/debian/monetdb-client-testing.install
b/debian/monetdb-client-testing.install
--- a/debian/monetdb-client-testing.install
+++ b/debian/monetdb-client-testing.install
@@ -4,6 +4,7 @@ debian/tmp/usr/bin/ODBCmetadata usr/bin
debian/tmp/usr/bin/ODBCtester usr/bin
debian/tmp/usr/bin/arraytest usr/bin
debian/tmp/usr/bin/bincopydata usr/bin
+debian/tmp/usr/bin/murltest usr/bin
debian/tmp/usr/bin/odbcsample1 usr/bin
debian/tmp/usr/bin/sample0 usr/bin
debian/tmp/usr/bin/sample1 usr/bin
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
