simplify and update

1 files changed, 78 insertions, 241 deletions

diff --git a/rpmbuild/SPECS/gnunet-fedora.spec b/rpmbuild/SPECS/gnunet-fedora.spec
index c38be6a..0fab732 100644
--- a/rpmbuild/SPECS/gnunet-fedora.spec
+++ b/rpmbuild/SPECS/gnunet-fedora.spec
@@ -1,9 +1,9 @@
 %define gnunetuser gnunet
 %define gnunethome %{_sharedstatedir}/%{name}
-
+%global debug_package %{nil}
 
 Name:           gnunet
-Version:        0.13.0
+Version:        0.14.0
 %if %{defined suse_version}
 Release:        1~%{?suse_version}
 %else
@@ -15,7 +15,7 @@ Group:          Productivity/Networking/File-Sharling
 URL:            https://%{name}.org
 %undefine _disable_source_fetch
 Source0:        https://ftpmirror.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-%define         SHA512SUM0 5cc81d61b1715c34457cc457f82dc60f55fc751fca58b3f4121920366f2f0129e3d52e6ffd2757456c63e14166c82d2e9b351b0e5e9d5ec2a21e8675c32bd7dc
+%define         SHA512SUM0 422637e8f4343a291a8dedf9d4669f5f75b7b6f614d9dde1a5bfcc1565cce25bbb5ef0f8c3cbfca1753b04176b460431545982e6805dc4bb99191c51d6455f4d
 BuildRequires:  libtool
 BuildRequires:  libtool-ltdl
 BuildRequires:  libtool-ltdl-devel
@@ -28,12 +28,12 @@ BuildRequires:  openssl
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libunistring-devel
 BuildRequires:  miniupnpc
-BuildRequires:  libidn-devel
+BuildRequires:  libidn2-devel
 BuildRequires:  zlib-devel
-#BuildRequires:  libglpk40
+BuildRequires:  libpq-devel
 BuildRequires:  jansson-devel
 BuildRequires:  gnutls-devel
-BuildRequires:  libsqlite3x
+BuildRequires:  sqlite-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  opus-devel
 BuildRequires:  pulseaudio-libs
@@ -44,11 +44,9 @@ BuildRequires:  gnutls-dane
 BuildRequires:  glibc
 BuildRequires:  pkgconf
 BuildRequires:  libgsf
-##BuildRequires:  libltdl7
-BuildRequires:  chrpath
 BuildRequires:  pkgconfig
-#BuildRequires:  gstreamer
-#BuildRequires:  libextractor-devel
+#BuildRequires:  gstreamer-devel
+BuildRequires:  libextractor-devel
 BuildRequires:  python3
 BuildRequires:  libcurl
 BuildRequires:  dbus
@@ -63,9 +61,6 @@ Requires:	bluez
 Requires:       dbus
 Requires:       authselect
 
-#BuildRoot:     %{_buildrootdir}
-#BuildRoot:     %{buildroot}/%{name}-%{version}-%{release}
-
 # Build with the following syntax:
 # rpmbuild --target noarch -bs gnunet.spec
 
@@ -95,164 +90,20 @@ Online documentation is provided at
 %prep
 echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
 
-%setup 
+%setup
 
 %build
-#%configure 
-#%configure --disable-rpath 
-./configure --prefix=/%{_prefix} --libdir=/%{_lib} --disable-rpath --disable-static
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make clean
-%{make_build} 
+%configure
+%{make_build}
 
 %pre
-/usr/sbin/groupadd -r %{name}
-/usr/sbin/groupadd -r %{name}dns
-mkdir -p %{_sharedstatedir}/%{name}
-/usr/sbin/useradd -r -g %{name} -G %{name}dns -m --base-dir %{gnunethome}  %{gnunetuser} || true
+getent group %{name}dns >/dev/null || /usr/sbin/groupadd -r %{name}
+getent group %{name}dns >/dev/null || /usr/sbin/groupadd -r %{name}dns
+getent passwd %{name} >/dev/null || useradd -r -g %{name} -G %{name}dns -m -d %{gnunethome} %{gnunetuser} -c "GNUnet system account"
+exit 0
 
 %install
-#find %{buildroot} -type f -name '*.la' -delete
-rm -rf $RPM_BUILD_ROOT
-mkdir -p %{buildroot}/%{_sharedstatedir}/%{name}
-mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
-cp -r %{_builddir}/* %{buildroot}/
-#mkdir -p %{buildroot}/%{_datadir}/%{name}
-#mkdir -p %{buildroot}/%{_datadir}/%{name}/config.d
-#mkdir -p %{buildroot}/%{_oldincludedir}/%{name}
-#mkdir -p %{buildroot}/%{_libdir}/%{name}
-#mkdir -p %{buildroot}/%{_libdir}/%{name}/libexec
-#mkdir -p %{buildroot}/%{_libdir}/%{name}/nss
-#mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
-#%configure --prefix=%{buildroot}
-#%{make_install} PREFIX=%{_prefix} INSTALL=%{__install}
-##%{make_build}
-#make clean
-#mkdir -p %{buildroot}/{%_libdir}
-#mkdir -p %{buildroot}/{%_libdir}/%{name}
-#./configure --disable-rpath --disable-static
-%{make_install} 
-#mkdir -p %{buildroot}/%{_datadir}/locale
-autoreconf
-#mkdir -p %{buildroot}/%{_datadir}/locale/de/LC_MESSAGES/
-#mkdir -p %{buildroot}/%{_datadir}/locale/es/LC_MESSAGES/
-#mkdir -p %{buildroot}/%{_datadir}/locale/fr/LC_MESSAGES/
-#mkdir -p %{buildroot}/%{_datadir}/locale/it/LC_MESSAGES/
-#mkdir -p %{buildroot}/%{_datadir}/locale/sv/LC_MESSAGES/
-#mkdir -p %{buildroot}/%{_datadir}/locale/vi/LC_MESSAGES/
-#mkdir -p %{buildroot}/%{_datadir}/locale/zh_CN/LC_MESSAGES/
-##make install DESTDIR=%{buildroot} PREFIX=%{_prefix} INSTALL=%{__install}
-# BINDIR=%{buildroot}/%{_bindir}
-#make install DESTDIR=$RPM_BUILD_ROOT
-find %{buildroot} -type f | xargs sed -i "s|%{buildroot}||g"
-####libtool --finish %{buildroot}/%{_libdir}
-#mv %{buildroot}/%{_libdir}/libgnunetnt.la %{buildroot}/local/lib/libgnunetnt.la
-libtool --finish %{buildroot}/%{_libdir}
-libtool --finish %{buildroot}/%{_libdir}/%{name}
-libtool --finish %{buildroot}/%{_libdir}/%{name}/nss
-#libtool --finish %{buildroot}/%{_libdir}/pkconfig
-#libtool --finish %{buildroot}/%{_usr}/local/lib
-#libtool --finish %{buildroot}/%{_usr}/local/lib/%{name}
-mv %{buildroot}/%{buildroot}/share/* %{buildroot}/%{_datadir}/
-rm -rf %{buildroot}/%{buildroot}
-rm -rf %{buildroot}/%{name}-%{version}
-#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*
-#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/${name}/*
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetconsensus.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetvpn.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetblockgroup.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunethello.so.0.1.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettransportcommunicator.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetfs.so.2.1.1 
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettransportcore.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetjson.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetnse.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetregex.so.3.0.1
-#chrpath --delete %{buildroot}/%{_libdir}/libgnunetcore.so.0.0.1
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetpeerinfo.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetnt.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettesting.so.1.1.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetreclaim.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetcadet.so.7.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetarm.so.2.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetdht.so.3.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettestbed.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetdatastore.so.1.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettransportmonitor.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetrevocation.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetats.so.4.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettransporttesting.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetfriends.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetnamestore.so.0.0.1
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetdatacache.so.0.0.1
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettransportapplication.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetnatnew.so.2.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetblock.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetfs.so.2.1.1
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetdns.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetscalarproduct.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetsq.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetfragmentation.so.2.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetregexblock.so.1.0.0
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_gns.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_regex.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_datacache_sqlite.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_datastore_sqlite.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_fs.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_dns.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_peerinfo.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_gns.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_gns.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_datacache_heap.so 
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_dns.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_reclaim_attribute_gnuid.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_namestore.so 
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_copying.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_test.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_transport_https_server.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_consensus.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_set_test.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_dht.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_datastore_heap.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_reclaim.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_namecache_sqlite.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_namestore_sqlite.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_ats_proportional.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_revocation.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_transport_unix.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_config.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_openid_connect.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_peerstore_sqlite.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_transport_http_server.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_namestore_flat.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_reclaim.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_transport_tcp.so
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_identity.so
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetidentity.so.1.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettransport.so.2.2.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettransporttesting2.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetnatauto.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetpeerstore.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetatstesting.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetgns.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunettestbedlogger.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetset.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetrest.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetreclaimattribute.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetnamecache.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetstatistics.so.2.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetgnsrecord.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetsecretsharing.so.0.0.0
-#chrpath --delete %{buildroot}/gnunet-0.11.8/src/core/.libs/libgnunetcore.so.0.0.1
-#chrpath --delete %{buildroot}/usr/lib64/libgnunetspeaker.so.0.0.0
-#chrpath --delete %{buildroot}/usr/lib64/libgnunetmy.so.0.0.0
-chrpath --delete %{buildroot}/%{_libdir}/libgnunetcore.so.0.0.1
-#chrpath --delete %{buildroot}/usr/lib64/libgnunetconversation.so.0.0.0
-#chrpath --delete %{buildroot}/usr/lib64/gnunet/libgnunet_plugin_datastore_mysql.so
-#chrpath --delete %{buildroot}/usr/lib64/gnunet/libgnunet_plugin_gnsrecord_conversation.so
-#chrpath --delete %{buildroot}/usr/lib64/libgnunetmysql.so.0.0.0
-#chrpath --delete %{buildroot}/usr/lib64/libgnunetmicrophone.so.0.0.0
+make install DESTDIR=%{buildroot}
 
 %check
 #make check
@@ -269,46 +120,6 @@ authselect select -f sssd
 touch /%{_sysconfdir}/authselect/user-nsswitch.conf
 awk -i inplace '/hosts:      files/ && !x {print "hosts:      files gns [NOTFOUND=return] dns mdns4_minimal mdns4"; x=1} 1' /%{_sysconfdir}/authselect/user-nsswitch.conf
 authselect apply-changes
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/dir --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/gnunet-tutorial.info.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/gnunet.info-1.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/gnunet.info-2.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/gnunet.info-3.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/gnunet.info.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/daemon_lego_block.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/daemon_lego_block.svg.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gns.dot.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gns.jpg.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-0-10-peerinfo.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-fs-gtk-0-10-star-tab.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-download-area.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs-menu.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs-publish-editing.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs-publish-select.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file_0.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs-publish.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs-published.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs-search.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-fs.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-gns-a-done.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-gns-a.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-gns.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-identity.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-search-selected.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-gtk-0-10-traffic.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-namestore-gtk-phone.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-namestore-gtk-vpn.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-setup-exit.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-tutorial-service.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/gnunet-tutorial-system.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/iceweasel-preferences.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/iceweasel-proxy.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/lego_stack.svg.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/service_lego_block.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/service_lego_block.svg.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/service_stack.png.gz --section="gnunet"
-/usr/sbin/install-info --dir-file=%{_infodir}/dir --entry= %{_infodir}/images/structure.dot.gz --section="gnunet"
 
 %clean
 
@@ -316,11 +127,9 @@ authselect apply-changes
 
 %files
 %attr(0700, %{gnunetuser}, %{gnunetuser})
-%dir %{gnunethome}
 %license %{_datadir}/%{name}/LICENSE
 %doc %{_defaultdocdir}/%{name}/COPYING
 %doc doc AUTHORS ChangeLog NEWS README
-#%config(noreplace) %{_sysconfdir}/gnunet.conf
 %{_bindir}/gnunet-ats
 %{_bindir}/gnunet-arm
 %{_bindir}/gnunet-auto-share
@@ -329,8 +138,6 @@ authselect apply-changes
 %{_bindir}/gnunet-cadet
 %{_bindir}/gnunet-config
 %{_bindir}/gnunet-consensus-profiler
-#%{_bindir}/gnunet-conversation
-#%{_bindir}/gnunet-conversation-test
 %{_bindir}/gnunet-core
 %{_bindir}/gnunet-datastore
 %{_bindir}/gnunet-dht-get
@@ -370,6 +177,11 @@ authselect apply-changes
 %{_bindir}/gnunet-uri
 %{_bindir}/gnunet-vpn
 %{_bindir}/gnunet-zoneimport
+%{_bindir}/gnunet-crypto-tvg
+%{_bindir}/gnunet-gnsrecord-tvg
+%{_bindir}/gnunet-revocation-tvg
+%{_bindir}/gnunet-seti-profiler
+%{_bindir}/gnunet-setu-profiler
 %dir %{_oldincludedir}/%{name}
 %{_oldincludedir}/%{name}/compat.h
 %{_oldincludedir}/%{name}/gettext.h
@@ -386,6 +198,7 @@ authselect apply-changes
 %{_oldincludedir}/%{name}/gnunet_block_group_lib.h
 %{_oldincludedir}/%{name}/gnunet_block_lib.h
 %{_oldincludedir}/%{name}/gnunet_block_plugin.h
+%{_oldincludedir}/%{name}/gnunet_buffer_lib.h
 %{_oldincludedir}/%{name}/gnunet_cadet_service.h
 %{_oldincludedir}/%{name}/gnunet_client_lib.h
 %{_oldincludedir}/%{name}/gnunet_common.h
@@ -415,11 +228,14 @@ authselect apply-changes
 %{_oldincludedir}/%{name}/gnunet_gns_service.h
 %{_oldincludedir}/%{name}/gnunet_gnsrecord_lib.h
 %{_oldincludedir}/%{name}/gnunet_gnsrecord_plugin.h
+%{_oldincludedir}/%{name}/gnunet_gnsrecord_json_lib.h
 %{_oldincludedir}/%{name}/gnunet_hello_lib.h
 %{_oldincludedir}/%{name}/gnunet_helper_lib.h
 %{_oldincludedir}/%{name}/gnunet_identity_service.h
 %{_oldincludedir}/%{name}/gnunet_json_lib.h
 %{_oldincludedir}/%{name}/gnunet_load_lib.h
+%{_oldincludedir}/%{name}/gnunet_messenger_service.h
+%{_oldincludedir}/%{name}/gnunet_mhd_compat.h
 %{_oldincludedir}/%{name}/gnunet_microphone_lib.h
 %{_oldincludedir}/%{name}/gnunet_mq_lib.h
 %{_oldincludedir}/%{name}/gnunet_mst_lib.h
@@ -445,8 +261,8 @@ authselect apply-changes
 %{_oldincludedir}/%{name}/gnunet_pq_lib.h
 %{_oldincludedir}/%{name}/gnunet_program_lib.h
 %{_oldincludedir}/%{name}/gnunet_protocols.h
-%{_oldincludedir}/%{name}/gnunet_reclaim_attribute_lib.h
-%{_oldincludedir}/%{name}/gnunet_reclaim_attribute_plugin.h
+%{_oldincludedir}/%{name}/gnunet_reclaim_lib.h
+%{_oldincludedir}/%{name}/gnunet_reclaim_plugin.h
 %{_oldincludedir}/%{name}/gnunet_reclaim_service.h
 %{_oldincludedir}/%{name}/gnunet_regex_service.h
 %{_oldincludedir}/%{name}/gnunet_resolver_service.h
@@ -459,6 +275,8 @@ authselect apply-changes
 %{_oldincludedir}/%{name}/gnunet_secretsharing_service.h
 %{_oldincludedir}/%{name}/gnunet_service_lib.h
 %{_oldincludedir}/%{name}/gnunet_set_service.h
+%{_oldincludedir}/%{name}/gnunet_seti_service.h
+%{_oldincludedir}/%{name}/gnunet_setu_service.h
 %{_oldincludedir}/%{name}/gnunet_signal_lib.h
 %{_oldincludedir}/%{name}/gnunet_signatures.h
 %{_oldincludedir}/%{name}/gnunet_socks.h
@@ -479,10 +297,10 @@ authselect apply-changes
 %{_oldincludedir}/%{name}/gnunet_transport_plugin.h
 %{_oldincludedir}/%{name}/gnunet_transport_service.h
 %{_oldincludedir}/%{name}/gnunet_tun_lib.h
+%{_oldincludedir}/%{name}/gnunet_uri_lib.h
 %{_oldincludedir}/%{name}/gnunet_util_lib.h
 %{_oldincludedir}/%{name}/gnunet_vpn_service.h
 %{_oldincludedir}/%{name}/platform.h
-#%dir %{_libdir}
 /%{_libdir}/pkgconfig/gnunetarm.pc
 /%{_libdir}/pkgconfig/gnunetats.pc
 /%{_libdir}/pkgconfig/gnunetblock.pc
@@ -523,6 +341,7 @@ authselect apply-changes
 /%{_libdir}/%{name}/libexec/gnunet-communicator-udp
 /%{_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
@@ -530,8 +349,6 @@ authselect apply-changes
 /%{_libdir}/%{name}/libexec/gnunet-daemon-testbed-underlay
 /%{_libdir}/%{name}/libexec/gnunet-daemon-topology
 /%{_libdir}/%{name}/libexec/gnunet-dns2gns
-#/%{_libdir}/%{name}/libexec/gnunet-helper-audio-playback
-#/%{_libdir}/%{name}/libexec/gnunet-helper-audio-record
 /%{_libdir}/%{name}/libexec/gnunet-helper-dns
 /%{_libdir}/%{name}/libexec/gnunet-helper-exit
 /%{_libdir}/%{name}/libexec/gnunet-helper-fs-publish
@@ -539,13 +356,13 @@ authselect apply-changes
 /%{_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-conversation
 /%{_libdir}/%{name}/libexec/gnunet-service-core
 /%{_libdir}/%{name}/libexec/gnunet-service-datastore
 /%{_libdir}/%{name}/libexec/gnunet-service-dht
@@ -571,6 +388,8 @@ authselect apply-changes
 /%{_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
+/%{_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
@@ -598,18 +417,24 @@ authselect apply-changes
 /%{_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_datacache_postgres.la
+/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_postgres.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_conversation.la
-#/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_conversation.so
+/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_postgres.la
+/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_postgres.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
@@ -618,14 +443,20 @@ authselect apply-changes
 /%{_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_namecache_postgres.la
+/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_postgres.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_namestore_postgres.la
+/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_postgres.so
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_peerstore_sqlite.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_peerstore_sqlite.so
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_reclaim_attribute_gnuid.la
-/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_reclaim_attribute_gnuid.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
@@ -648,10 +479,12 @@ authselect apply-changes
 /%{_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_udp.la
-#/%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_udp.so
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_unix.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_unix.so
 %dir %{_libdir}/%{name}/nss
@@ -689,14 +522,14 @@ authselect apply-changes
 %{_libdir}/libgnunetconsensus.so
 %{_libdir}/libgnunetconsensus.so.0
 %{_libdir}/libgnunetconsensus.so.0.0.0
-#%{_libdir}/libgnunetconversation.la
-#%{_libdir}/libgnunetconversation.so
-#%{_libdir}/libgnunetconversation.so.0
-#%{_libdir}/libgnunetconversation.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
@@ -733,6 +566,10 @@ authselect apply-changes
 %{_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
@@ -745,10 +582,6 @@ authselect apply-changes
 %{_libdir}/libgnunetjson.so
 %{_libdir}/libgnunetjson.so.0
 %{_libdir}/libgnunetjson.so.0.0.0
-#%{_libdir}/libgnunetmicrophone.la
-#%{_libdir}/libgnunetmicrophone.so
-#%{_libdir}/libgnunetmicrophone.so.0
-#%{_libdir}/libgnunetmicrophone.so.0.0.0
 %{_libdir}/libgnunetnamecache.la
 %{_libdir}/libgnunetnamecache.so
 %{_libdir}/libgnunetnamecache.so.0
@@ -781,14 +614,14 @@ authselect apply-changes
 %{_libdir}/libgnunetpeerstore.so
 %{_libdir}/libgnunetpeerstore.so.0
 %{_libdir}/libgnunetpeerstore.so.0.0.0
+%{_libdir}/libgnunetpq.la
+%{_libdir}/libgnunetpq.so
+%{_libdir}/libgnunetpq.so.1
+%{_libdir}/libgnunetpq.so.1.0.0
 %{_libdir}/libgnunetreclaim.la
 %{_libdir}/libgnunetreclaim.so
 %{_libdir}/libgnunetreclaim.so.0
 %{_libdir}/libgnunetreclaim.so.0.0.0
-%{_libdir}/libgnunetreclaimattribute.la
-%{_libdir}/libgnunetreclaimattribute.so
-%{_libdir}/libgnunetreclaimattribute.so.0
-%{_libdir}/libgnunetreclaimattribute.so.0.0.0
 %{_libdir}/libgnunetregex.la
 %{_libdir}/libgnunetregex.so
 %{_libdir}/libgnunetregex.so.3
@@ -817,10 +650,14 @@ authselect apply-changes
 %{_libdir}/libgnunetset.so
 %{_libdir}/libgnunetset.so.0
 %{_libdir}/libgnunetset.so.0.0.0
-#%{_libdir}/libgnunetspeaker.la
-#%{_libdir}/libgnunetspeaker.so
-#%{_libdir}/libgnunetspeaker.so.0
-#%{_libdir}/libgnunetspeaker.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
@@ -877,15 +714,12 @@ authselect apply-changes
 %{_libdir}/libgnunetvpn.so
 %{_libdir}/libgnunetvpn.so.0
 %{_libdir}/libgnunetvpn.so.0.0.0
-#%doc %{_datadir}/doc/%{name}
-#/usr/share/doc/%{name}/README
 %dir %{_datadir}/%{name}/config.d
 %{_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/conversation.conf
 %{_datadir}/%{name}/config.d/core.conf
 %{_datadir}/%{name}/config.d/datacache.conf
 %{_datadir}/%{name}/config.d/datastore.conf
@@ -894,6 +728,7 @@ authselect apply-changes
 %{_datadir}/%{name}/config.d/exit.conf
 %{_datadir}/%{name}/config.d/fs.conf
 %{_datadir}/%{name}/config.d/gns.conf
+%{_datadir}/%{name}/config.d/hostlist.conf
 %{_datadir}/%{name}/config.d/identity.conf
 %{_datadir}/%{name}/config.d/namecache.conf
 %{_datadir}/%{name}/config.d/namestore.conf
@@ -911,6 +746,8 @@ authselect apply-changes
 %{_datadir}/%{name}/config.d/scalarproduct.conf
 %{_datadir}/%{name}/config.d/secretsharing.conf
 %{_datadir}/%{name}/config.d/set.conf
+%{_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
@@ -945,6 +782,7 @@ authselect apply-changes
 %{_datadir}/locale/es/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/fr/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/it/LC_MESSAGES/gnunet.mo
+%{_datadir}/locale/sr/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/sv/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/vi/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/zh_CN/LC_MESSAGES/gnunet.mo
@@ -997,7 +835,6 @@ authselect apply-changes
 %{_mandir}/man1/gnunet-bugreport.1.gz
 %{_bindir}/gnunet-suidfix
 %{_infodir}/dir
-%{_infodir}/gnunet-tutorial.info.gz
 %{_infodir}/gnunet.info-1.gz
 %{_infodir}/gnunet.info-2.gz
 %{_infodir}/gnunet.info-3.gz