Fix a variety of rpmlint issues.

Still not all the way there...

1 files changed, 121 insertions, 128 deletions

diff --git a/rpmbuild/SPECS/gnunet.spec b/rpmbuild/SPECS/gnunet.spec
index 911ce7c..7285efa 100644
--- a/rpmbuild/SPECS/gnunet.spec
+++ b/rpmbuild/SPECS/gnunet.spec
@@ -3,9 +3,9 @@
 
 Name:           gnunet
 Version:        0.19.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Framework for secure peer-to-peer networking
-License:        AGPLv3
+License:        AGPL-3.0-or-later
 Group:          Productivity/Networking/File-Sharing
 URL:            https://%{name}.org
 %global         _disable_source_fetch 0
@@ -64,19 +64,10 @@ tunneling IP traffic over GNUnet.  GNUnet is currently developed by a
 worldwide group of independent free software developers.  GNUnet is a
 GNU package (http://www.gnu.org/).
 
-This is an ALPHA release.  There are known and significant bugs as
-well as many missing features in this release.
-
-GNUnet is free software released under the GNU Affero General Public
-License (v3 or later). For details see the COPYING file in this
-directory.  If you fork this software, you MUST adjust GNUNET_AGPL_URL
-in src/include/gnunet_util_lib.h to point to the source code of your
-fork!
-
 Additional documentation about GNUnet can be found at
 https://gnunet.org/ and in the 'doc/' folder.
 Online documentation is provided at
-'https://docs.gnunet.org' and 'https://tutorial.gnunet.org'.
+'https://docs.gnunet.org'.
 
 %package -n libgnunet
 Summary: The GNUnet base libraries
@@ -102,7 +93,7 @@ The GNUnet documentation.
 BuildRequires: texlive-scheme-medium
 Requires: texlive-scheme-medium
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Summary: The GNUnet GNS business card generator..
+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.
@@ -119,7 +110,7 @@ Files needed to develop GNUnet applications and services.
 BuildRequires:  libpq-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Recommends: postgresql-server
-Summary: The GNUnet PostgreSQL plugins.
+Summary: The GNUnet PostgreSQL plugins
 %description postgresql-plugins
 The GNUnet PostgreSQL plugins for the datacache, datastore, namecache
 and namestore components.
@@ -127,7 +118,8 @@ and namestore components.
 %package postgresql-plugins-devel
 Requires: gnunet-postgresql-plugins%{?_isa} = %{version}-%{release}
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-Summary: The GNUnet PostgreSQL plugins development files.
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: The GNUnet PostgreSQL plugins development files
 %description postgresql-plugins-devel
 The GNUnet PostgreSQL plugins development files.
 
@@ -140,16 +132,17 @@ BuildRequires:  pulseaudio-libs
 BuildRequires:  libogg-devel
 #Conversation requires gstreamer-app-1.0 and gstreamer-audio-1.0
 BuildRequires:  gstreamer1-plugins-base-devel
-Summary: The GNUnet CONVERSATION VoP2P component.
+Summary: The GNUnet CONVERSATION VoP2P component
 %description conversation
 The GNUnet CONVERSATION component. Allows you to make Voice-over-Peer-to-Peer
 audio calls.
 
 %package conversation-devel
 Requires: conversation
-Requires: gnunet-devel
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 #Conversation requires gstreamer-app-1.0 and gstreamer-audio-1.0
-Summary: The GNUnet CONVERSATION VoP2P component development files.
+Summary: The GNUnet CONVERSATION VoP2P component development files
 %description conversation-devel
 The GNUnet CONVERSATION VoP2P component development files.
 
@@ -158,17 +151,18 @@ The GNUnet CONVERSATION VoP2P component development files.
 Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires:  mariadb-devel
 Recommends: mariadb-server
-Summary: The GNUnet MySQL/MariaDB plugins.
+Summary: The GNUnet MySQL/MariaDB plugins
 %description mysql-plugins
 The GNUnet MySQL/MariaDB plugins for the datacache, datastore, namecache
 and namestore components.
 
 %package mysql-plugins-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 Requires: %{name}-mysql-plugins%{?_isa} = %{version}-%{release}
-Summary: The GNUnet MySQL/MariaDB plugins development files.
+Summary: The GNUnet MySQL/MariaDB plugins development files
 %description mysql-plugins-devel
-The GNUnet MySQL/MariaDB plugins development files..
+The GNUnet MySQL/MariaDB plugins development files.
 
 
 %prep
@@ -217,6 +211,80 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %systemd_postun_with_restart %{name}.service
 %systemd_user_post %{name}-user.service
 
+%files -n libgnunet-devel
+%{_libdir}/libgnunetsq.so
+%{_libdir}/libgnunetcurl.so
+%{_libdir}/libgnunetarm.so
+%{_libdir}/libgnunetjson.so
+%{_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
+%{_includedir}/%{name}/gnunet_json_lib.h
+%{_includedir}/%{name}/gnunet_load_lib.h
+%{_includedir}/%{name}/compat.h
+%{_includedir}/%{name}/gettext.h
+%{_includedir}/%{name}/gnunet_bio_lib.h
+%{_includedir}/%{name}/gnunet_buffer_lib.h
+%{_includedir}/%{name}/gnunet_constants.h
+%{_includedir}/%{name}/gnunet_applications.h
+%{_includedir}/%{name}/gnunet_arm_service.h
+%{_includedir}/%{name}/gnunet_plugin_lib.h
+%{_includedir}/%{name}/gnunet_time_lib.h
+%{_includedir}/%{name}/gnunet_uri_lib.h
+%{_includedir}/%{name}/gnunet_strings_lib.h
+%{_includedir}/%{name}/gnunet_sq_lib.h
+%{_includedir}/%{name}/gnunet_container_lib.h
+%{_includedir}/%{name}/gnunet_service_lib.h
+%{_includedir}/%{name}/gnunet_program_lib.h
+%{_includedir}/%{name}/gnunet_os_lib.h
+%{_includedir}/%{name}/gnunet_mq_lib.h
+%{_includedir}/%{name}/gnunet_mst_lib.h
+%{_includedir}/%{name}/gnunet_nc_lib.h
+%{_includedir}/%{name}/gnunet_network_lib.h
+%{_includedir}/%{name}/gnunet_getopt_lib.h
+%{_includedir}/%{name}/gnunet_disk_lib.h
+%{_includedir}/%{name}/gnunet_client_lib.h
+%{_includedir}/%{name}/gnunet_common.h
+%{_includedir}/%{name}/gnunet_config.h
+%{_includedir}/%{name}/gnunet_db_lib.h
+%{_includedir}/%{name}/gnunet_crypto_lib.h
+%{_includedir}/%{name}/gnunet_curl_lib.h
+%{_includedir}/%{name}/gnunet_mysql_compat.h
+%{_includedir}/%{name}/gnunet_testing_barrier.h
+
+%files -n libgnunet -f %{name}.lang
+%dir %{_defaultdocdir}/%{name}
+%{_defaultdocdir}/%{name}/README
+%license %{_defaultdocdir}/%{name}/COPYING
+%config(noreplace) %{_sysconfdir}/gnunet.conf
+%{_libdir}/libgnunetsq.so.0
+%{_libdir}/libgnunetsq.so.0.0.0
+%{_libdir}/libgnunetcurl.so.0
+%{_libdir}/libgnunetcurl.so.0.0.0
+%{_libdir}/libgnunetarm.so.2
+%{_libdir}/libgnunetarm.so.2.0.0
+%{_libdir}/libgnunetjson.so.0
+%{_libdir}/libgnunetjson.so.0.0.0
+%{_libdir}/libgnunetrest.so.0
+%{_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
+%{_bindir}/gnunet-base32
+%{_bindir}/gnunet-bugreport
+%{_bindir}/gnunet-config
+%{_bindir}/gnunet-ecc
+%{_mandir}/man1/gnunet-base32.1.gz
+%{_mandir}/man1/gnunet-bugreport.1.gz
+%{_mandir}/man1/gnunet-config.1.gz
+%{_mandir}/man1/gnunet-ecc.1.gz
+
 %files
 # AGPLv3
 %attr(0700, %{gnunetuser}, %{gnunetuser})
@@ -484,6 +552,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libgnunetscalarproduct.so.0.0.0
 %{_libdir}/libgnunettestingdhtu.so.0
 %{_libdir}/libgnunettestingdhtu.so.0.0.0
+%{_datadir}/applications/gnunet-uri.desktop
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/config.d/arm.conf
 %{_datadir}/%{name}/config.d/ats.conf
 %{_datadir}/%{name}/config.d/cadet.conf
@@ -532,44 +602,28 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_datadir}/%{name}/fcfsd-forbidden.html
 %{_datadir}/%{name}/fcfsd-index.html
 %{_datadir}/%{name}/fcfsd-notfound.html
-%{_datadir}/%{name}/gns-bcd-forbidden.html
-%{_datadir}/%{name}/gns-bcd-internal-error.html
-%{_datadir}/%{name}/gns-bcd-invalid-key.html
-%{_datadir}/%{name}/gns-bcd-not-found.html
-%{_datadir}/%{name}/gns-bcd-png.tex
-%{_datadir}/%{name}/gns-bcd-simple.html
-%{_datadir}/%{name}/gns-bcd-simple.tex
 %{_datadir}/%{name}/gnunet-logo-dark-only-text.svg
 %{_datadir}/%{name}/gnunet-logo-dark-text.svg
-%{_datadir}/%{name}/lynXified-amirouche-anonymous-v3.png
-%{_datadir}/%{name}/lynXified-amirouche-v3.svg
-%{_datadir}/%{name}/old-gnunet-logo-big.png
-%{_datadir}/%{name}/old-gnunet-logo-color.png
-%{_datadir}/%{name}/old-gnunet-logo-regrouped.svg
-%{_datadir}/%{name}/old-gnunet-logo.pdf
-%{_datadir}/%{name}/old-gnunet-logo.svg
+%exclude %{_datadir}/%{name}/lynXified-amirouche-anonymous-v3.png
+%exclude %{_datadir}/%{name}/lynXified-amirouche-v3.svg
+%exclude %{_datadir}/%{name}/old-gnunet-logo-big.png
+%exclude %{_datadir}/%{name}/old-gnunet-logo-color.png
+%exclude %{_datadir}/%{name}/old-gnunet-logo-regrouped.svg
+%exclude %{_datadir}/%{name}/old-gnunet-logo.pdf
+%exclude %{_datadir}/%{name}/old-gnunet-logo.svg
 %{_datadir}/%{name}/netjail_core.sh
 %{_datadir}/%{name}/netjail_exec.sh
 %{_datadir}/%{name}/netjail_start.sh
 %{_datadir}/%{name}/netjail_stop.sh
-%{_datadir}/%{name}/services/systemd/
 %{_datadir}/%{name}/topo.sh
-%{_datadir}/aclocal/gnunet.m4
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/def.tex
-%{_datadir}/%{name}/gns-bcd.html
-%{_datadir}/%{name}/gns-bcd.tex
 %{_datadir}/%{name}/gnunet-gns-proxy-ca.template
 %{_datadir}/%{name}/gnunet-logo.png
 %{_datadir}/%{name}/hellos/
-%{_datadir}/%{name}/services/openrc/
-%{_datadir}/%{name}/testing_hostkeys.ecc
+%exclude %{_datadir}/%{name}/services/
 %{_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-core.1.gz
 %{_mandir}/man1/gnunet-datastore.1.gz
@@ -584,6 +638,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_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
 %{_mandir}/man1/gnunet-nat-auto.1.gz
 %{_mandir}/man1/gnunet-nat-server.1.gz
 %{_mandir}/man1/gnunet-nat.1.gz
@@ -614,7 +670,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 %{_libdir}/libnss_gns6.so.2
 %{_unitdir}/%{name}.service
 %{_userunitdir}/%{name}-user.service
-%{_sysconfdir}/gnunet.conf
 #%%{_sysconfdir}/NetworkManager/dispatcher.d/10-dns2gns.sh
 
 %files devel
@@ -844,95 +899,33 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gnunet-uri.desktop
 
 %files bcd
 %{_bindir}/gnunet-bcd
+%{_datadir}/%{name}/def.tex
+%{_datadir}/%{name}/gns-bcd.html
+%{_datadir}/%{name}/gns-bcd.tex
+%{_datadir}/%{name}/gns-bcd-forbidden.html
+%{_datadir}/%{name}/gns-bcd-internal-error.html
+%{_datadir}/%{name}/gns-bcd-invalid-key.html
+%{_datadir}/%{name}/gns-bcd-not-found.html
+%{_datadir}/%{name}/gns-bcd-png.tex
+%{_datadir}/%{name}/gns-bcd-simple.html
+%{_datadir}/%{name}/gns-bcd-simple.tex
+%{_mandir}/man1/gnunet-bcd.1.gz
 
 %files doc
 %{_defaultdocdir}/%{name}/html/
+%exclude %{_defaultdocdir}/%{name}/html/.buildinfo
 %{_infodir}/gnunet.info.gz
 
-%files -n libgnunet-devel
-%{_libdir}/libgnunetsq.so
-%{_libdir}/libgnunetcurl.so
-%{_libdir}/libgnunetarm.so
-%{_libdir}/libgnunetjson.so
-%{_libdir}/libgnunetrest.so
-%{_libdir}/libgnunetutil.so
-%{_libdir}/pkgconfig/gnunetarm.pc
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/gnunet_util_lib.h
-%{_includedir}/%{name}/gnunet_json_lib.h
-%{_includedir}/%{name}/gnunet_load_lib.h
-%{_includedir}/%{name}/compat.h
-%{_includedir}/%{name}/gettext.h
-%{_includedir}/%{name}/gnunet_bio_lib.h
-%{_includedir}/%{name}/gnunet_buffer_lib.h
-%{_includedir}/%{name}/gnunet_constants.h
-%{_includedir}/%{name}/gnunet_applications.h
-%{_includedir}/%{name}/gnunet_arm_service.h
-%{_includedir}/%{name}/gnunet_plugin_lib.h
-%{_includedir}/%{name}/gnunet_time_lib.h
-%{_includedir}/%{name}/gnunet_uri_lib.h
-%{_includedir}/%{name}/gnunet_strings_lib.h
-%{_includedir}/%{name}/gnunet_sq_lib.h
-%{_includedir}/%{name}/gnunet_container_lib.h
-%{_includedir}/%{name}/gnunet_service_lib.h
-%{_includedir}/%{name}/gnunet_program_lib.h
-%{_includedir}/%{name}/gnunet_os_lib.h
-%{_includedir}/%{name}/gnunet_mq_lib.h
-%{_includedir}/%{name}/gnunet_mst_lib.h
-%{_includedir}/%{name}/gnunet_nc_lib.h
-%{_includedir}/%{name}/gnunet_network_lib.h
-%{_includedir}/%{name}/gnunet_getopt_lib.h
-%{_includedir}/%{name}/gnunet_disk_lib.h
-%{_includedir}/%{name}/gnunet_client_lib.h
-%{_includedir}/%{name}/gnunet_common.h
-%{_includedir}/%{name}/gnunet_config.h
-%{_includedir}/%{name}/gnunet_db_lib.h
-%{_includedir}/%{name}/gnunet_crypto_lib.h
-%{_includedir}/%{name}/gnunet_curl_lib.h
-%{_includedir}/%{name}/gnunet_mysql_compat.h
-%{_includedir}/%{name}/gnunet_testing_barrier.h
-
-%files -n libgnunet
-%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
-%{_libdir}/libgnunetcurl.so.0.0.0
-%{_libdir}/libgnunetarm.so.2
-%{_libdir}/libgnunetarm.so.2.0.0
-%{_libdir}/libgnunetjson.so.0
-%{_libdir}/libgnunetjson.so.0.0.0
-%{_libdir}/libgnunetrest.so.0
-%{_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}/locale/de/LC_MESSAGES/gnunet.mo
-%{_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
-%{_bindir}/gnunet-base32
-%{_bindir}/gnunet-bugreport
-%{_bindir}/gnunet-config
-%{_bindir}/gnunet-ecc
-%{_mandir}/man1/gnunet-base32.1.gz
-%{_mandir}/man1/gnunet-bugreport.1.gz
-%{_mandir}/man1/gnunet-config.1.gz
-%{_mandir}/man1/gnunet-ecc.1.gz
-%{_mandir}/man1/gnunet-namestore-dbtool.1.gz
-%{_mandir}/man1/gnunet-namestore-zonefile.1.gz
-
 
 %changelog
+* Sat Dec 31 2022 Martin Schanzenbach <schanzen@gnunet.org> - 0.19.1-3
+- Properly use %%lang
+- Exclude some files from being installed that are not really required (images)
+- Exclude openrc scripts from being installed needlessly
+- Separate more files from bcd into subpackage
+- Adjust license to AGPL-3.0-or-later
+- Move testing hostkeys and gnunet.m4 to devel
+
 * 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