Merge branch 'master' into subpkg-merge

4 files changed, 187 insertions, 215 deletions

diff --git a/.copr/Makefile b/.copr/Makefile
index 963a194..386059e 100644
--- a/.copr/Makefile
+++ b/.copr/Makefile
@@ -1,8 +1,11 @@
+outdir          ?= $(pwd)
 srpm:
         dnf -y install libtool libtool-ltdl libtool-ltdl-devel autoconf make \
-                        texinfo gettext gcc openssl libgcrypt-devel \
-                        libunistring-devel miniupnpc libidn-devel zlib-devel \
-                        jansson-devel gnutls-devel libsqlite3x \
-                        libmicrohttpd-devel opus-devel libogg-devel sqlite-devel \
-                        zbar-devel gnutls-dane glibc pkgconf libgsf chrpath
-        rpmbuild -ba gnunet-fedora.spec
+                        texinfo gettext gcc openssl libgcrypt-devel libcurl-devel \
+                        libpq-devel libextractor-devel \
+                        libunistring-devel miniupnpc libidn2-devel zlib-devel \
+                        jansson-devel gnutls-devel sqlite-devel \
+                        libmicrohttpd-devel opus-devel libogg-devel \
+                        dbus authselect pulseaudio-libs sqlite-devel \
+                        zbar-devel gnutls-dane glibc pkgconf libgsf
+        rpmbuild SPECS/gnunet-fedora.spec --bs --define "_srcrpmdir $(outdir)"
diff --git a/README.md b/README.md
index 9725e6c..e8c7039 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Packaging GNUnet for RPM #
 
-Work is currently being done in the [subpkg](https://git.callpipe.com/gnunet-wip/gnunet-rpm/tree/subpkg) branch.
+Work is currently being done on a [Fedora package](https://git.gnunet.org/gnunet-rpm.git/tree/rpmbuild/SPECS/gnunet-fedora.spec).
 
 ## Resources ##
 
diff --git a/description b/description
new file mode 100644
index 0000000..17f92b3
--- /dev/null
+++ b/description
@@ -0,0 +1 @@
+GNUnet package for RPM-based distros (Fedora, openSUSE)
diff --git a/rpmbuild/SPECS/gnunet-fedora.spec b/rpmbuild/SPECS/gnunet-fedora.spec
index ec50eb9..7cece65 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.12.2
+Version:        0.14.0
 %if %{defined suse_version}
 Release:        1~%{?suse_version}
 %else
@@ -15,8 +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 bcdcd9452a905dcc0c474517f2941ae5822bda23e918c4ba5d61d085016d69eba5b1477bb30cf8179a6d6290898ea23ec485e3f1acfb3cf4ed0979ce8054af7e
-%define         SHA512SUM0 210a9f06679d32dbb399a056e7a20e411cbfacf7945a282bd7e63eb8bfd7a324815efc48caedff32894d0a3f7a4ba9d1e879e2e04db0222282399ae6fc065c7b
+%define         SHA512SUM0 422637e8f4343a291a8dedf9d4669f5f75b7b6f614d9dde1a5bfcc1565cce25bbb5ef0f8c3cbfca1753b04176b460431545982e6805dc4bb99191c51d6455f4d
 BuildRequires:  libtool
 BuildRequires:  libtool-ltdl
 BuildRequires:  libtool-ltdl-devel
@@ -29,15 +28,15 @@ 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:  pulse-devel
+BuildRequires:  pulseaudio-libs
 BuildRequires:  libogg-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  zbar-devel
@@ -45,14 +44,25 @@ BuildRequires:  gnutls-dane
 BuildRequires:  glibc
 BuildRequires:  pkgconf
 BuildRequires:  libgsf
-##BuildRequires:  libltdl7
-BuildRequires:  chrpath
 BuildRequires:  pkgconfig
-# The following package required adding a repo to Tumbleweed:
-#BuildRequires:  libextractor
-#Requires:
-#BuildRoot:     %{buildroot}/%{name}-%{version}-%{release}
-#BuildRoot:     %{_buildrootdir}
+#Conversation requires gstreamer-app-1.0 and gstreamer-audio-1.0
+BuildRequires:  gstreamer1-plugins-base-devel
+BuildRequires:  libextractor-devel
+BuildRequires:  python3
+BuildRequires:  libcurl-devel
+BuildRequires:  dbus
+BuildRequires:  libsodium-devel
+BuildRequires:  mariadb-devel
+Requires:       libextractor
+Requires: openssl
+Requires: nss-util
+Requires: gnutls
+Requires:       curl
+Requires:       net-tools
+Requires:       iptables
+Requires:       miniupnpc
+Requires:       dbus
+Requires:       authselect
 
 # Build with the following syntax:
 # rpmbuild --target noarch -bs gnunet.spec
@@ -80,183 +90,76 @@ https://gnunet.org/ and in the 'doc/' folder.
 Online documentation is provided at
 'https://docs.gnunet.org' and 'https://tutorial.gnunet.org'.
 
+# The 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 postgresql 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.
+
+# The conversation functionality
+%package conversation
+Requires: gnunet
+Summary: The GNUnet CONVERSATION VoP2P component.
+%description conversation
+The GNUnet CONVERSATION component. Allows you to make Voice-over-Peer-to-Peer
+audio calls.
+
 %prep
 echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
 
-%setup 
+%setup
 
 %build
-#%configure 
-#%configure --disable-rpath 
-#--prefix=%{_prefix}
-./configure --prefix=/usr --libdir=/lib64 --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
-/usr/sbin/useradd -r -g %{name} -G %{name}dns -m --base-dir %{gnunethome}  %{gnunetuser}
+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}/%{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}/usr/lib64/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
 
 %post
-#mkdir -p /etc/gnunet
-touch /etc/gnunet/gnunet.conf
+mkdir -p /%{_sysconfdir}/%{name}
+touch /%{_sysconfdir}/%{name}/gnunet.conf
+mkdir -p ~/.config
+touch ~/.config/gnunet.conf
+cp %{_libdir}/%{name}/nss/libnss_gns.so.2 %{_libdir}/%{name}/
+cp %{_libdir}/%{name}/nss/libnss_gns4.so.2 %{_libdir}/%{name}/
+cp %{_libdir}/%{name}/nss/libnss_gns6.so.2 %{_libdir}/%{name}/
+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
 
 %clean
 
+%postun
+
 %files
 %attr(0700, %{gnunetuser}, %{gnunetuser})
-%dir %{gnunethome}
 %license %{_datadir}/%{name}/LICENSE
 %doc %{_defaultdocdir}/%{name}/COPYING
 %doc doc AUTHORS ChangeLog NEWS README
-#%config %{_sysconfdir}/gnunet.conf
 %{_bindir}/gnunet-ats
 %{_bindir}/gnunet-arm
 %{_bindir}/gnunet-auto-share
@@ -265,8 +168,6 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -306,7 +207,12 @@ touch /etc/gnunet/gnunet.conf
 %{_bindir}/gnunet-uri
 %{_bindir}/gnunet-vpn
 %{_bindir}/gnunet-zoneimport
-%dir /{%_oldincludedir}/%{name}
+%{_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
 %{_oldincludedir}/%{name}/gnunet_abd_service.h
@@ -322,6 +228,7 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -351,11 +258,14 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -381,8 +291,8 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -395,6 +305,8 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -415,10 +327,10 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -454,11 +366,12 @@ touch /etc/gnunet/gnunet.conf
 /%{_libdir}/pkgconfig/gnunettransport.pc
 /%{_libdir}/pkgconfig/gnunetutil.pc
 /%{_libdir}/pkgconfig/gnunetvpn.pc
-%dir /{%_libdir}/%{name}/libexec
+%dir %{_libdir}/%{name}/libexec
 /%{_libdir}/%{name}/libexec/gnunet-communicator-tcp
 /%{_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
@@ -466,8 +379,6 @@ touch /etc/gnunet/gnunet.conf
 /%{_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
@@ -475,13 +386,13 @@ touch /etc/gnunet/gnunet.conf
 /%{_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
@@ -507,6 +418,8 @@ touch /etc/gnunet/gnunet.conf
 /%{_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
@@ -515,7 +428,7 @@ touch /etc/gnunet/gnunet.conf
 /%{_libdir}/%{name}/libexec/gnunet-service-zonemaster
 /%{_libdir}/%{name}/libexec/gnunet-service-zonemaster-monitor
 /%{_libdir}/%{name}/libexec/gnunet-timeout
-%dir /{%_libdir}/%{name}
+%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
@@ -534,6 +447,10 @@ touch /etc/gnunet/gnunet.conf
 /%{_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
@@ -544,8 +461,6 @@ touch /etc/gnunet/gnunet.conf
 /%{_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_gnsrecord_dns.la
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_dns.so
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_gns.la
@@ -560,8 +475,10 @@ touch /etc/gnunet/gnunet.conf
 /%{_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_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
@@ -584,13 +501,15 @@ touch /etc/gnunet/gnunet.conf
 /%{_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
+%dir %{_libdir}/%{name}/nss
 %{_libdir}/%{name}/nss/libnss_gns.la
 %{_libdir}/%{name}/nss/libnss_gns.so.2
 %{_libdir}/%{name}/nss/libnss_gns4.la
@@ -625,14 +544,14 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -669,6 +588,10 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -681,10 +604,6 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -721,10 +640,6 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -753,10 +668,14 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -813,15 +732,12 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -830,6 +746,7 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -847,6 +764,8 @@ touch /etc/gnunet/gnunet.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
+%{_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
@@ -881,6 +800,7 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -933,7 +853,6 @@ touch /etc/gnunet/gnunet.conf
 %{_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
@@ -973,9 +892,58 @@ touch /etc/gnunet/gnunet.conf
 %{_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
+
+%files mysql-plugins
+%{_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 conversation
+%{_bindir}/gnunet-conversation
+%{_bindir}/gnunet-conversation-test
+%{_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
+/%{_datadir}/%{name}/config.d/conversation.conf
 
 %changelog
+* Thu Jul 09 2020 Joseph Burchetta <joseph@seattlemesh.net> - 0.13.0
+- ARMv7 packaged
+- Update for Fedora 32
 * Sun Dec 1 2019 Joseph Burchetta <joseph@seattlemesh.net> - 0.11.8-0-1550
 - First GNUnet RPM