update to current masterdev/schanzen/meson

1 files changed, 37 insertions, 147 deletions

diff --git a/rpmbuild/SPECS/gnunet.spec b/rpmbuild/SPECS/gnunet.spec
index e691ecf..9d15862 100644
--- a/rpmbuild/SPECS/gnunet.spec
+++ b/rpmbuild/SPECS/gnunet.spec
@@ -2,21 +2,21 @@
 %global gnunethome %{_sharedstatedir}/%{name}
 
 Name:           gnunet
-Version:        0.20.0
+Version:        0.21.0
 Release:        1%{?dist}
 Summary:        Framework for secure peer-to-peer networking
 License:        AGPL-3.0-or-later
 Group:          Productivity/Networking/File-Sharing
 URL:            https://%{name}.org
 %global         _disable_source_fetch 0
-Source0:        https://ftpmirror.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-Source1:        https://ftpmirror.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+Source0:        https://ftpmirror.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+Source1:        https://ftpmirror.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 Source2:        https://www.gnunet.org/~schanzen/schanzen.asc
-%global         SHA512SUM0 bd06ac77d9812569acbc51b79ac6c1259eb0cfa9b44e8ef167723880bc9c1e142589014ad7edd54695a2ac35f2aa0d78ef23b052354d06a01751cc201153a9df
+%global         SHA512SUM0 ca2897ed2eadd2e7a749c48715211c8faf881cec0deb7b1fc22d31981ba1eda1143eef69a146ebc217dceb15aeba0ea94e2e44f682404e97b4f5919f2ea4011e
 BuildRequires:  libtool
 BuildRequires:  libtool-ltdl
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  autoconf
+BuildRequires:  meson
 BuildRequires:  make
 BuildRequires:  gettext
 BuildRequires:  gcc
@@ -154,34 +154,6 @@ Summary: The GNUnet CONVERSATION VoP2P component development files
 %description conversation-devel
 The GNUnet CONVERSATION VoP2P component development files.
 
-# The mysql lib
-%package -n libgnunetmy
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-BuildRequires:  mariadb-devel
-Recommends: mariadb-server
-Summary: The GNUnet MySQL/MariaDB utility library
-%description -n libgnunetmy
-The GNUnet MySQL/MariaDB utility library.
-
-# The mysql plugins
-%package mysql-plugins
-Requires: libgnunetmy%{?_isa} = %{version}-%{release}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires:  mariadb-devel
-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.
-
-%package -n libgnunetmy-devel
-Requires: libgnunet-devel%{?_isa} = %{version}-%{release}
-Requires: libgnunetmy%{?_isa} = %{version}-%{release}
-Summary: The GNUnet MySQL/MariaDB utility library development files
-%description -n libgnunetmy-devel
-The GNUnet MySQL/MariaDB utility library development files.
-
-
 %prep
 echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
@@ -189,8 +161,8 @@ echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
 %setup -q
 
 %build
-%configure
-%{make_build}
+%meson
+%meson_build
 
 %pre
 getent group %{name}dns >/dev/null || /usr/sbin/groupadd -r %{name}
@@ -199,7 +171,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -G %{name}dns -m -d %{
 exit 0
 
 %install
-make install DESTDIR=%{buildroot}
+%meson_install
 %find_lang %{name}
 install -Dm644 "contrib/packages/fedora/%{name}.service" "%{buildroot}/%{_unitdir}/%{name}.service"
 install -Dm644 "contrib/packages/fedora/%{name}-user.service" "%{buildroot}/%{_userunitdir}/%{name}-user.service"
@@ -214,7 +186,8 @@ install -Dm644 "contrib/packages/fedora/gnunet-system.conf" %{buildroot}/%{_sysc
 rm -f %{buildroot}%{_infodir}/dir
 
 %check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
+# FIXME
+#desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 #make check
 
 %post
@@ -236,7 +209,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunetrest.so
 %{_libdir}/libgnunetutil.so
 %{_libdir}/pkgconfig/gnunetarm.pc
-%{_datadir}/aclocal/gnunet.m4
 %{_datadir}/%{name}/testing_hostkeys.ecc
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/gnunet_util_lib.h
@@ -319,7 +291,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 # AGPLv3
 %attr(0700, %{gnunetuser}, %{gnunetuser})
 %{_bindir}/gnunet-arm
-%{_bindir}/gnunet-ats
 %{_bindir}/gnunet-auto-share
 %{_bindir}/gnunet-cadet
 %{_bindir}/gnunet-core
@@ -341,7 +312,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_bindir}/gnunet-nat-auto
 %{_bindir}/gnunet-nat-server
 %{_bindir}/gnunet-nse
-%{_bindir}/gnunet-peerinfo
 %{_bindir}/gnunet-publish
 %{_bindir}/gnunet-qr
 %{_bindir}/gnunet-reclaim
@@ -350,9 +320,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_bindir}/gnunet-scrypt
 %{_bindir}/gnunet-search
 %{_bindir}/gnunet-statistics
-%{_bindir}/gnunet-testbed-profiler
 %{_bindir}/gnunet-testing
-%{_bindir}/gnunet-transport
 %{_bindir}/gnunet-transport-certificate-creation
 %{_bindir}/gnunet-unindex
 %{_bindir}/gnunet-uri
@@ -369,11 +337,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/%{name}/libexec/gnunet-communicator-unix
 %{_libdir}/%{name}/libexec/gnunet-daemon-exit
 %{_libdir}/%{name}/libexec/gnunet-daemon-hostlist
-%{_libdir}/%{name}/libexec/gnunet-daemon-latency-logger
 %{_libdir}/%{name}/libexec/gnunet-daemon-pt
 %{_libdir}/%{name}/libexec/gnunet-daemon-regexprofiler
-%{_libdir}/%{name}/libexec/gnunet-daemon-testbed-blacklist
-%{_libdir}/%{name}/libexec/gnunet-daemon-testbed-underlay
 %{_libdir}/%{name}/libexec/gnunet-daemon-topology
 %{_libdir}/%{name}/libexec/gnunet-dns2gns
 %{_libdir}/%{name}/libexec/gnunet-helper-dns
@@ -381,13 +346,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/%{name}/libexec/gnunet-helper-fs-publish
 %{_libdir}/%{name}/libexec/gnunet-helper-nat-client
 %{_libdir}/%{name}/libexec/gnunet-helper-nat-server
-%{_libdir}/%{name}/libexec/gnunet-helper-testbed
 %{_libdir}/%{name}/libexec/gnunet-helper-vpn
 %{_libdir}/%{name}/libexec/gnunet-gns-proxy
-%{_libdir}/%{name}/libexec/gnunet-namestore-fcfsd
 %{_libdir}/%{name}/libexec/gnunet-rest-server
 %{_libdir}/%{name}/libexec/gnunet-service-arm
-%{_libdir}/%{name}/libexec/gnunet-service-ats
 %{_libdir}/%{name}/libexec/gnunet-service-cadet
 %{_libdir}/%{name}/libexec/gnunet-service-consensus
 %{_libdir}/%{name}/libexec/gnunet-service-core
@@ -402,7 +364,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/%{name}/libexec/gnunet-service-nat
 %{_libdir}/%{name}/libexec/gnunet-service-nat-auto
 %{_libdir}/%{name}/libexec/gnunet-service-nse
-%{_libdir}/%{name}/libexec/gnunet-service-peerinfo
 %{_libdir}/%{name}/libexec/gnunet-service-peerstore
 %{_libdir}/%{name}/libexec/gnunet-service-reclaim
 %{_libdir}/%{name}/libexec/gnunet-service-regex
@@ -413,9 +374,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/%{name}/libexec/gnunet-service-seti
 %{_libdir}/%{name}/libexec/gnunet-service-setu
 %{_libdir}/%{name}/libexec/gnunet-service-statistics
-%{_libdir}/%{name}/libexec/gnunet-service-testbed
-%{_libdir}/%{name}/libexec/gnunet-service-testbed-logger
-%{_libdir}/%{name}/libexec/gnunet-service-tng
 %{_libdir}/%{name}/libexec/gnunet-service-transport
 %{_libdir}/%{name}/libexec/gnunet-service-vpn
 %{_libdir}/%{name}/libexec/gnunet-service-zonemaster
@@ -430,8 +388,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_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_plugin_ats_proportional.so
 %{_libdir}/%{name}/libgnunet_plugin_block_consensus.so
 %{_libdir}/%{name}/libgnunet_plugin_block_dht.so
 %{_libdir}/%{name}/libgnunet_plugin_block_dns.so
@@ -455,28 +411,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/%{name}/libgnunet_plugin_peerstore_sqlite.so
 %{_libdir}/%{name}/libgnunet_plugin_reclaim_attribute_basic.so
 %{_libdir}/%{name}/libgnunet_plugin_reclaim_credential_jwt.so
-%{_libdir}/%{name}/libgnunet_plugin_rest_config.so
-%{_libdir}/%{name}/libgnunet_plugin_rest_copying.so
-%{_libdir}/%{name}/libgnunet_plugin_rest_gns.so
-%{_libdir}/%{name}/libgnunet_plugin_rest_identity.so
-%{_libdir}/%{name}/libgnunet_plugin_rest_namestore.so
-%{_libdir}/%{name}/libgnunet_plugin_rest_openid_connect.so
-%{_libdir}/%{name}/libgnunet_plugin_rest_peerinfo.so
-%{_libdir}/%{name}/libgnunet_plugin_rest_reclaim.so
-%{_libdir}/%{name}/libgnunet_plugin_transport_http_server.so
-%{_libdir}/%{name}/libgnunet_plugin_transport_https_server.so
-%{_libdir}/%{name}/libgnunet_plugin_transport_http_client.so
-%{_libdir}/%{name}/libgnunet_plugin_transport_https_client.so
-%{_libdir}/%{name}/libgnunet_plugin_transport_tcp.so
-%{_libdir}/%{name}/libgnunet_plugin_transport_unix.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_simple_send_performance.so
 %{_libdir}/%{name}/libgnunet_test_transport_plugin_cmd_udp_backchannel.so
 %{_libdir}/%{name}/libgnunet_test_transport_plugin_cmd_nat_upnp.so
-%{_libdir}/libgnunetats.so.4
-%{_libdir}/libgnunetats.so.4.0.0
 %{_libdir}/libgnunetblock.so.0
 %{_libdir}/libgnunetblock.so.0.0.0
 %{_libdir}/libgnunetblockgroup.so.0
@@ -487,6 +427,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunetconsensus.so.0.0.0
 %{_libdir}/libgnunetcore.so.0
 %{_libdir}/libgnunetcore.so.0.0.1
+%{_libdir}/libgnunetcoretesting.so.0
+%{_libdir}/libgnunetcoretesting.so.0.0.0
 %{_libdir}/libgnunetdatacache.so.0
 %{_libdir}/libgnunetdatacache.so.0.0.1
 %{_libdir}/libgnunetdatastore.so.1
@@ -497,10 +439,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunetdid.so.0.0.0
 %{_libdir}/libgnunetdns.so.0
 %{_libdir}/libgnunetdns.so.0.0.0
-%{_libdir}/libgnunetfragmentation.so.2
-%{_libdir}/libgnunetfragmentation.so.2.0.0
-%{_libdir}/libgnunetfriends.so.0
-%{_libdir}/libgnunetfriends.so.0.0.0
 %{_libdir}/libgnunetfs.so.2
 %{_libdir}/libgnunetfs.so.2.1.1
 %{_libdir}/libgnunetgns.so.0
@@ -517,16 +455,14 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunetnamecache.so.0.0.0
 %{_libdir}/libgnunetnamestore.so.0
 %{_libdir}/libgnunetnamestore.so.0.0.1
+%{_libdir}/libgnunetnat.so.2
+%{_libdir}/libgnunetnat.so.2.0.0
 %{_libdir}/libgnunetnatauto.so.0
 %{_libdir}/libgnunetnatauto.so.0.0.0
 %{_libdir}/libgnunetnatnew.so.2
 %{_libdir}/libgnunetnatnew.so.2.0.0
 %{_libdir}/libgnunetnse.so.0
 %{_libdir}/libgnunetnse.so.0.0.0
-%{_libdir}/libgnunetnt.so.0
-%{_libdir}/libgnunetnt.so.0.0.0
-%{_libdir}/libgnunetpeerinfo.so.0
-%{_libdir}/libgnunetpeerinfo.so.0.0.0
 %{_libdir}/libgnunetpeerstore.so.0
 %{_libdir}/libgnunetpeerstore.so.0.0.0
 %{_libdir}/libgnunetreclaim.so.0
@@ -547,14 +483,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunetsetu.so.0.0.0
 %{_libdir}/libgnunetstatistics.so.2
 %{_libdir}/libgnunetstatistics.so.2.0.0
-%{_libdir}/libgnunettestbed.so.0
-%{_libdir}/libgnunettestbed.so.0.0.0
-%{_libdir}/libgnunettestbedlogger.so.0
-%{_libdir}/libgnunettestbedlogger.so.0.0.0
 %{_libdir}/libgnunettesting.so.1
 %{_libdir}/libgnunettesting.so.1.1.0
-%{_libdir}/libgnunettransport.so.2
-%{_libdir}/libgnunettransport.so.2.2.0
 %{_libdir}/libgnunettransportapplication.so.0
 %{_libdir}/libgnunettransportapplication.so.0.0.0
 %{_libdir}/libgnunettransportcommunicator.so.0
@@ -563,8 +493,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunettransportcore.so.0.0.0
 %{_libdir}/libgnunettransportmonitor.so.0
 %{_libdir}/libgnunettransportmonitor.so.0.0.0
-%{_libdir}/libgnunettransporttesting.so.0
-%{_libdir}/libgnunettransporttesting.so.0.0.0
 %{_libdir}/libgnunettransporttesting2.so.0
 %{_libdir}/libgnunettransporttesting2.so.0.0.0
 %{_libdir}/libgnunetvpn.so.0
@@ -577,10 +505,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunettestingdhtu.so.0.0.0
 %{_datadir}/applications/gnunet-uri.desktop
 %dir %{_datadir}/%{name}
+%{_datadir}/%{name}/openssl.cnf
 %{_datadir}/%{name}/config.d/arm.conf
-%{_datadir}/%{name}/config.d/ats.conf
 %{_datadir}/%{name}/config.d/cadet.conf
-%{_datadir}/%{name}/config.d/communicator-unix.conf
 %{_datadir}/%{name}/config.d/consensus.conf
 %{_datadir}/%{name}/config.d/core.conf
 %{_datadir}/%{name}/config.d/datacache.conf
@@ -597,7 +524,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_datadir}/%{name}/config.d/nat-auto.conf
 %{_datadir}/%{name}/config.d/nat.conf
 %{_datadir}/%{name}/config.d/nse.conf
-%{_datadir}/%{name}/config.d/peerinfo.conf
 %{_datadir}/%{name}/config.d/peerstore.conf
 %{_datadir}/%{name}/config.d/pt.conf
 %{_datadir}/%{name}/config.d/reclaim.conf
@@ -610,9 +536,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_datadir}/%{name}/config.d/seti.conf
 %{_datadir}/%{name}/config.d/setu.conf
 %{_datadir}/%{name}/config.d/statistics.conf
-%{_datadir}/%{name}/config.d/template.conf
-%{_datadir}/%{name}/config.d/testbed-logger.conf
-%{_datadir}/%{name}/config.d/testbed.conf
 %{_datadir}/%{name}/config.d/testing.conf
 %{_datadir}/%{name}/config.d/topology.conf
 %{_datadir}/%{name}/config.d/transport.conf
@@ -622,9 +545,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_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}/gnunet-logo-dark-only-text.svg
 %{_datadir}/%{name}/gnunet-logo-dark-text.svg
 %{_datadir}/%{name}/netjail_core.sh
@@ -635,10 +555,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_datadir}/%{name}/gnunet-gns-proxy-ca.template
 %{_datadir}/%{name}/gnunet-logo.png
 %{_datadir}/%{name}/hellos/
-%exclude %{_datadir}/%{name}/services/
 %{_datadir}/%{name}/sql/
 %{_mandir}/man1/gnunet-arm.1.gz
-%{_mandir}/man1/gnunet-ats.1.gz
 %{_mandir}/man1/gnunet-auto-share.1.gz
 %{_mandir}/man1/gnunet-cadet.1.gz
 %{_mandir}/man1/gnunet-core.1.gz
@@ -658,7 +576,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_mandir}/man1/gnunet-identity.1.gz
 %{_mandir}/man1/gnunet-messenger.1.gz
 %{_mandir}/man1/gnunet-namecache.1.gz
-%{_mandir}/man1/gnunet-namestore-fcfsd.1.gz
 %{_mandir}/man1/gnunet-namestore.1.gz
 %{_mandir}/man1/gnunet-namestore-dbtool.1.gz
 %{_mandir}/man1/gnunet-namestore-zonefile.1.gz
@@ -666,7 +583,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_mandir}/man1/gnunet-nat-server.1.gz
 %{_mandir}/man1/gnunet-nat.1.gz
 %{_mandir}/man1/gnunet-nse.1.gz
-%{_mandir}/man1/gnunet-peerinfo.1.gz
 %{_mandir}/man1/gnunet-publish.1.gz
 %{_mandir}/man1/gnunet-qr.1.gz
 %{_mandir}/man1/gnunet-reclaim.1.gz
@@ -676,7 +592,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_mandir}/man1/gnunet-scrypt.1.gz
 %{_mandir}/man1/gnunet-search.1.gz
 %{_mandir}/man1/gnunet-statistics.1.gz
-%{_mandir}/man1/gnunet-testbed-profiler.1.gz
 %{_mandir}/man1/gnunet-testing.1.gz
 %{_mandir}/man1/gnunet-testing-run-service.1.gz
 %{_mandir}/man1/gnunet-timeout.1.gz
@@ -696,18 +611,16 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 
 %files devel
 %{_libdir}/libgnunetblockgroup.so
-%{_libdir}/libgnunetats.so
 %{_libdir}/libgnunetblock.so
 %{_libdir}/libgnunetcadet.so
 %{_libdir}/libgnunetconsensus.so
 %{_libdir}/libgnunetcore.so
+%{_libdir}/libgnunetcoretesting.so
 %{_libdir}/libgnunetdatacache.so
 %{_libdir}/libgnunetdatastore.so
 %{_libdir}/libgnunetdht.so
 %{_libdir}/libgnunetdid.so
 %{_libdir}/libgnunetdns.so
-%{_libdir}/libgnunetfragmentation.so
-%{_libdir}/libgnunetfriends.so
 %{_libdir}/libgnunetfs.so
 %{_libdir}/libgnunetgns.so
 %{_libdir}/libgnunetgnsrecord.so
@@ -716,11 +629,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunetidentity.so
 %{_libdir}/libgnunetnamecache.so
 %{_libdir}/libgnunetnamestore.so
+%{_libdir}/libgnunetnat.so
 %{_libdir}/libgnunetnatauto.so
 %{_libdir}/libgnunetnatnew.so
 %{_libdir}/libgnunetnse.so
-%{_libdir}/libgnunetnt.so
-%{_libdir}/libgnunetpeerinfo.so
 %{_libdir}/libgnunetpeerstore.so
 %{_libdir}/libgnunetreclaim.so
 %{_libdir}/libgnunetregex.so
@@ -731,25 +643,20 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunetseti.so
 %{_libdir}/libgnunetsetu.so
 %{_libdir}/libgnunetstatistics.so
-%{_libdir}/libgnunettestbed.so
-%{_libdir}/libgnunettestbedlogger.so
 %{_libdir}/libgnunettesting.so
-%{_libdir}/libgnunettransport.so
 %{_libdir}/libgnunettransportapplication.so
 %{_libdir}/libgnunettransportcommunicator.so
 %{_libdir}/libgnunettransportmonitor.so
 %{_libdir}/libgnunettransportcore.so
-%{_libdir}/libgnunettransporttesting.so
 %{_libdir}/libgnunettransporttesting2.so
 %{_libdir}/libgnunetvpn.so
 %{_libdir}/libgnunetmessenger.so
 %{_libdir}/libgnunetscalarproduct.so
 %{_libdir}/libgnunettestingdhtu.so
+%{_libdir}/libnss_gns.so
+%{_libdir}/libnss_gns4.so
+%{_libdir}/libnss_gns6.so
 %{_includedir}/%{name}/gnunet_abd_service.h
-%{_includedir}/%{name}/gnunet_ats_application_service.h
-%{_includedir}/%{name}/gnunet_ats_plugin.h
-%{_includedir}/%{name}/gnunet_ats_service.h
-%{_includedir}/%{name}/gnunet_ats_transport_service.h
 %{_includedir}/%{name}/gnunet_block_group_lib.h
 %{_includedir}/%{name}/gnunet_block_lib.h
 %{_includedir}/%{name}/gnunet_block_plugin.h
@@ -763,14 +670,11 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_includedir}/%{name}/gnunet_dht_service.h
 %{_includedir}/%{name}/gnunet_dht_block_types.h
 %{_includedir}/%{name}/gnunet_dns_service.h
-%{_includedir}/%{name}/gnunet_fragmentation_lib.h
-%{_includedir}/%{name}/gnunet_friends_lib.h
 %{_includedir}/%{name}/gnunet_fs_service.h
 %{_includedir}/%{name}/gnunet_gns_service.h
 %{_includedir}/%{name}/gnunet_gnsrecord_lib.h
 %{_includedir}/%{name}/gnunet_gnsrecord_plugin.h
 %{_includedir}/%{name}/gnunet_gnsrecord_json_lib.h
-%{_includedir}/%{name}/gnunet_hello_lib.h
 %{_includedir}/%{name}/gnunet_identity_service.h
 %{_includedir}/%{name}/gnunet_messenger_service.h
 %{_includedir}/%{name}/gnunet_namecache_plugin.h
@@ -781,7 +685,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_includedir}/%{name}/gnunet_nat_service.h
 %{_includedir}/%{name}/gnunet_nse_service.h
 %{_includedir}/%{name}/gnunet_nt_lib.h
-%{_includedir}/%{name}/gnunet_peerinfo_service.h
 %{_includedir}/%{name}/gnunet_peerstore_plugin.h
 %{_includedir}/%{name}/gnunet_peerstore_service.h
 %{_includedir}/%{name}/gnunet_reclaim_lib.h
@@ -800,26 +703,21 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_includedir}/%{name}/gnunet_signatures.h
 %{_includedir}/%{name}/gnunet_socks.h
 %{_includedir}/%{name}/gnunet_statistics_service.h
-%{_includedir}/%{name}/gnunet_testbed_logger_service.h
-%{_includedir}/%{name}/gnunet_testbed_service.h
 %{_includedir}/%{name}/gnunet_testing_lib.h
 %{_includedir}/%{name}/gnunet_transport_application_service.h
 %{_includedir}/%{name}/gnunet_transport_communication_service.h
 %{_includedir}/%{name}/gnunet_transport_core_service.h
-%{_includedir}/%{name}/gnunet_transport_hello_service.h
-%{_includedir}/%{name}/gnunet_transport_manipulation_service.h
 %{_includedir}/%{name}/gnunet_transport_monitor_service.h
-%{_includedir}/%{name}/gnunet_transport_plugin.h
-%{_includedir}/%{name}/gnunet_transport_service.h
 %{_includedir}/%{name}/gnunet_vpn_service.h
 %{_includedir}/%{name}/gnunet_dhtu_plugin.h
 %{_includedir}/%{name}/gnunet_hello_uri_lib.h
 %{_includedir}/%{name}/gnunet_testing_netjail_lib.h
 %{_includedir}/%{name}/gnunet_testing_plugin.h
 %{_includedir}/%{name}/gnu_name_system_record_types.h
+%{_includedir}/%{name}/gnu_name_system_protocols.h
+%{_includedir}/%{name}/gnu_name_system_service_ports.h
 %{_includedir}/%{name}/gnunet_scalarproduct_service.h
 %{_includedir}/%{name}/gnunet_testing_ng_lib.h
-%{_libdir}/pkgconfig/gnunetats.pc
 %{_libdir}/pkgconfig/gnunetblock.pc
 %{_libdir}/pkgconfig/gnunetcadet.pc
 %{_libdir}/pkgconfig/gnunetconsensus.pc
@@ -827,29 +725,38 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/pkgconfig/gnunetdatacache.pc
 %{_libdir}/pkgconfig/gnunetdatastore.pc
 %{_libdir}/pkgconfig/gnunetdht.pc
+%{_libdir}/pkgconfig/gnunetdid.pc
 %{_libdir}/pkgconfig/gnunetdns.pc
-%{_libdir}/pkgconfig/gnunetenv.pc
-%{_libdir}/pkgconfig/gnunetfragmentation.pc
 %{_libdir}/pkgconfig/gnunetfs.pc
 %{_libdir}/pkgconfig/gnunetgns.pc
 %{_libdir}/pkgconfig/gnunethello.pc
 %{_libdir}/pkgconfig/gnunetidentity.pc
+%{_libdir}/pkgconfig/gnunetjson.pc
 %{_libdir}/pkgconfig/gnunetmessenger.pc
 %{_libdir}/pkgconfig/gnunetnamestore.pc
 %{_libdir}/pkgconfig/gnunetnat.pc
 %{_libdir}/pkgconfig/gnunetnse.pc
-%{_libdir}/pkgconfig/gnunetpeerinfo.pc
 %{_libdir}/pkgconfig/gnunetregex.pc
 %{_libdir}/pkgconfig/gnunetrevocation.pc
-%{_libdir}/pkgconfig/gnunetrps.pc
 %{_libdir}/pkgconfig/gnunetset.pc
 %{_libdir}/pkgconfig/gnunetstatistics.pc
-%{_libdir}/pkgconfig/gnunettestbed.pc
 %{_libdir}/pkgconfig/gnunettesting.pc
-%{_libdir}/pkgconfig/gnunettransport.pc
 %{_libdir}/pkgconfig/gnunetutil.pc
 %{_libdir}/pkgconfig/gnunetvpn.pc
 %{_libdir}/pkgconfig/gnunetscalarproduct.pc
+%{_libdir}/pkgconfig/gnunetgnsrecord.pc
+%{_libdir}/pkgconfig/gnunetnamecache.pc
+%{_libdir}/pkgconfig/gnunetpeerstore.pc
+%{_libdir}/pkgconfig/gnunetreclaim.pc
+%{_libdir}/pkgconfig/gnunetrest.pc
+%{_libdir}/pkgconfig/gnunetsecretsharing.pc
+%{_libdir}/pkgconfig/gnunetseti.pc
+%{_libdir}/pkgconfig/gnunetsetu.pc
+%{_libdir}/pkgconfig/gnunetsq.pc
+%{_libdir}/pkgconfig/gnunettransportapplication.pc
+%{_libdir}/pkgconfig/gnunettransportcommunicator.pc
+%{_libdir}/pkgconfig/gnunettransportcore.pc
+%{_libdir}/pkgconfig/gnunettransportmonitor.pc
 
 %files -n libgnunetpq
 %{_libdir}/libgnunetpq.so.4
@@ -866,23 +773,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/%{name}/libgnunet_plugin_namecache_postgres.so
 %{_libdir}/%{name}/libgnunet_plugin_namestore_postgres.so
 
-%files -n libgnunetmy
-%{_libdir}/libgnunetmy.so.0
-%{_libdir}/libgnunetmy.so.0.0.0
-%{_libdir}/libgnunetmysql.so.0
-%{_libdir}/libgnunetmysql.so.0.0.0
-
-%files mysql-plugins
-%{_libdir}/%{name}/libgnunet_plugin_datastore_mysql.so
-
-%files -n libgnunetmy-devel
-%{_libdir}/libgnunetmy.so
-%{_libdir}/libgnunetmysql.so
-%{_libdir}/pkgconfig/gnunetmysql.pc
-%{_includedir}/%{name}/gnunet_my_lib.h
-%{_includedir}/%{name}/gnunet_mysql_lib.h
-%{_includedir}/%{name}/gnunet_mysql_compat.h
-
 %files conversation
 %{_bindir}/gnunet-conversation
 %{_bindir}/gnunet-conversation-test