add subpackages back; fix build

1 files changed, 108 insertions, 172 deletions

diff --git a/rpmbuild/SPECS/gnunet.spec b/rpmbuild/SPECS/gnunet.spec
index 53f2355..81729f4 100644
--- a/rpmbuild/SPECS/gnunet.spec
+++ b/rpmbuild/SPECS/gnunet.spec
@@ -4,7 +4,7 @@
 
 Name:           gnunet
 Version:        0.16.3
-Release:        1~%{?dist}
+Release:        1%{?dist}
 Summary:        Framework for secure peer-to-peer networking
 License:        AGPLv3
 Group:          Productivity/Networking/File-Sharing
@@ -49,6 +49,8 @@ BuildRequires:	libcurl-devel
 BuildRequires:  dbus
 BuildRequires:  libsodium-devel
 BuildRequires:  mariadb-devel
+BuildRequires:  libpq-devel
+BuildRequires:  sqlite-devel
 BuildRequires:  gnupg2
 Requires:       libextractor
 Requires:       openssl
@@ -87,6 +89,16 @@ https://gnunet.org/ and in the 'doc/' folder.
 Online documentation is provided at
 'https://docs.gnunet.org' and 'https://tutorial.gnunet.org'.
 
+# gnunet-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.
+
 # gnunet-conversation functionality
 %package conversation
 Requires: gnunet
@@ -95,6 +107,15 @@ Summary: The GNUnet CONVERSATION VoP2P component.
 The GNUnet CONVERSATION component. Allows you to make Voice-over-Peer-to-Peer
 audio calls.
 
+# The mysql plugins
+%package mysql-plugins
+Requires: gnunet
+Recommends: mariadb-server
+Summary: The GNUnet MySQL/MariaDB plugins.
+%description mysql-plugins
+The GNUnet MySQL/MariaDB plugins for the datacache, datastore, namecache
+and namestore components.
+
 %prep
 echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
@@ -102,7 +123,7 @@ echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
 %setup
 
 %build
-%configure --with-sqlite=/usr/include/
+%configure
 %{make_build}
 
 %pre
@@ -137,7 +158,6 @@ authselect apply-changes
 %files
 # AGPLv3
 %attr(0700, %{gnunetuser}, %{gnunetuser})
-%doc %{_datadir}/%{name}/LICENSE
 %license %{_defaultdocdir}/%{name}/COPYING
 %doc doc AUTHORS ChangeLog NEWS README
 %{_bindir}/gnunet-ats
@@ -191,6 +211,10 @@ authselect apply-changes
 %{_bindir}/gnunet-revocation-tvg
 %{_bindir}/gnunet-seti-profiler
 %{_bindir}/gnunet-setu-profiler
+%{_bindir}/gnunet-dht-hello
+%{_bindir}/gnunet-did
+%{_bindir}/gnunet-messenger
+%{_bindir}/gnunet-scalarproduct
 %dir %{_oldincludedir}/%{name}
 %{_oldincludedir}/%{name}/compat.h
 %{_oldincludedir}/%{name}/gettext.h
@@ -309,6 +333,11 @@ authselect apply-changes
 %{_oldincludedir}/%{name}/gnunet_util_lib.h
 %{_oldincludedir}/%{name}/gnunet_vpn_service.h
 %{_oldincludedir}/%{name}/platform.h
+%{_oldincludedir}/%{name}/gnunet_child_management_lib.h
+%{_oldincludedir}/%{name}/gnunet_dhtu_plugin.h
+%{_oldincludedir}/%{name}/gnunet_hello_uri_lib.h
+%{_oldincludedir}/%{name}/gnunet_testing_netjail_lib.h
+%{_oldincludedir}/%{name}/gnunet_testing_plugin.h
 /%{_libdir}/pkgconfig/gnunetarm.pc
 /%{_libdir}/pkgconfig/gnunetats.pc
 /%{_libdir}/pkgconfig/gnunetblock.pc
@@ -374,7 +403,6 @@ authselect apply-changes
 /%{_libdir}/%{name}/libexec/gnunet-service-datastore
 /%{_libdir}/%{name}/libexec/gnunet-service-dht
 /%{_libdir}/%{name}/libexec/gnunet-service-dns
-/%{_libdir}/%{name}/libexec/gnunet-service-evil-consensus
 /%{_libdir}/%{name}/libexec/gnunet-service-fs
 /%{_libdir}/%{name}/libexec/gnunet-service-gns
 /%{_libdir}/%{name}/libexec/gnunet-service-identity
@@ -401,297 +429,223 @@ authselect apply-changes
 /%{_libdir}/%{name}/libexec/gnunet-service-zonemaster
 /%{_libdir}/%{name}/libexec/gnunet-service-zonemaster-monitor
 /%{_libdir}/%{name}/libexec/gnunet-timeout
+/%{_libdir}/%{name}/libexec/gnunet-cmds-helper
+/%{_libdir}/%{name}/libexec/gnunet-service-messenger
+/%{_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
 %dir %{_libdir}/%{name}
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_ats_proportional.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_ats_proportional.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_consensus.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_consensus.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_dht.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_dht.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_dns.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_dns.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_fs.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_fs.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_gns.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_gns.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_regex.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_regex.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_revocation.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_revocation.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_set_test.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_set_test.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_seti_test.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_seti_test.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_setu_test.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_setu_test.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_test.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_test.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_heap.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_heap.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_sqlite.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_sqlite.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_heap.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_heap.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_sqlite.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_sqlite.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_dns.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_dns.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_gns.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_gns.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_reclaim.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_reclaim.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_sqlite.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_sqlite.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_flat.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_flat.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_sqlite.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_sqlite.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_peerstore_sqlite.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_peerstore_sqlite.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_reclaim_attribute_basic.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_reclaim_attribute_basic.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_reclaim_credential_jwt.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_reclaim_credential_jwt.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_config.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_config.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_copying.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_copying.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_gns.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_gns.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_identity.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_identity.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_namestore.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_namestore.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_openid_connect.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_openid_connect.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_peerinfo.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_peerinfo.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_reclaim.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_reclaim.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_test.la
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_test.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_http_server.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_http_server.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_https_server.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_https_server.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_http_client.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_http_client.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_https_client.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_https_client.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_tcp.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_tcp.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_unix.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_unix.so
-%{_libdir}/libgnunetarm.la
+/%{_libdir}/%{name}/libgnunet_plugin_dhtu_gnunet.so
+/%{_libdir}/%{name}/libgnunet_plugin_dhtu_ip.so
+/%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_messenger.so
+/%{_libdir}/%{name}/libgnunet_plugin_utiltest.so
+/%{_libdir}/%{name}/libgnunet_test_transport_plugin_cmd_simple_send.so
+/%{_libdir}/%{name}/libgnunet_test_transport_plugin_cmd_simple_send_broadcast.so
+/%{_libdir}/%{name}/libgnunet_test_transport_plugin_cmd_simple_send_dv.so
+/%{_libdir}/%{name}/libgnunet_test_transport_plugin_cmd_udp_backchannel.so
 %{_libdir}/libgnunetarm.so
 %{_libdir}/libgnunetarm.so.2
 %{_libdir}/libgnunetarm.so.2.0.0
-%{_libdir}/libgnunetats.la
 %{_libdir}/libgnunetats.so
 %{_libdir}/libgnunetats.so.4
 %{_libdir}/libgnunetats.so.4.0.0
-%{_libdir}/libgnunetatstesting.la
-%{_libdir}/libgnunetatstesting.so
-%{_libdir}/libgnunetatstesting.so.0
-%{_libdir}/libgnunetatstesting.so.0.0.0
-%{_libdir}/libgnunetblock.la
 %{_libdir}/libgnunetblock.so
 %{_libdir}/libgnunetblock.so.0
 %{_libdir}/libgnunetblock.so.0.0.0
-%{_libdir}/libgnunetblockgroup.la
 %{_libdir}/libgnunetblockgroup.so
 %{_libdir}/libgnunetblockgroup.so.0
 %{_libdir}/libgnunetblockgroup.so.0.0.0
-%{_libdir}/libgnunetcadet.la
 %{_libdir}/libgnunetcadet.so
 %{_libdir}/libgnunetcadet.so.7
 %{_libdir}/libgnunetcadet.so.7.0.0
-%{_libdir}/libgnunetconsensus.la
 %{_libdir}/libgnunetconsensus.so
 %{_libdir}/libgnunetconsensus.so.0
 %{_libdir}/libgnunetconsensus.so.0.0.0
-%{_libdir}/libgnunetcore.la
 %{_libdir}/libgnunetcore.so
 %{_libdir}/libgnunetcore.so.0
 %{_libdir}/libgnunetcore.so.0.0.1
-%{_libdir}/libgnunetcurl.la
 %{_libdir}/libgnunetcurl.so
 %{_libdir}/libgnunetcurl.so.0
 %{_libdir}/libgnunetcurl.so.0.0.0
-%{_libdir}/libgnunetdatacache.la
 %{_libdir}/libgnunetdatacache.so
 %{_libdir}/libgnunetdatacache.so.0
 %{_libdir}/libgnunetdatacache.so.0.0.1
-%{_libdir}/libgnunetdatastore.la
 %{_libdir}/libgnunetdatastore.so
 %{_libdir}/libgnunetdatastore.so.1
 %{_libdir}/libgnunetdatastore.so.1.0.0
-%{_libdir}/libgnunetdht.la
 %{_libdir}/libgnunetdht.so
 %{_libdir}/libgnunetdht.so.3
 %{_libdir}/libgnunetdht.so.3.0.0
-%{_libdir}/libgnunetdns.la
 %{_libdir}/libgnunetdns.so
 %{_libdir}/libgnunetdns.so.0
 %{_libdir}/libgnunetdns.so.0.0.0
-%{_libdir}/libgnunetfragmentation.la
 %{_libdir}/libgnunetfragmentation.so
 %{_libdir}/libgnunetfragmentation.so.2
 %{_libdir}/libgnunetfragmentation.so.2.0.0
-%{_libdir}/libgnunetfriends.la
 %{_libdir}/libgnunetfriends.so
 %{_libdir}/libgnunetfriends.so.0
 %{_libdir}/libgnunetfriends.so.0.0.0
-%{_libdir}/libgnunetfs.la
 %{_libdir}/libgnunetfs.so
 %{_libdir}/libgnunetfs.so.2
 %{_libdir}/libgnunetfs.so.2.1.1
-%{_libdir}/libgnunetgns.la
 %{_libdir}/libgnunetgns.so
 %{_libdir}/libgnunetgns.so.0
 %{_libdir}/libgnunetgns.so.0.0.0
-%{_libdir}/libgnunetgnsrecord.la
 %{_libdir}/libgnunetgnsrecord.so
 %{_libdir}/libgnunetgnsrecord.so.0
 %{_libdir}/libgnunetgnsrecord.so.0.0.0
-%{_libdir}/libgnunetgnsrecordjson.la
 %{_libdir}/libgnunetgnsrecordjson.so
 %{_libdir}/libgnunetgnsrecordjson.so.0
 %{_libdir}/libgnunetgnsrecordjson.so.0.0.0
-%{_libdir}/libgnunethello.la
 %{_libdir}/libgnunethello.so
 %{_libdir}/libgnunethello.so.0
 %{_libdir}/libgnunethello.so.0.1.0
-%{_libdir}/libgnunetidentity.la
 %{_libdir}/libgnunetidentity.so
 %{_libdir}/libgnunetidentity.so.1
 %{_libdir}/libgnunetidentity.so.1.0.0
-%{_libdir}/libgnunetjson.la
 %{_libdir}/libgnunetjson.so
 %{_libdir}/libgnunetjson.so.0
 %{_libdir}/libgnunetjson.so.0.0.0
-%{_libdir}/libgnunetnamecache.la
 %{_libdir}/libgnunetnamecache.so
 %{_libdir}/libgnunetnamecache.so.0
 %{_libdir}/libgnunetnamecache.so.0.0.0
-%{_libdir}/libgnunetnamestore.la
 %{_libdir}/libgnunetnamestore.so
 %{_libdir}/libgnunetnamestore.so.0
 %{_libdir}/libgnunetnamestore.so.0.0.1
-%{_libdir}/libgnunetnatauto.la
 %{_libdir}/libgnunetnatauto.so
 %{_libdir}/libgnunetnatauto.so.0
 %{_libdir}/libgnunetnatauto.so.0.0.0
-%{_libdir}/libgnunetnatnew.la
 %{_libdir}/libgnunetnatnew.so
 %{_libdir}/libgnunetnatnew.so.2
 %{_libdir}/libgnunetnatnew.so.2.0.0
-%{_libdir}/libgnunetnse.la
 %{_libdir}/libgnunetnse.so
 %{_libdir}/libgnunetnse.so.0
 %{_libdir}/libgnunetnse.so.0.0.0
-%{_libdir}/libgnunetnt.la
 %{_libdir}/libgnunetnt.so
 %{_libdir}/libgnunetnt.so.0
 %{_libdir}/libgnunetnt.so.0.0.0
-%{_libdir}/libgnunetpeerinfo.la
 %{_libdir}/libgnunetpeerinfo.so
 %{_libdir}/libgnunetpeerinfo.so.0
 %{_libdir}/libgnunetpeerinfo.so.0.0.0
-%{_libdir}/libgnunetpeerstore.la
 %{_libdir}/libgnunetpeerstore.so
 %{_libdir}/libgnunetpeerstore.so.0
 %{_libdir}/libgnunetpeerstore.so.0.0.0
-%{_libdir}/libgnunetreclaim.la
 %{_libdir}/libgnunetreclaim.so
 %{_libdir}/libgnunetreclaim.so.0
 %{_libdir}/libgnunetreclaim.so.0.0.0
-%{_libdir}/libgnunetregex.la
 %{_libdir}/libgnunetregex.so
 %{_libdir}/libgnunetregex.so.3
 %{_libdir}/libgnunetregex.so.3.0.1
-%{_libdir}/libgnunetregexblock.la
 %{_libdir}/libgnunetregexblock.so
 %{_libdir}/libgnunetregexblock.so.1
 %{_libdir}/libgnunetregexblock.so.1.0.0
-%{_libdir}/libgnunetrest.la
 %{_libdir}/libgnunetrest.so
 %{_libdir}/libgnunetrest.so.0
 %{_libdir}/libgnunetrest.so.0.0.0
-%{_libdir}/libgnunetrevocation.la
 %{_libdir}/libgnunetrevocation.so
 %{_libdir}/libgnunetrevocation.so.0
 %{_libdir}/libgnunetrevocation.so.0.0.0
-%{_libdir}/libgnunetsecretsharing.la
 %{_libdir}/libgnunetsecretsharing.so
 %{_libdir}/libgnunetsecretsharing.so.0
 %{_libdir}/libgnunetsecretsharing.so.0.0.0
-%{_libdir}/libgnunetset.la
 %{_libdir}/libgnunetset.so
 %{_libdir}/libgnunetset.so.0
 %{_libdir}/libgnunetset.so.0.0.0
-%{_libdir}/libgnunetseti.la
 %{_libdir}/libgnunetseti.so
 %{_libdir}/libgnunetseti.so.0
 %{_libdir}/libgnunetseti.so.0.0.0
-%{_libdir}/libgnunetsetu.la
 %{_libdir}/libgnunetsetu.so
 %{_libdir}/libgnunetsetu.so.0
 %{_libdir}/libgnunetsetu.so.0.0.0
-%{_libdir}/libgnunetsq.la
 %{_libdir}/libgnunetsq.so
 %{_libdir}/libgnunetsq.so.0
 %{_libdir}/libgnunetsq.so.0.0.0
-%{_libdir}/libgnunetstatistics.la
 %{_libdir}/libgnunetstatistics.so
 %{_libdir}/libgnunetstatistics.so.2
 %{_libdir}/libgnunetstatistics.so.2.0.0
-%{_libdir}/libgnunettestbed.la
 %{_libdir}/libgnunettestbed.so
 %{_libdir}/libgnunettestbed.so.0
 %{_libdir}/libgnunettestbed.so.0.0.0
-%{_libdir}/libgnunettestbedlogger.la
 %{_libdir}/libgnunettestbedlogger.so
 %{_libdir}/libgnunettestbedlogger.so.0
 %{_libdir}/libgnunettestbedlogger.so.0.0.0
-%{_libdir}/libgnunettesting.la
 %{_libdir}/libgnunettesting.so
 %{_libdir}/libgnunettesting.so.1
 %{_libdir}/libgnunettesting.so.1.1.0
-%{_libdir}/libgnunettransport.la
 %{_libdir}/libgnunettransport.so
 %{_libdir}/libgnunettransport.so.2
 %{_libdir}/libgnunettransport.so.2.2.0
-%{_libdir}/libgnunettransportapplication.la
 %{_libdir}/libgnunettransportapplication.so
 %{_libdir}/libgnunettransportapplication.so.0
 %{_libdir}/libgnunettransportapplication.so.0.0.0
-%{_libdir}/libgnunettransportcommunicator.la
 %{_libdir}/libgnunettransportcommunicator.so
 %{_libdir}/libgnunettransportcommunicator.so.0
 %{_libdir}/libgnunettransportcommunicator.so.0.0.0
-%{_libdir}/libgnunettransportcore.la
 %{_libdir}/libgnunettransportcore.so
 %{_libdir}/libgnunettransportcore.so.0
 %{_libdir}/libgnunettransportcore.so.0.0.0
-%{_libdir}/libgnunettransportmonitor.la
 %{_libdir}/libgnunettransportmonitor.so
 %{_libdir}/libgnunettransportmonitor.so.0
 %{_libdir}/libgnunettransportmonitor.so.0.0.0
-%{_libdir}/libgnunettransporttesting.la
 %{_libdir}/libgnunettransporttesting.so
 %{_libdir}/libgnunettransporttesting.so.0
 %{_libdir}/libgnunettransporttesting.so.0.0.0
-%{_libdir}/libgnunettransporttesting2.la
 %{_libdir}/libgnunettransporttesting2.so
 %{_libdir}/libgnunettransporttesting2.so.0
 %{_libdir}/libgnunettransporttesting2.so.0.0.0
-%{_libdir}/libgnunetutil.la
 %{_libdir}/libgnunetutil.so
-%{_libdir}/libgnunetvpn.la
 %{_libdir}/libgnunetvpn.so
 %{_libdir}/libgnunetvpn.so.0
 %{_libdir}/libgnunetvpn.so.0.0.0
+%{_libdir}/libgnunetmessenger.so
+%{_libdir}/libgnunetmessenger.so.0
+%{_libdir}/libgnunetmessenger.so.0.0.0
+%{_libdir}/libgnunetscalarproduct.so
+%{_libdir}/libgnunetscalarproduct.so.0
+%{_libdir}/libgnunetscalarproduct.so.0.0.0
+%{_libdir}/libgnunettestingdhtu.so
+%{_libdir}/libgnunettestingdhtu.so.0
+%{_libdir}/libgnunettestingdhtu.so.0.0.0
 %dir %{_datadir}/%{name}/config.d
 %{_datadir}/%{name}/config.d/arm.conf
 %{_datadir}/%{name}/config.d/ats.conf
@@ -735,22 +689,44 @@ authselect apply-changes
 %{_datadir}/%{name}/config.d/util.conf
 %{_datadir}/%{name}/config.d/vpn.conf
 %{_datadir}/%{name}/config.d/zonemaster.conf
+%{_datadir}/%{name}/config.d/dhtu.conf
+%{_datadir}/%{name}/config.d/messenger.conf
+%{_datadir}/%{name}/config.d/scalarproduct.conf
+%{_datadir}/%{name}/config.d/tlds.conf
+%{_datadir}/%{name}/fcfsd-forbidden.html
+%{_datadir}/%{name}/fcfsd-index.html
+%{_datadir}/%{name}/fcfsd-notfound.html
+%{_datadir}/%{name}/gns-bcd-forbidden.html
+%{_datadir}/%{name}/gns-bcd-internal-error.html
+%{_datadir}/%{name}/gns-bcd-invalid-key.html
+%{_datadir}/%{name}/gns-bcd-not-found.html
+%{_datadir}/%{name}/gns-bcd-png.tex
+%{_datadir}/%{name}/gns-bcd-simple.html
+%{_datadir}/%{name}/gns-bcd-simple.tex
+%{_datadir}/%{name}/gnunet-logo-big.png
+%{_datadir}/%{name}/gnunet-logo-dark-only-text.svg
+%{_datadir}/%{name}/gnunet-logo-dark-text.svg
+%{_datadir}/%{name}/lynXified-amirouche-anonymous-v3.png
+%{_datadir}/%{name}/lynXified-amirouche-v3.svg
+%{_datadir}/%{name}/netjail_core.sh
+%{_datadir}/%{name}/netjail_exec.sh
+%{_datadir}/%{name}/netjail_start.sh
+%{_datadir}/%{name}/netjail_stop.sh
+%{_datadir}/%{name}/services/systemd/gnunet-user.service
+%{_datadir}/%{name}/services/systemd/sysusers-gnunet.conf
+%{_datadir}/%{name}/services/systemd/tmpfiles-gnunet.conf
+%{_datadir}/%{name}/topo.sh
+%{_datadir}/aclocal/gnunet.m4
+
+
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/def.tex
 %{_datadir}/%{name}/gns-bcd.html
 %{_datadir}/%{name}/gns-bcd.tex
-%{_datadir}/%{name}/gns-form-fields.xml
-%{_datadir}/%{name}/gns-form.xslt
 %{_datadir}/%{name}/gnunet-gns-proxy-ca.template
 %{_datadir}/%{name}/gnunet-logo-color.png
 %{_datadir}/%{name}/gnunet-logo.pdf
-%{_datadir}/%{name}/existence.sh
-%{_datadir}/%{name}/existence_python.sh
 %{_datadir}/%{name}/gnunet-logo.png
-%{_datadir}/%{name}/msg.sh
-%{_datadir}/%{name}/progname.sh
-%{_datadir}/%{name}/python.sh
-%{_datadir}/%{name}/version_gnunet.sh
 %{_datadir}/%{name}/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
 %{_datadir}/%{name}/services/openrc/gnunet.initd
 %{_datadir}/%{name}/services/systemd/gnunet.service
@@ -810,84 +786,48 @@ authselect apply-changes
 %{_mandir}/man1/gnunet-zoneimport.1.gz
 %{_mandir}/man5/gnunet.conf.5.gz
 %{_mandir}/man1/gnunet-bugreport.1.gz
+%{_mandir}/man1/gnunet-base32.1.gz
 %{_bindir}/gnunet-suidfix
 %{_infodir}/dir
 %{_infodir}/gnunet.info-1.gz
 %{_infodir}/gnunet.info-2.gz
 %{_infodir}/gnunet.info-3.gz
 %{_infodir}/gnunet.info.gz
-%{_infodir}/images/daemon_lego_block.png.gz
-%{_infodir}/images/daemon_lego_block.svg.gz
-%{_infodir}/images/gns.dot.gz
-%{_infodir}/images/gns.jpg.gz
-%{_infodir}/images/gnunet-0-10-peerinfo.png.gz
-%{_infodir}/images/gnunet-fs-gtk-0-10-star-tab.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-download-area.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs-menu.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish-editing.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish-select.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file_0.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs-published.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs-search.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-fs.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-gns-a-done.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-gns-a.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-gns.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-identity.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-search-selected.png.gz
-%{_infodir}/images/gnunet-gtk-0-10-traffic.png.gz
-%{_infodir}/images/gnunet-namestore-gtk-phone.png.gz
-%{_infodir}/images/gnunet-namestore-gtk-vpn.png.gz
-%{_infodir}/images/gnunet-setup-exit.png.gz
-%{_infodir}/images/gnunet-tutorial-service.png.gz
-%{_infodir}/images/gnunet-tutorial-system.png.gz
-%{_infodir}/images/iceweasel-preferences.png.gz
-%{_infodir}/images/iceweasel-proxy.png.gz
-%{_infodir}/images/lego_stack.svg.gz
-%{_infodir}/images/service_lego_block.png.gz
-%{_infodir}/images/service_lego_block.svg.gz
-%{_infodir}/images/service_stack.png.gz
-%{_infodir}/images/structure.dot.gz
-%{_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
 %{_bindir}/gnunet-base32
 %{_includedir}/%{name}/gnu_name_system_record_types.h
 %{_includedir}/%{name}/gnunet_scalarproduct_service.h
-%{_includedir}/%{name}/gnunet_testbed_ng_service.h
 %{_includedir}/%{name}/gnunet_testing_ng_lib.h
 %{_libdir}/%{name}/libexec/gnunet-service-tng
-%{_libdir}/libgnunetutil.so.14
-%{_libdir}/libgnunetutil.so.14.0.0
-%{_libdir}/libnss_gns.la
+%{_libdir}/libgnunetutil.so.15
+%{_libdir}/libgnunetutil.so.15.0.0
 %{_libdir}/libnss_gns.so.2
-%{_libdir}/libnss_gns4.la
 %{_libdir}/libnss_gns4.so.2
-%{_libdir}/libnss_gns6.la
 %{_libdir}/libnss_gns6.so.2
 %{_libdir}/pkgconfig/gnunetscalarproduct.pc
-/usr/share/man/man1/gnunet-base32.1.gz
-%{_libdir}/libgnunetmy.la
-%{_libdir}/libgnunetmy.so
-%{_libdir}/libgnunetmy.so.0
-%{_libdir}/libgnunetmy.so.0.0.0
-%{_libdir}/libgnunetmysql.la
-%{_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
+
+%files postgresql-plugins
+%{_libdir}/libgnunetpq.so
+%{_libdir}/libgnunetpq.so.1
+%{_libdir}/libgnunetpq.so.1.0.0
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_postgres.so
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_postgres.so
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_postgres.so
+%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_postgres.so
+
+# FIXME bug with mysql detection, fixed in git head.
+#%files mysql-plugins
+#%{_libdir}/libgnunetmy.so
+#%{_libdir}/libgnunetmy.so.0
+#%{_libdir}/libgnunetmy.so.0.0.0
+#%{_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
 
 %files conversation
 %{_bindir}/gnunet-conversation
@@ -895,17 +835,13 @@ authselect apply-changes
 %{_libdir}/%{name}/libexec/gnunet-helper-audio-playback
 %{_libdir}/%{name}/libexec/gnunet-helper-audio-record
 %{_libdir}/%{name}/libexec/gnunet-service-conversation
-%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_conversation.la
 %{_libdir}/%{name}/libgnunet_plugin_gnsrecord_conversation.so
-%{_libdir}/libgnunetconversation.la
 %{_libdir}/libgnunetconversation.so
 %{_libdir}/libgnunetconversation.so.0
 %{_libdir}/libgnunetconversation.so.0.0.0
-%{_libdir}/libgnunetmicrophone.la
 %{_libdir}/libgnunetmicrophone.so
 %{_libdir}/libgnunetmicrophone.so.0
 %{_libdir}/libgnunetmicrophone.so.0.0.0
-%{_libdir}/libgnunetspeaker.la
 %{_libdir}/libgnunetspeaker.so
 %{_libdir}/libgnunetspeaker.so.0
 %{_libdir}/libgnunetspeaker.so.0.0.0