0.19.1-2

1 files changed, 102 insertions, 107 deletions

diff --git a/rpmbuild/SPECS/gnunet.spec b/rpmbuild/SPECS/gnunet.spec
index c7b5fea..911ce7c 100644
--- a/rpmbuild/SPECS/gnunet.spec
+++ b/rpmbuild/SPECS/gnunet.spec
@@ -1,19 +1,18 @@
-%define gnunetuser gnunet
-%define gnunethome %{_sharedstatedir}/%{name}
-%global debug_package %{nil}
+%global gnunetuser gnunet
+%global gnunethome %{_sharedstatedir}/%{name}
 
 Name:           gnunet
 Version:        0.19.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Framework for secure peer-to-peer networking
 License:        AGPLv3
 Group:          Productivity/Networking/File-Sharing
 URL:            https://%{name}.org
-%define         _disable_source_fetch 0
+%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
 Source2:        https://www.gnunet.org/~schanzen/schanzen.asc
-%define         SHA512SUM0 09823fc0e2aefbe81a08a03e8f73d82e1e10fe9077975ff13da38ea27d00f90931867a6a51346e2045719ae23c3a214a1149e3dde913547d316559205a15bfb5
+%global         SHA512SUM0 09823fc0e2aefbe81a08a03e8f73d82e1e10fe9077975ff13da38ea27d00f90931867a6a51346e2045719ae23c3a214a1149e3dde913547d316559205a15bfb5
 BuildRequires:  libtool
 BuildRequires:  libtool-ltdl
 BuildRequires:  libtool-ltdl-devel
@@ -45,7 +44,6 @@ BuildRequires:  sqlite-devel
 BuildRequires:  gnupg2
 BuildRequires:  libjose-devel
 BuildRequires: systemd-rpm-macros
-Requires:       libextractor
 Requires:       openssl
 Requires:       nss-util
 Requires:       gnutls
@@ -55,7 +53,7 @@ Requires:       iptables
 Requires:       miniupnpc
 Requires:       dbus
 Requires:       authselect
-Requires:       libgnunet
+Requires:       lib%{name}%{?_isa} = %{version}-%{release}     
 
 %description
 GNUnet is peer-to-peer framework providing a network abstractions and
@@ -86,12 +84,15 @@ Summary: The GNUnet base libraries
 The GNUnet base libraries.
 
 %package -n libgnunet-devel
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
 Summary: The GNUnet base libraries development files
 %description -n libgnunet-devel
 The GNUnet base libraries development files.
 
 %package doc
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: python3-sphinx python-sphinx_rtd_theme mandoc doxygen texinfo
+BuildArchitectures: noarch
 Summary: The GNUnet documentation
 %description doc
 The GNUnet documentation.
@@ -100,15 +101,15 @@ The GNUnet documentation.
 %package bcd
 BuildRequires: texlive-scheme-medium
 Requires: texlive-scheme-medium
-Requires: gnunet
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: The GNUnet GNS business card generator..
 %description bcd
 The GNUnet GNS business card generator to generate business cards with
 QR codes of zone keys.
 
 %package devel
-Requires: gnunet
-Requires: libgnunet-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
 Summary: GNUnet development headers
 %description devel
 Files needed to develop GNUnet applications and services.
@@ -116,8 +117,7 @@ Files needed to develop GNUnet applications and services.
 # gnunet-postgresql-plugins
 %package postgresql-plugins
 BuildRequires:  libpq-devel
-Requires: libpq
-Requires: gnunet
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Recommends: postgresql-server
 Summary: The GNUnet PostgreSQL plugins.
 %description postgresql-plugins
@@ -125,8 +125,8 @@ The GNUnet PostgreSQL plugins for the datacache, datastore, namecache
 and namestore components.
 
 %package postgresql-plugins-devel
-Requires: gnunet-postgresql-plugins
-Requires: gnunet-devel
+Requires: gnunet-postgresql-plugins%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 Summary: The GNUnet PostgreSQL plugins development files.
 %description postgresql-plugins-devel
 The GNUnet PostgreSQL plugins development files.
@@ -134,7 +134,7 @@ The GNUnet PostgreSQL plugins development files.
 
 # gnunet-conversation functionality
 %package conversation
-Requires: gnunet
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires:  opus-devel
 BuildRequires:  pulseaudio-libs
 BuildRequires:  libogg-devel
@@ -151,12 +151,11 @@ Requires: gnunet-devel
 #Conversation requires gstreamer-app-1.0 and gstreamer-audio-1.0
 Summary: The GNUnet CONVERSATION VoP2P component development files.
 %description conversation-devel
-The GNUnet CONVERSATION component development files..
-
+The GNUnet CONVERSATION VoP2P component development files.
 
 # The mysql plugins
 %package mysql-plugins
-Requires: gnunet
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires:  mariadb-devel
 Recommends: mariadb-server
 Summary: The GNUnet MySQL/MariaDB plugins.
@@ -165,8 +164,8 @@ The GNUnet MySQL/MariaDB plugins for the datacache, datastore, namecache
 and namestore components.
 
 %package mysql-plugins-devel
-Requires: gnunet-mysql-plugins
-Requires: gnunet-devel
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}-mysql-plugins%{?_isa} = %{version}-%{release}
 Summary: The GNUnet MySQL/MariaDB plugins development files.
 %description mysql-plugins-devel
 The GNUnet MySQL/MariaDB plugins development files..
@@ -190,6 +189,7 @@ exit 0
 
 %install
 make install DESTDIR=%{buildroot}
+%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"
 install -Dm644 "contrib/packages/fedora/gnunet-system.conf" %{buildroot}/%{_sysconfdir}/gnunet.conf
@@ -203,19 +203,24 @@ 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
 #make check
 
 %post
-mkdir -p ~/.config/gnunet
-touch ~/.config/gnunet.conf
+%systemd_post %{name}.service
+%systemd_user_post %{name}-user.service
+
+%preun
+%systemd_preun %{name}.service
 
 %postun
+%systemd_postun_with_restart %{name}.service
+%systemd_user_post %{name}-user.service
 
 %files
 # AGPLv3
 %attr(0700, %{gnunetuser}, %{gnunetuser})
-%license %{_defaultdocdir}/%{name}/COPYING
-%doc doc AUTHORS ChangeLog NEWS README
+%{_bindir}/gnunet-arm
 %{_bindir}/gnunet-ats
 %{_bindir}/gnunet-auto-share
 %{_bindir}/gnunet-cadet
@@ -268,6 +273,7 @@ touch ~/.config/gnunet.conf
 %{_bindir}/gnunet-did
 %{_bindir}/gnunet-messenger
 %{_bindir}/gnunet-scalarproduct
+%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/libexec
 %{_libdir}/%{name}/libexec/gnunet-communicator-tcp
 %{_libdir}/%{name}/libexec/gnunet-communicator-udp
@@ -291,6 +297,7 @@ touch ~/.config/gnunet.conf
 %{_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
@@ -319,6 +326,7 @@ touch ~/.config/gnunet.conf
 %{_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
@@ -329,49 +337,53 @@ touch ~/.config/gnunet.conf
 %{_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.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_consensus.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_dht.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_dns.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_fs.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_gns.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_regex.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_revocation.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_set_test.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_seti_test.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_setu_test.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_block_test.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_heap.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datacache_sqlite.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_heap.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_datastore_sqlite.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_dns.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_gns.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_gnsrecord_reclaim.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namecache_sqlite.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_namestore_sqlite.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_peerstore_sqlite.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_reclaim_attribute_basic.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_reclaim_credential_jwt.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_config.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_copying.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_gns.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_identity.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_namestore.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_openid_connect.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_peerinfo.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_rest_reclaim.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_http_server.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_https_server.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_http_client.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_https_client.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_tcp.so
-%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_unix.so
 %{_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
+%{_libdir}/%{name}/libgnunet_plugin_block_fs.so
+%{_libdir}/%{name}/libgnunet_plugin_block_gns.so
+%{_libdir}/%{name}/libgnunet_plugin_block_regex.so
+%{_libdir}/%{name}/libgnunet_plugin_block_revocation.so
+%{_libdir}/%{name}/libgnunet_plugin_block_set_test.so
+%{_libdir}/%{name}/libgnunet_plugin_block_seti_test.so
+%{_libdir}/%{name}/libgnunet_plugin_block_setu_test.so
+%{_libdir}/%{name}/libgnunet_plugin_block_test.so
+%{_libdir}/%{name}/libgnunet_plugin_datacache_heap.so
+%{_libdir}/%{name}/libgnunet_plugin_datacache_sqlite.so
+%{_libdir}/%{name}/libgnunet_plugin_datastore_heap.so
+%{_libdir}/%{name}/libgnunet_plugin_datastore_sqlite.so
+%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_dns.so
+%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_gns.so
+%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_reclaim.so
+%{_libdir}/%{name}/libgnunet_plugin_namecache_sqlite.so
+%{_libdir}/%{name}/libgnunet_plugin_namestore_sqlite.so
+%{_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_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
@@ -472,7 +484,7 @@ touch ~/.config/gnunet.conf
 %{_libdir}/libgnunetscalarproduct.so.0.0.0
 %{_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
 %{_datadir}/%{name}/config.d/cadet.conf
 %{_datadir}/%{name}/config.d/communicator-unix.conf
@@ -540,9 +552,7 @@ touch ~/.config/gnunet.conf
 %{_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}/services/systemd/
 %{_datadir}/%{name}/topo.sh
 %{_datadir}/aclocal/gnunet.m4
 %dir %{_datadir}/%{name}
@@ -551,26 +561,16 @@ touch ~/.config/gnunet.conf
 %{_datadir}/%{name}/gns-bcd.tex
 %{_datadir}/%{name}/gnunet-gns-proxy-ca.template
 %{_datadir}/%{name}/gnunet-logo.png
-%{_datadir}/%{name}/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
-%{_datadir}/%{name}/services/openrc/gnunet.initd
-%{_datadir}/%{name}/services/systemd/gnunet.service
+%{_datadir}/%{name}/hellos/
+%{_datadir}/%{name}/services/openrc/
 %{_datadir}/%{name}/testing_hostkeys.ecc
-%{_datadir}/%{name}/sql/datacache-0001.sql
-%{_datadir}/%{name}/sql/datacache-drop.sql
-%{_datadir}/%{name}/sql/datastore-0001.sql
-%{_datadir}/%{name}/sql/datastore-drop.sql
-%{_datadir}/%{name}/sql/namecache-0001.sql
-%{_datadir}/%{name}/sql/namecache-drop.sql
-%{_datadir}/%{name}/sql/namestore-0001.sql
-%{_datadir}/%{name}/sql/namestore-drop.sql
-%{_datadir}/%{name}/sql/versioning.sql
+%{_datadir}/%{name}/sql/
 %{_datadir}/applications/gnunet-uri.desktop
+%{_mandir}/man1/gnunet-arm.1.gz
 %{_mandir}/man1/gnunet-ats.1.gz
 %{_mandir}/man1/gnunet-auto-share.1.gz
 %{_mandir}/man1/gnunet-bcd.1.gz
 %{_mandir}/man1/gnunet-cadet.1.gz
-%{_mandir}/man1/gnunet-conversation-test.1.gz
-%{_mandir}/man1/gnunet-conversation.1.gz
 %{_mandir}/man1/gnunet-core.1.gz
 %{_mandir}/man1/gnunet-datastore.1.gz
 %{_mandir}/man1/gnunet-directory.1.gz
@@ -609,11 +609,9 @@ touch ~/.config/gnunet.conf
 %{_mandir}/man1/gnunet-zoneimport.1.gz
 %{_mandir}/man5/gnunet.conf.5.gz
 %{_bindir}/gnunet-suidfix
-%{_libdir}/%{name}/libexec/gnunet-service-tng
 %{_libdir}/libnss_gns.so.2
 %{_libdir}/libnss_gns4.so.2
 %{_libdir}/libnss_gns6.so.2
-%{_libdir}/pkgconfig/gnunetscalarproduct.pc
 %{_unitdir}/%{name}.service
 %{_userunitdir}/%{name}-user.service
 %{_sysconfdir}/gnunet.conf
@@ -670,7 +668,6 @@ touch ~/.config/gnunet.conf
 %{_libdir}/libgnunetmessenger.so
 %{_libdir}/libgnunetscalarproduct.so
 %{_libdir}/libgnunettestingdhtu.so
-%dir %{_includedir}/%{name}
 %{_includedir}/%{name}/gnunet_abd_service.h
 %{_includedir}/%{name}/gnunet_ats_application_service.h
 %{_includedir}/%{name}/gnunet_ats_plugin.h
@@ -788,29 +785,26 @@ touch ~/.config/gnunet.conf
 %{_libdir}/pkgconfig/gnunettransport.pc
 %{_libdir}/pkgconfig/gnunetutil.pc
 %{_libdir}/pkgconfig/gnunetvpn.pc
-
+%{_libdir}/pkgconfig/gnunetscalarproduct.pc
 
 %files postgresql-plugins
-%{_libdir}/libgnunetpq.so
 %{_libdir}/libgnunetpq.so.3
 %{_libdir}/libgnunetpq.so.3.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
+%{_libdir}/%{name}/libgnunet_plugin_datacache_postgres.so
+%{_libdir}/%{name}/libgnunet_plugin_datastore_postgres.so
+%{_libdir}/%{name}/libgnunet_plugin_namecache_postgres.so
+%{_libdir}/%{name}/libgnunet_plugin_namestore_postgres.so
 
 %files postgresql-plugins-devel
 %{_libdir}/libgnunetpq.so
 %{_includedir}/%{name}/gnunet_pq_lib.h
 
 %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.so
+%{_libdir}/%{name}/libgnunet_plugin_datastore_mysql.so
 
 %files mysql-plugins-devel
 %{_libdir}/libgnunetmy.so
@@ -826,15 +820,14 @@ touch ~/.config/gnunet.conf
 %{_libdir}/%{name}/libexec/gnunet-helper-audio-record
 %{_libdir}/%{name}/libexec/gnunet-service-conversation
 %{_libdir}/%{name}/libgnunet_plugin_gnsrecord_conversation.so
-%{_libdir}/libgnunetconversation.so
 %{_libdir}/libgnunetconversation.so.0
 %{_libdir}/libgnunetconversation.so.0.0.0
-%{_libdir}/libgnunetmicrophone.so
 %{_libdir}/libgnunetmicrophone.so.0
 %{_libdir}/libgnunetmicrophone.so.0.0.0
-%{_libdir}/libgnunetspeaker.so
 %{_libdir}/libgnunetspeaker.so.0
 %{_libdir}/libgnunetspeaker.so.0.0.0
+%{_mandir}/man1/gnunet-conversation-test.1.gz
+%{_mandir}/man1/gnunet-conversation.1.gz
 %{_datadir}/%{name}/config.d/conversation.conf
 
 %files conversation-devel
@@ -853,7 +846,7 @@ touch ~/.config/gnunet.conf
 %{_bindir}/gnunet-bcd
 
 %files doc
-%{_defaultdocdir}/%{name}/html
+%{_defaultdocdir}/%{name}/html/
 %{_infodir}/gnunet.info.gz
 
 %files -n libgnunet-devel
@@ -864,11 +857,7 @@ touch ~/.config/gnunet.conf
 %{_libdir}/libgnunetrest.so
 %{_libdir}/libgnunetutil.so
 %{_libdir}/pkgconfig/gnunetarm.pc
-%{_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}/%{name}/libgnunet_test_transport_plugin_cmd_nat_upnp.so
+%dir %{_includedir}/%{name}
 %{_includedir}/%{name}/gnunet_util_lib.h
 %{_includedir}/%{name}/gnunet_json_lib.h
 %{_includedir}/%{name}/gnunet_load_lib.h
@@ -904,7 +893,10 @@ touch ~/.config/gnunet.conf
 %{_includedir}/%{name}/gnunet_testing_barrier.h
 
 %files -n libgnunet
-%{_libdir}/%{name}/libexec/gnunet-service-arm
+%license COPYING
+%dir %{_defaultdocdir}/%{name}
+%{_defaultdocdir}/%{name}/COPYING
+%{_defaultdocdir}/%{name}/README
 %{_libdir}/libgnunetsq.so.0
 %{_libdir}/libgnunetsq.so.0.0.0
 %{_libdir}/libgnunetcurl.so.0
@@ -917,8 +909,9 @@ touch ~/.config/gnunet.conf
 %{_libdir}/libgnunetrest.so.0.0.0
 %{_libdir}/libgnunetutil.so.15
 %{_libdir}/libgnunetutil.so.15.0.0
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/config.d
 %{_datadir}/%{name}/config.d/util.conf
-%{_datadir}/%{name}/config.d/arm.conf
 %{_datadir}/locale/de/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/es/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/fr/LC_MESSAGES/gnunet.mo
@@ -927,12 +920,10 @@ touch ~/.config/gnunet.conf
 %{_datadir}/locale/sv/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/vi/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/zh_CN/LC_MESSAGES/gnunet.mo
-%{_bindir}/gnunet-arm
 %{_bindir}/gnunet-base32
 %{_bindir}/gnunet-bugreport
 %{_bindir}/gnunet-config
 %{_bindir}/gnunet-ecc
-%{_mandir}/man1/gnunet-arm.1.gz
 %{_mandir}/man1/gnunet-base32.1.gz
 %{_mandir}/man1/gnunet-bugreport.1.gz
 %{_mandir}/man1/gnunet-config.1.gz
@@ -942,6 +933,10 @@ touch ~/.config/gnunet.conf
 
 
 %changelog
+* Fri Dec 30 2022 Martin Schanzenbach <schanzen@gnunet.org> - 0.19.1-2
+- Try to address a few rpmlint issues
+* Thu Dec 29 2022 Martin Schanzenbach <schanzen@gnunet.org> - 0.19.1
+- Version bump
 * Wed Dec 07 2022 Martin Schanzenbach <schanzen@gnunet.org> - 0.19.0
 - Version bump
 * Fri Nov 04 2022 Martin Schanzenbach <schanzen@gnunet.org> - 0.18.1