-update with test tarball

1 files changed, 12 insertions, 27 deletions

diff --git a/rpmbuild/SPECS/gnunet.spec b/rpmbuild/SPECS/gnunet.spec
index f95cc87..50d4a4f 100644
--- a/rpmbuild/SPECS/gnunet.spec
+++ b/rpmbuild/SPECS/gnunet.spec
@@ -3,7 +3,7 @@
 %global debug_package %{nil}
 
 Name:           gnunet
-Version:        0.18.0
+Version:        0.18.0pre0
 Release:        1%{?dist}
 Summary:        Framework for secure peer-to-peer networking
 License:        AGPLv3
@@ -13,7 +13,7 @@ URL:            https://%{name}.org
 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 1cd1793d1e6c689131ef8ada4e41fe6b559c43170ee32fada381c3358c7c815e7837881f546bbd18bee6e7635a34ff1702cd7c59c74e986d154712cc705edbc4
+%define         SHA512SUM0 86b53ddd80904a8f8d95d5fa32733eb4747ce95be795fab6f7e1cd6d38ce6d8c5045f459b5661631287359a25f2c2fcb507419435367a93a69af02110cdccf2f
 BuildRequires:  libtool
 BuildRequires:  libtool-ltdl
 BuildRequires:  libtool-ltdl-devel
@@ -193,8 +193,12 @@ make install DESTDIR=%{buildroot}
 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
-mkdir -p %{buildroot}/%{_sysconfdir}/NetworkManager/dispatcher.d
-install -Dm755 "contrib/packages/fedora/10-dns2gns.sh" %{buildroot}/%{_sysconfdir}/NetworkManager/dispatcher.d/
+# NOTE: Let's not do that for now automatically, because systemd is, well, special
+# https://github.com/systemd/systemd/issues/25020
+# https://github.com/systemd/systemd/issues/5755
+# https://github.com/systemd/systemd/issues/21174
+#mkdir -p %{buildroot}/%{_sysconfdir}/NetworkManager/dispatcher.d
+#install -Dm755 "contrib/packages/fedora/10-dns2gns.sh" %{buildroot}/%{_sysconfdir}/NetworkManager/dispatcher.d/
 # Remove the dir file like, e.g., bash.
 rm -f %{buildroot}%{_infodir}/dir
 
@@ -230,6 +234,7 @@ touch ~/.config/gnunet.conf
 %{_bindir}/gnunet-namecache
 %{_bindir}/gnunet-namestore
 %{_bindir}/gnunet-namestore-dbtool
+%{_bindir}/gnunet-namestore-zonefile
 %{_bindir}/gnunet-nat
 %{_bindir}/gnunet-nat-auto
 %{_bindir}/gnunet-nat-server
@@ -317,7 +322,6 @@ touch ~/.config/gnunet.conf
 %{_libdir}/%{name}/libexec/gnunet-service-transport
 %{_libdir}/%{name}/libexec/gnunet-service-vpn
 %{_libdir}/%{name}/libexec/gnunet-service-zonemaster
-%{_libdir}/%{name}/libexec/gnunet-service-zonemaster-monitor
 %{_libdir}/%{name}/libexec/gnunet-timeout
 %{_libdir}/%{name}/libexec/gnunet-cmds-helper
 %{_libdir}/%{name}/libexec/gnunet-service-messenger
@@ -556,7 +560,6 @@ touch ~/.config/gnunet.conf
 %{_datadir}/%{name}/services/systemd/gnunet.service
 %{_datadir}/%{name}/testing_hostkeys.ecc
 %{_datadir}/applications/gnunet-uri.desktop
-%{_mandir}/man1/gnunet.1.gz
 %{_mandir}/man1/gnunet-ats.1.gz
 %{_mandir}/man1/gnunet-auto-share.1.gz
 %{_mandir}/man1/gnunet-bcd.1.gz
@@ -609,7 +612,7 @@ touch ~/.config/gnunet.conf
 %{_unitdir}/%{name}.service
 %{_userunitdir}/%{name}-user.service
 %{_sysconfdir}/gnunet.conf
-%{_sysconfdir}/NetworkManager/dispatcher.d/10-dns2gns.sh
+#%{_sysconfdir}/NetworkManager/dispatcher.d/10-dns2gns.sh
 
 %files devel
 %{_libdir}/libgnunetblockgroup.so
@@ -923,27 +926,9 @@ touch ~/.config/gnunet.conf
 %{_mandir}/man1/gnunet-bugreport.1.gz
 %{_mandir}/man1/gnunet-config.1.gz
 %{_mandir}/man1/gnunet-ecc.1.gz
-%{_mandir}/man1/gana.1.gz
-%{_mandir}/man1/gnunet-dev.1.gz
 %{_mandir}/man1/gnunet-namestore-dbtool.1.gz
-%{_mandir}/man1/lsd.1.gz
-%{_mandir}/man2/gana.2.gz
-%{_mandir}/man2/gnunet-dev.2.gz
-%{_mandir}/man2/gnunet.2.gz
-%{_mandir}/man3/gana.3.gz
-%{_mandir}/man3/gnunet-dev.3.gz
-%{_mandir}/man3/gnunet.3.gz
-%{_mandir}/man4/gana.4.gz
-%{_mandir}/man4/gnunet-dev.4.gz
-%{_mandir}/man4/gnunet.4.gz
-%{_mandir}/man5/gana.5.gz
-%{_mandir}/man5/gnunet-dev.5.gz
-%{_mandir}/man5/gnunet.5.gz
-%{_mandir}/man6/gnunet-dev.6.gz
-%{_mandir}/man6/gnunet.6.gz
-%{_mandir}/man7/gnunet.7.gz
-%{_mandir}/man8/gnunet.8.gz
-%{_mandir}/man9/gnunet.9.gz
+%{_mandir}/man1/gnunet-namestore-zonefile.1.gz
+
 
 %changelog
 #* XXX XXX XX XXXX Martin Schanzenbach <schanzen@gnunet.org> - 0.18.0