commit 7b1595636ea6774037869ab05b73a600049104c3
parent 4dc951d4c30eaadc1395c6bab30112078b428c8f
Author: Yosl <yosl@seattlemesh.net>
Date: Tue, 18 May 2021 01:04:53 -0400
PACKAGING: Removed modular mariadb package
Diffstat:
1 file changed, 12 insertions(+), 49 deletions(-)
diff --git a/rpmbuild/SPECS/gnunet.spec b/rpmbuild/SPECS/gnunet.spec
@@ -28,10 +28,8 @@ BuildRequires: libunistring-devel
BuildRequires: miniupnpc
BuildRequires: libidn2-devel
BuildRequires: zlib-devel
-BuildRequires: libpq-devel
BuildRequires: jansson-devel
BuildRequires: gnutls-devel
-BuildRequires: sqlite-devel
BuildRequires: libmicrohttpd-devel
BuildRequires: opus-devel
BuildRequires: pulseaudio-libs
@@ -89,17 +87,7 @@ https://gnunet.org/ and in the 'doc/' folder.
Online documentation is provided at
'https://docs.gnunet.org' and 'https://tutorial.gnunet.org'.
-# postgresql plugins
-%package postgresql-plugins
-Requires: libpq
-Requires: gnunet
-Recommends: postgresql-server
-Summary: The GNUnet PostgreSQL plugins.
-%description postgresql-plugins
-The GNUnet PostgreSQL plugins for the datacache, datastore, namecache
-and namestore components.
-
-# The conversation functionality
+# gnunet-conversation functionality
%package conversation
Requires: gnunet
Summary: The GNUnet CONVERSATION VoP2P component.
@@ -114,7 +102,7 @@ echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
%setup
%build
-%configure
+%configure --with-sqlite=/usr/include/
%{make_build}
%pre
@@ -185,7 +173,6 @@ authselect apply-changes
%{_bindir}/gnunet-reclaim
%{_bindir}/gnunet-resolver
%{_bindir}/gnunet-revocation
-%{_bindir}/gnunet-scalarproduct
%{_bindir}/gnunet-scrypt
%{_bindir}/gnunet-search
%{_bindir}/gnunet-secretsharing-profiler
@@ -292,7 +279,6 @@ authselect apply-changes
%{_oldincludedir}/%{name}/gnunet_rest_plugin.h
%{_oldincludedir}/%{name}/gnunet_revocation_service.h
%{_oldincludedir}/%{name}/gnunet_rps_service.h
-%{_oldincludedir}/%{name}/gnunet_scalarproduct_service.h
%{_oldincludedir}/%{name}/gnunet_scheduler_lib.h
%{_oldincludedir}/%{name}/gnunet_secretsharing_service.h
%{_oldincludedir}/%{name}/gnunet_service_lib.h
@@ -349,7 +335,6 @@ authselect apply-changes
/%{_libdir}/pkgconfig/gnunetregex.pc
/%{_libdir}/pkgconfig/gnunetrevocation.pc
/%{_libdir}/pkgconfig/gnunetrps.pc
-/%{_libdir}/pkgconfig/gnunetscalarproduct.pc
/%{_libdir}/pkgconfig/gnunetset.pc
/%{_libdir}/pkgconfig/gnunetspeaker.pc
/%{_libdir}/pkgconfig/gnunetstatistics.pc
@@ -404,10 +389,6 @@ authselect apply-changes
/%{_libdir}/%{name}/libexec/gnunet-service-regex
/%{_libdir}/%{name}/libexec/gnunet-service-resolver
/%{_libdir}/%{name}/libexec/gnunet-service-revocation
-/%{_libdir}/%{name}/libexec/gnunet-service-scalarproduct-alice
-/%{_libdir}/%{name}/libexec/gnunet-service-scalarproduct-bob
-/%{_libdir}/%{name}/libexec/gnunet-service-scalarproduct-ecc-alice
-/%{_libdir}/%{name}/libexec/gnunet-service-scalarproduct-ecc-bob
/%{_libdir}/%{name}/libexec/gnunet-service-secretsharing
/%{_libdir}/%{name}/libexec/gnunet-service-set
/%{_libdir}/%{name}/libexec/gnunet-service-seti
@@ -501,13 +482,6 @@ authselect apply-changes
/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_tcp.so
/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_unix.la
/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_unix.so
-%dir %{_libdir}/%{name}/nss
-%{_libdir}/%{name}/nss/libnss_gns.la
-%{_libdir}/%{name}/nss/libnss_gns.so.2
-%{_libdir}/%{name}/nss/libnss_gns4.la
-%{_libdir}/%{name}/nss/libnss_gns4.so.2
-%{_libdir}/%{name}/nss/libnss_gns6.la
-%{_libdir}/%{name}/nss/libnss_gns6.so.2
%{_libdir}/libgnunetarm.la
%{_libdir}/libgnunetarm.so
%{_libdir}/libgnunetarm.so.2
@@ -648,10 +622,6 @@ authselect apply-changes
%{_libdir}/libgnunetrevocation.so
%{_libdir}/libgnunetrevocation.so.0
%{_libdir}/libgnunetrevocation.so.0.0.0
-%{_libdir}/libgnunetscalarproduct.la
-%{_libdir}/libgnunetscalarproduct.so
-%{_libdir}/libgnunetscalarproduct.so.0
-%{_libdir}/libgnunetscalarproduct.so.0.0.0
%{_libdir}/libgnunetsecretsharing.la
%{_libdir}/libgnunetsecretsharing.so
%{_libdir}/libgnunetsecretsharing.so.0
@@ -718,8 +688,6 @@ authselect apply-changes
%{_libdir}/libgnunettransporttesting2.so.0.0.0
%{_libdir}/libgnunetutil.la
%{_libdir}/libgnunetutil.so
-%{_libdir}/libgnunetutil.so.13
-%{_libdir}/libgnunetutil.so.13.0.2
%{_libdir}/libgnunetvpn.la
%{_libdir}/libgnunetvpn.so
%{_libdir}/libgnunetvpn.so.0
@@ -753,7 +721,6 @@ authselect apply-changes
%{_datadir}/%{name}/config.d/resolver.conf
%{_datadir}/%{name}/config.d/rest.conf
%{_datadir}/%{name}/config.d/revocation.conf
-%{_datadir}/%{name}/config.d/scalarproduct.conf
%{_datadir}/%{name}/config.d/secretsharing.conf
%{_datadir}/%{name}/config.d/set.conf
%{_datadir}/%{name}/config.d/seti.conf
@@ -883,20 +850,18 @@ authselect apply-changes
%{_infodir}/images/service_lego_block.svg.gz
%{_infodir}/images/service_stack.png.gz
%{_infodir}/images/structure.dot.gz
-
-%files postgresql-plugins
%{_libdir}/libgnunetpq.la
%{_libdir}/libgnunetpq.so
%{_libdir}/libgnunetpq.so.1
%{_libdir}/libgnunetpq.so.1.0.0
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_postgres.la
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_postgres.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_postgres.la
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_postgres.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_postgres.la
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_postgres.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_postgres.la
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_postgres.so
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_postgres.la
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_postgres.so
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_postgres.la
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_postgres.so
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_postgres.la
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_postgres.so
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_postgres.la
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_postgres.so
%{_bindir}/gnunet-base32
%{_includedir}/%{name}/gnu_name_system_record_types.h
%{_includedir}/%{name}/gnunet_scalarproduct_service.h
@@ -913,8 +878,6 @@ authselect apply-changes
%{_libdir}/libnss_gns6.so.2
%{_libdir}/pkgconfig/gnunetscalarproduct.pc
/usr/share/man/man1/gnunet-base32.1.gz
-
-%files mysql-plugins
%{_libdir}/libgnunetmy.la
%{_libdir}/libgnunetmy.so
%{_libdir}/libgnunetmy.so.0
@@ -923,8 +886,8 @@ authselect apply-changes
%{_libdir}/libgnunetmysql.so
%{_libdir}/libgnunetmysql.so.0
%{_libdir}/libgnunetmysql.so.0.0.0
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_mysql.la
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_mysql.so
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_mysql.la
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_mysql.so
%files conversation
%{_bindir}/gnunet-conversation
