commit ca0c3ea87ba175589dd9f1e57dbb787a8e8314bd
parent ec54960b71903ae0556a27454b1e8cd4985dcc7e
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Mon, 6 Jun 2022 21:59:43 +0200
packaging guidelines, rpmlint
Diffstat:
2 files changed, 72 insertions(+), 67 deletions(-)
diff --git a/rpmbuild/SPECS/gnunet.spec b/rpmbuild/SPECS/gnunet.spec
@@ -158,15 +158,6 @@ mkdir -p /%{_sysconfdir}/%{name}
touch /%{_sysconfdir}/%{name}/gnunet.conf
mkdir -p ~/.config
touch ~/.config/gnunet.conf
-# FIXME: This needs to be done using authselect
-# See also https://fedoraproject.org/wiki/Changes/Make_Authselect_Mandatory#Detailed_Description
-#cp -p %{_libdir}/%{name}/nss/libnss_gns.so.2 %{_libdir}/%{name}/
-#cp -p %{_libdir}/%{name}/nss/libnss_gns4.so.2 %{_libdir}/%{name}/
-#cp -p %{_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
%postun
@@ -340,167 +331,114 @@ touch ~/.config/gnunet.conf
/%{_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}/libgnunetarm.so
%{_libdir}/libgnunetarm.so.2
%{_libdir}/libgnunetarm.so.2.0.0
-%{_libdir}/libgnunetats.so
%{_libdir}/libgnunetats.so.4
%{_libdir}/libgnunetats.so.4.0.0
-%{_libdir}/libgnunetblock.so
%{_libdir}/libgnunetblock.so.0
%{_libdir}/libgnunetblock.so.0.0.0
-%{_libdir}/libgnunetblockgroup.so
%{_libdir}/libgnunetblockgroup.so.0
%{_libdir}/libgnunetblockgroup.so.0.0.0
-%{_libdir}/libgnunetcadet.so
%{_libdir}/libgnunetcadet.so.7
%{_libdir}/libgnunetcadet.so.7.0.0
-%{_libdir}/libgnunetconsensus.so
%{_libdir}/libgnunetconsensus.so.0
%{_libdir}/libgnunetconsensus.so.0.0.0
-%{_libdir}/libgnunetcore.so
%{_libdir}/libgnunetcore.so.0
%{_libdir}/libgnunetcore.so.0.0.1
-%{_libdir}/libgnunetcurl.so
%{_libdir}/libgnunetcurl.so.0
%{_libdir}/libgnunetcurl.so.0.0.0
-%{_libdir}/libgnunetdatacache.so
%{_libdir}/libgnunetdatacache.so.0
%{_libdir}/libgnunetdatacache.so.0.0.1
-%{_libdir}/libgnunetdatastore.so
%{_libdir}/libgnunetdatastore.so.1
%{_libdir}/libgnunetdatastore.so.1.0.0
-%{_libdir}/libgnunetdht.so
%{_libdir}/libgnunetdht.so.3
%{_libdir}/libgnunetdht.so.3.0.0
-%{_libdir}/libgnunetdns.so
%{_libdir}/libgnunetdns.so.0
%{_libdir}/libgnunetdns.so.0.0.0
-%{_libdir}/libgnunetfragmentation.so
%{_libdir}/libgnunetfragmentation.so.2
%{_libdir}/libgnunetfragmentation.so.2.0.0
-%{_libdir}/libgnunetfriends.so
%{_libdir}/libgnunetfriends.so.0
%{_libdir}/libgnunetfriends.so.0.0.0
-%{_libdir}/libgnunetfs.so
%{_libdir}/libgnunetfs.so.2
%{_libdir}/libgnunetfs.so.2.1.1
-%{_libdir}/libgnunetgns.so
%{_libdir}/libgnunetgns.so.0
%{_libdir}/libgnunetgns.so.0.0.0
-%{_libdir}/libgnunetgnsrecord.so
%{_libdir}/libgnunetgnsrecord.so.0
%{_libdir}/libgnunetgnsrecord.so.0.0.0
-%{_libdir}/libgnunetgnsrecordjson.so
%{_libdir}/libgnunetgnsrecordjson.so.0
%{_libdir}/libgnunetgnsrecordjson.so.0.0.0
-%{_libdir}/libgnunethello.so
%{_libdir}/libgnunethello.so.0
%{_libdir}/libgnunethello.so.0.1.0
-%{_libdir}/libgnunetidentity.so
%{_libdir}/libgnunetidentity.so.1
%{_libdir}/libgnunetidentity.so.1.0.0
-%{_libdir}/libgnunetjson.so
%{_libdir}/libgnunetjson.so.0
%{_libdir}/libgnunetjson.so.0.0.0
-%{_libdir}/libgnunetnamecache.so
%{_libdir}/libgnunetnamecache.so.0
%{_libdir}/libgnunetnamecache.so.0.0.0
-%{_libdir}/libgnunetnamestore.so
%{_libdir}/libgnunetnamestore.so.0
%{_libdir}/libgnunetnamestore.so.0.0.1
-%{_libdir}/libgnunetnatauto.so
%{_libdir}/libgnunetnatauto.so.0
%{_libdir}/libgnunetnatauto.so.0.0.0
-%{_libdir}/libgnunetnatnew.so
%{_libdir}/libgnunetnatnew.so.2
%{_libdir}/libgnunetnatnew.so.2.0.0
-%{_libdir}/libgnunetnse.so
%{_libdir}/libgnunetnse.so.0
%{_libdir}/libgnunetnse.so.0.0.0
-%{_libdir}/libgnunetnt.so
%{_libdir}/libgnunetnt.so.0
%{_libdir}/libgnunetnt.so.0.0.0
-%{_libdir}/libgnunetpeerinfo.so
%{_libdir}/libgnunetpeerinfo.so.0
%{_libdir}/libgnunetpeerinfo.so.0.0.0
-%{_libdir}/libgnunetpeerstore.so
%{_libdir}/libgnunetpeerstore.so.0
%{_libdir}/libgnunetpeerstore.so.0.0.0
-%{_libdir}/libgnunetreclaim.so
%{_libdir}/libgnunetreclaim.so.0
%{_libdir}/libgnunetreclaim.so.0.0.0
-%{_libdir}/libgnunetregex.so
%{_libdir}/libgnunetregex.so.3
%{_libdir}/libgnunetregex.so.3.0.1
-%{_libdir}/libgnunetregexblock.so
%{_libdir}/libgnunetregexblock.so.1
%{_libdir}/libgnunetregexblock.so.1.0.0
-%{_libdir}/libgnunetrest.so
%{_libdir}/libgnunetrest.so.0
%{_libdir}/libgnunetrest.so.0.0.0
-%{_libdir}/libgnunetrevocation.so
%{_libdir}/libgnunetrevocation.so.0
%{_libdir}/libgnunetrevocation.so.0.0.0
-%{_libdir}/libgnunetsecretsharing.so
%{_libdir}/libgnunetsecretsharing.so.0
%{_libdir}/libgnunetsecretsharing.so.0.0.0
-%{_libdir}/libgnunetset.so
%{_libdir}/libgnunetset.so.0
%{_libdir}/libgnunetset.so.0.0.0
-%{_libdir}/libgnunetseti.so
%{_libdir}/libgnunetseti.so.0
%{_libdir}/libgnunetseti.so.0.0.0
-%{_libdir}/libgnunetsetu.so
%{_libdir}/libgnunetsetu.so.0
%{_libdir}/libgnunetsetu.so.0.0.0
-%{_libdir}/libgnunetsq.so
%{_libdir}/libgnunetsq.so.0
%{_libdir}/libgnunetsq.so.0.0.0
-%{_libdir}/libgnunetstatistics.so
%{_libdir}/libgnunetstatistics.so.2
%{_libdir}/libgnunetstatistics.so.2.0.0
-%{_libdir}/libgnunettestbed.so
%{_libdir}/libgnunettestbed.so.0
%{_libdir}/libgnunettestbed.so.0.0.0
-%{_libdir}/libgnunettestbedlogger.so
%{_libdir}/libgnunettestbedlogger.so.0
%{_libdir}/libgnunettestbedlogger.so.0.0.0
-%{_libdir}/libgnunettesting.so
%{_libdir}/libgnunettesting.so.1
%{_libdir}/libgnunettesting.so.1.1.0
-%{_libdir}/libgnunettransport.so
%{_libdir}/libgnunettransport.so.2
%{_libdir}/libgnunettransport.so.2.2.0
-%{_libdir}/libgnunettransportapplication.so
%{_libdir}/libgnunettransportapplication.so.0
%{_libdir}/libgnunettransportapplication.so.0.0.0
-%{_libdir}/libgnunettransportcommunicator.so
%{_libdir}/libgnunettransportcommunicator.so.0
%{_libdir}/libgnunettransportcommunicator.so.0.0.0
-%{_libdir}/libgnunettransportcore.so
%{_libdir}/libgnunettransportcore.so.0
%{_libdir}/libgnunettransportcore.so.0.0.0
-%{_libdir}/libgnunettransportmonitor.so
%{_libdir}/libgnunettransportmonitor.so.0
%{_libdir}/libgnunettransportmonitor.so.0.0.0
-%{_libdir}/libgnunettransporttesting.so
%{_libdir}/libgnunettransporttesting.so.0
%{_libdir}/libgnunettransporttesting.so.0.0.0
-%{_libdir}/libgnunettransporttesting2.so
%{_libdir}/libgnunettransporttesting2.so.0
%{_libdir}/libgnunettransporttesting2.so.0.0.0
-%{_libdir}/libgnunetutil.so
-%{_libdir}/libgnunetvpn.so
+%{_libdir}/libgnunetutil.so.15
+%{_libdir}/libgnunetutil.so.15.0.0
%{_libdir}/libgnunetvpn.so.0
%{_libdir}/libgnunetvpn.so.0.0.0
-%{_libdir}/libgnunetmessenger.so
%{_libdir}/libgnunetmessenger.so.0
%{_libdir}/libgnunetmessenger.so.0.0.0
-%{_libdir}/libgnunetscalarproduct.so
%{_libdir}/libgnunetscalarproduct.so.0
%{_libdir}/libgnunetscalarproduct.so.0.0.0
-%{_libdir}/libgnunettestingdhtu.so
%{_libdir}/libgnunettestingdhtu.so.0
%{_libdir}/libgnunettestingdhtu.so.0.0.0
%dir %{_datadir}/%{name}/config.d
@@ -574,7 +512,6 @@ touch ~/.config/gnunet.conf
%{_datadir}/%{name}/services/systemd/tmpfiles-gnunet.conf
%{_datadir}/%{name}/topo.sh
%{_datadir}/aclocal/gnunet.m4
-
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/def.tex
%{_datadir}/%{name}/gns-bcd.html
@@ -651,14 +588,64 @@ touch ~/.config/gnunet.conf
%{_infodir}/gnunet.info.gz
%{_bindir}/gnunet-base32
%{_libdir}/%{name}/libexec/gnunet-service-tng
-%{_libdir}/libgnunetutil.so.15
-%{_libdir}/libgnunetutil.so.15.0.0
%{_libdir}/libnss_gns.so.2
%{_libdir}/libnss_gns4.so.2
%{_libdir}/libnss_gns6.so.2
%{_libdir}/pkgconfig/gnunetscalarproduct.pc
%files devel
+%{_libdir}/libgnunetblockgroup.so
+%{_libdir}/libgnunetats.so
+%{_libdir}/libgnunetblock.so
+%{_libdir}/libgnunetcadet.so
+%{_libdir}/libgnunetconsensus.so
+%{_libdir}/libgnunetcore.so
+%{_libdir}/libgnunetcurl.so
+%{_libdir}/libgnunetdatacache.so
+%{_libdir}/libgnunetdatastore.so
+%{_libdir}/libgnunetdht.so
+%{_libdir}/libgnunetdns.so
+%{_libdir}/libgnunetfragmentation.so
+%{_libdir}/libgnunetfriends.so
+%{_libdir}/libgnunetfs.so
+%{_libdir}/libgnunetgns.so
+%{_libdir}/libgnunetgnsrecord.so
+%{_libdir}/libgnunetgnsrecordjson.so
+%{_libdir}/libgnunethello.so
+%{_libdir}/libgnunetidentity.so
+%{_libdir}/libgnunetjson.so
+%{_libdir}/libgnunetnamecache.so
+%{_libdir}/libgnunetnamestore.so
+%{_libdir}/libgnunetnatauto.so
+%{_libdir}/libgnunetnatnew.so
+%{_libdir}/libgnunetnse.so
+%{_libdir}/libgnunetnt.so
+%{_libdir}/libgnunetpeerinfo.so
+%{_libdir}/libgnunetpeerstore.so
+%{_libdir}/libgnunetreclaim.so
+%{_libdir}/libgnunetregex.so
+%{_libdir}/libgnunetregexblock.so
+%{_libdir}/libgnunetrest.so
+%{_libdir}/libgnunetrevocation.so
+%{_libdir}/libgnunetsecretsharing.so
+%{_libdir}/libgnunetset.so
+%{_libdir}/libgnunetseti.so
+%{_libdir}/libgnunetsetu.so
+%{_libdir}/libgnunetsq.so
+%{_libdir}/libgnunetstatistics.so
+%{_libdir}/libgnunettestbed.so
+%{_libdir}/libgnunettestbedlogger.so
+%{_libdir}/libgnunettesting.so
+%{_libdir}/libgnunettransport.so
+%{_libdir}/libgnunettransportapplication.so
+%{_libdir}/libgnunettransportcommunicator.so
+%{_libdir}/libgnunettransportcore.so
+%{_libdir}/libgnunettransporttesting2.so
+%{_libdir}/libgnunetutil.so
+%{_libdir}/libgnunetvpn.so
+%{_libdir}/libgnunetmessenger.so
+%{_libdir}/libgnunetscalarproduct.so
+%{_libdir}/libgnunettestingdhtu.so
%dir %{_oldincludedir}/%{name}
%{_oldincludedir}/%{name}/compat.h
%{_oldincludedir}/%{name}/gettext.h
@@ -820,6 +807,7 @@ touch ~/.config/gnunet.conf
/%{_libdir}/pkgconfig/gnunettransport.pc
/%{_libdir}/pkgconfig/gnunetutil.pc
/%{_libdir}/pkgconfig/gnunetvpn.pc
+%{_libdir}/libgnunetarm.so
%files postgresql-plugins
diff --git a/todo.txt b/todo.txt
@@ -0,0 +1,17 @@
+Proper postinst with authselect:
+
+%post
+mkdir -p /%{_sysconfdir}/%{name}
+touch /%{_sysconfdir}/%{name}/gnunet.conf
+mkdir -p ~/.config
+touch ~/.config/gnunet.conf
+# FIXME: This needs to be done using authselect
+# See also https://fedoraproject.org/wiki/Changes/Make_Authselect_Mandatory#Detailed_Description
+#cp -p %{_libdir}/%{name}/nss/libnss_gns.so.2 %{_libdir}/%{name}/
+#cp -p %{_libdir}/%{name}/nss/libnss_gns4.so.2 %{_libdir}/%{name}/
+#cp -p %{_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
+
