Staging hunks for merge

2 files changed, 275 insertions, 70 deletions

diff --git a/rpmbuild/SPECS/gnunet-fedora.spec b/rpmbuild/SPECS/gnunet-fedora.spec
index 7109a21..732539b 100644
--- a/rpmbuild/SPECS/gnunet-fedora.spec
+++ b/rpmbuild/SPECS/gnunet-fedora.spec
@@ -5,19 +5,24 @@
 Name:           gnunet
 Version:        0.12.2
 %if %{defined suse_version}
-Release:      1~%{?suse_version}
+Release:        1~%{?suse_version}
 %else
-Release:        1~%{?dist}
+Release:        1~%{?dist}
 %endif
 Summary:        Framework for secure peer-to-peer networking
 License:        AGPL-3.0
-#Group:
-URL:            https://gnunet.org
+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
+<<<<<<< HEAD
 %define         SHA512SUM0 210a9f06679d32dbb399a056e7a20e411cbfacf7945a282bd7e63eb8bfd7a324815efc48caedff32894d0a3f7a4ba9d1e879e2e04db0222282399ae6fc065c7b
 BuildRequires:  libtool
+=======
+%define         SHA512SUM0 210a9f06679d32dbb399a056e7a20e411cbfacf7945a282bd7e63eb8bfd7a324815efc48caedff32894d0a3f7a4ba9d1e879e2e04db0222282399ae6fc065c7b
+BuildRequires:  libtool
+>>>>>>> subpkg
 BuildRequires:  libtool-ltdl
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  autoconf
@@ -50,8 +55,8 @@ BuildRequires:  chrpath
 # The following package required adding a repo to Tumbleweed:
 #BuildRequires:  libextractor
 #Requires:
-#BuildRoot:     %{buildroot}/%{name}-%{version}-%{release}
-#BuildRoot:     %{_buildrootdir}
+#BuildRoot:     %{buildroot}/%{name}-%{version}-%{release}
+#BuildRoot:     %{_buildrootdir}
 
 # Build with the following syntax:
 # rpmbuild --target noarch -bs gnunet.spec
@@ -116,12 +121,12 @@ cp -r %{_builddir}/* %{buildroot}/
 #%{make_install} PREFIX=%{_prefix} INSTALL=%{__install}
 ##%{make_build}
 #make clean
-#autoreconf
 #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/
@@ -142,6 +147,10 @@ libtool --finish %{buildroot}/%{_libdir}/%{name}/nss
 #libtool --finish %{buildroot}/%{_usr}/local/lib/%{name}
 mv %{buildroot}/%{buildroot}/share/* %{buildroot}/%{_datadir}/
 rm -rf %{buildroot}/%{buildroot}
+<<<<<<< HEAD
+=======
+rm -rf %{buildroot}/%{name}-%{version}
+>>>>>>> subpkg
 #chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*
 #chrpath --delete $RPM_BUILD_ROOT%{_libdir}/${name}/*
 chrpath --delete %{buildroot}/%{_libdir}/libgnunetconsensus.so.0.0.0
@@ -230,6 +239,7 @@ 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
+<<<<<<< HEAD
 chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/gnunet-core
 chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/gnunet-service-core
 chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-uri
@@ -329,6 +339,107 @@ chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/gnunet-service-ats
 chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunetats.so.4.0.0
 chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunetats.so.4.0.0
 chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunetats.so.4.0.0
+=======
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/gnunet-core
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/gnunet-service-core
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-uri
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-config
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-qr
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/test_common_logging_dummy
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-config-diff
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-resolver
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-ecc
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-scrypt
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-service-resolver
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunet_plugin_block_dns.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/gnunet-service-dns
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/gnunet-dns-monitor
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdns.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdns.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/gnunet-dns-redirector
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/gnunet-zonewalk
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/pt/.libs/gnunet-daemon-pt
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunet_plugin_transport_tcp.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/gnunet-communicator-unix
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/zonemaster/.libs/gnunet-service-zonemaster-monitor
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/zonemaster/.libs/gnunet-service-zonemaster
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/statistics/.libs/gnunet-service-statistics
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/statistics/.libs/gnunet-statistics
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/statistics/.libs/libgnunetstatistics.so.2.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/json/.libs/libgnunetjson.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunet_plugin_block_dns.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdns.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/statistics/.libs/libgnunetstatistics.so.2.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/json/.libs/libgnunetjson.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunet_plugin_transport_http_server.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunet_plugin_transport_tcp.so
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/libgnunetcore.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransporttesting.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransportapplication.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunet_plugin_transport_unix.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransport.so.2.2.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransporttesting2.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/libgnunetcore.so.0.0.1
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransportmonitor.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunet_plugin_transport_https_server.so
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunet_plugin_transport_udp.so
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunet_plugin_transport_template.so
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/statistics/.libs/libgnunetstatistics.so.0.1.3T
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/statistics/.libs/gnunet-service-statistics
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/statistics/.libs/libgnunetstatistics.so.0.1.3
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/statistics/.libs/gnunet-statistics
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/libgnunetcore.so.0.0.1
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/gnunet-core
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/libgnunetcore.so.0.0.1T
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/core/.libs/gnunet-service-core
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-uri
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-config
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/test_common_logging_dummy
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-config-diff
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-resolver
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-ecc
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-scrypt
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/util/.libs/gnunet-service-resolver
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdnsstub.so.0.0.0T
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunet_plugin_block_dns.so
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdnsparser.so.0.1.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/gnunet-service-dns
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdnsstub.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/gnunet-dns-monitor
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdnsparser.so.0.1.0T
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdns.so.0.0.0
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunetdns.so.0.0.0T
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/libgnunet_plugin_block_dns.soT
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/dns/.libs/gnunet-dns-redirector
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/pt/.libs/gnunet-daemon-pt
+##chrpath --delete %{buildroot}/gnunet-0.12.2/src/my/.libs/libgnunetmy.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/gnunet-service-transport
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunet_plugin_ats_proportional.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunet_plugin_ats_proportional.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunet_plugin_ats_proportional.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunet_plugin_ats_proportional.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunet_plugin_ats_proportional.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/gnunet-service-tng
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransportcommunicator.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransportcommunicator.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransportcore.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/libgnunettransportcore.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/gnunet-transport-profiler
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/gnunet-communicator-udp
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/gnunet-transport
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/transport/.libs/gnunet-communicator-tcp
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/hello/.libs/libgnunethello.so.0.1.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/hello/.libs/libgnunethello.so.0.1.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/hello/.libs/gnunet-hello
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/gnsrecord/.libs/libgnunet_plugin_gnsrecord_dns.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/gnsrecord/.libs/libgnunet_plugin_gnsrecord_dns.so
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/gnsrecord/.libs/libgnunetgnsrecord.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/gnsrecord/.libs/libgnunetgnsrecord.so.0.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/gnunet-service-ats
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunetats.so.4.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunetats.so.4.0.0
+#chrpath --delete %{buildroot}/gnunet-0.12.2/src/ats/.libs/libgnunetats.so.4.0.0
+>>>>>>> subpkg
 #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
@@ -350,7 +461,12 @@ touch /etc/gnunet/gnunet.conf
 %files
 %attr(0700, %{gnunetuser}, %{gnunetuser})
 %dir %{gnunethome}
+<<<<<<< HEAD
 %license COPYING
+=======
+%license %{_datadir}/%{name}/LICENSE
+%doc %{_defaultdocdir}/%{name}/COPYING
+>>>>>>> subpkg
 %doc doc AUTHORS ChangeLog NEWS README
 #%config %{_sysconfdir}/gnunet.conf
 %{_bindir}/gnunet-ats
@@ -361,8 +477,8 @@ touch /etc/gnunet/gnunet.conf
 %{_bindir}/gnunet-cadet
 %{_bindir}/gnunet-config
 %{_bindir}/gnunet-consensus-profiler
-%{_bindir}/gnunet-conversation
-%{_bindir}/gnunet-conversation-test
+#%{_bindir}/gnunet-conversation
+#%{_bindir}/gnunet-conversation-test
 %{_bindir}/gnunet-core
 %{_bindir}/gnunet-datastore
 %{_bindir}/gnunet-dht-get
@@ -562,8 +678,8 @@ 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-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
@@ -577,7 +693,7 @@ touch /etc/gnunet/gnunet.conf
 /%{_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-conversation
 /%{_libdir}/%{name}/libexec/gnunet-service-core
 /%{_libdir}/%{name}/libexec/gnunet-service-datastore
 /%{_libdir}/%{name}/libexec/gnunet-service-dht
@@ -640,8 +756,8 @@ 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_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
@@ -682,8 +798,8 @@ touch /etc/gnunet/gnunet.conf
 /%{_usr}/%{_lib}/%{name}/libgnunet_plugin_transport_https_server.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_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
@@ -721,10 +837,10 @@ 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}/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
@@ -777,10 +893,10 @@ 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}/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
@@ -849,10 +965,10 @@ 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}/libgnunetspeaker.la
+#%{_libdir}/libgnunetspeaker.so
+#%{_libdir}/libgnunetspeaker.so.0
+#%{_libdir}/libgnunetspeaker.so.0.0.0
 %{_libdir}/libgnunetsq.la
 %{_libdir}/libgnunetsq.so
 %{_libdir}/libgnunetsq.so.0
@@ -909,7 +1025,7 @@ touch /etc/gnunet/gnunet.conf
 %{_libdir}/libgnunetvpn.so
 %{_libdir}/libgnunetvpn.so.0
 %{_libdir}/libgnunetvpn.so.0.0.0
-%doc %{_datadir}/doc/%{name}
+#%doc %{_datadir}/doc/%{name}
 #/usr/share/doc/%{name}/README
 %dir %{_datadir}/%{name}/config.d
 %{_datadir}/%{name}/config.d/arm.conf
@@ -917,7 +1033,7 @@ touch /etc/gnunet/gnunet.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/conversation.conf
 %{_datadir}/%{name}/config.d/core.conf
 %{_datadir}/%{name}/config.d/datacache.conf
 %{_datadir}/%{name}/config.d/datastore.conf
@@ -962,49 +1078,17 @@ touch /etc/gnunet/gnunet.conf
 %{_datadir}/%{name}/gnunet-gns-proxy-ca.template
 %{_datadir}/%{name}/gnunet-logo-color.png
 %{_datadir}/%{name}/gnunet-logo.pdf
+%{_datadir}/%{name}/existence.sh
+%{_datadir}/%{name}/existence_python.sh
+%{_datadir}/%{name}/gnunet-logo.png
+%{_datadir}/%{name}/msg.sh
+%{_datadir}/%{name}/progname.sh
+%{_datadir}/%{name}/python.sh
+%{_datadir}/%{name}/version_gnunet.sh
 %{_datadir}/%{name}/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
 %{_datadir}/%{name}/services/openrc/gnunet.initd
 %{_datadir}/%{name}/services/systemd/gnunet.service
 %{_datadir}/%{name}/testing_hostkeys.ecc
-%{_infodir}/gnunet-tutorial.info.gz
-%{_infodir}/gnunet.info-1.gz
-%{_infodir}/gnunet.info-2.gz
-%{_infodir}/gnunet.info-3.gz
-%{_infodir}/gnunet.info.gz
-%{_infodir}/images/daemon_lego_block.png
-%{_infodir}/images/daemon_lego_block.svg.gz
-%{_infodir}/images/gns.dot.gz
-%{_infodir}/images/gns.jpg
-%{_infodir}/images/gnunet-0-10-peerinfo.png
-%{_infodir}/images/gnunet-fs-gtk-0-10-star-tab.png
-%{_infodir}/images/gnunet-gtk-0-10-download-area.png
-%{_infodir}/images/gnunet-gtk-0-10-fs-menu.png
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish-editing.png
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish-select.png
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file.png
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file_0.png
-%{_infodir}/images/gnunet-gtk-0-10-fs-publish.png
-%{_infodir}/images/gnunet-gtk-0-10-fs-published.png
-%{_infodir}/images/gnunet-gtk-0-10-fs-search.png
-%{_infodir}/images/gnunet-gtk-0-10-fs.png
-%{_infodir}/images/gnunet-gtk-0-10-gns-a-done.png
-%{_infodir}/images/gnunet-gtk-0-10-gns-a.png
-%{_infodir}/images/gnunet-gtk-0-10-gns.png
-%{_infodir}/images/gnunet-gtk-0-10-identity.png
-%{_infodir}/images/gnunet-gtk-0-10-search-selected.png
-%{_infodir}/images/gnunet-gtk-0-10-traffic.png
-%{_infodir}/images/gnunet-namestore-gtk-phone.png
-%{_infodir}/images/gnunet-namestore-gtk-vpn.png
-%{_infodir}/images/gnunet-setup-exit.png
-%{_infodir}/images/gnunet-tutorial-service.png
-%{_infodir}/images/gnunet-tutorial-system.png
-%{_infodir}/images/iceweasel-preferences.png
-%{_infodir}/images/iceweasel-proxy.png
-%{_infodir}/images/lego_stack.svg.gz
-%{_infodir}/images/service_lego_block.png
-%{_infodir}/images/service_lego_block.svg.gz
-%{_infodir}/images/service_stack.png
-%{_infodir}/images/structure.dot.gz
 %{_datadir}/locale/de/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/es/LC_MESSAGES/gnunet.mo
 %{_datadir}/locale/fr/LC_MESSAGES/gnunet.mo
@@ -1058,7 +1142,48 @@ touch /etc/gnunet/gnunet.conf
 %{_mandir}/man1/gnunet-vpn.1.gz
 %{_mandir}/man1/gnunet-zoneimport.1.gz
 %{_mandir}/man5/gnunet.conf.5.gz
-
+%{_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
+%{_infodir}/gnunet.info.gz
+%{_infodir}/images/daemon_lego_block.png.gz
+%{_infodir}/images/daemon_lego_block.svg.gz
+%{_infodir}/images/gns.dot.gz
+%{_infodir}/images/gns.jpg.gz
+%{_infodir}/images/gnunet-0-10-peerinfo.png.gz
+%{_infodir}/images/gnunet-fs-gtk-0-10-star-tab.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-download-area.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs-menu.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish-editing.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish-select.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file_0.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs-published.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs-search.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-fs.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-gns-a-done.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-gns-a.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-gns.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-identity.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-search-selected.png.gz
+%{_infodir}/images/gnunet-gtk-0-10-traffic.png.gz
+%{_infodir}/images/gnunet-namestore-gtk-phone.png.gz
+%{_infodir}/images/gnunet-namestore-gtk-vpn.png.gz
+%{_infodir}/images/gnunet-setup-exit.png.gz
+%{_infodir}/images/gnunet-tutorial-service.png.gz
+%{_infodir}/images/gnunet-tutorial-system.png.gz
+%{_infodir}/images/iceweasel-preferences.png.gz
+%{_infodir}/images/iceweasel-proxy.png.gz
+%{_infodir}/images/lego_stack.svg.gz
+%{_infodir}/images/service_lego_block.png.gz
+%{_infodir}/images/service_lego_block.svg.gz
+%{_infodir}/images/service_stack.png.gz
+%{_infodir}/images/structure.dot.gz
 
 
 
diff --git a/rpmbuild/SPECS/gnunet-suse.spec b/rpmbuild/SPECS/gnunet-suse.spec
index c1f420b..7a0d3cc 100644
--- a/rpmbuild/SPECS/gnunet-suse.spec
+++ b/rpmbuild/SPECS/gnunet-suse.spec
@@ -846,6 +846,86 @@ touch /etc/gnunet/gnunet.conf
 %{_mandir}/man1/gnunet-unindex.1.gz
 %{_mandir}/man1/gnunet-uri.1.gz
 %{_mandir}/man1/gnunet-vpn.1.gz
+%{_infodir}/images/gnunet-fs-gtk-0-10-star-tab.png
+%{_infodir}/images/gnunet-gtk-0-10-download-area.png
+%{_infodir}/images/gnunet-gtk-0-10-fs-menu.png
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish-editing.png
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish-select.png
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file.png
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish-with-file_0.png
+%{_infodir}/images/gnunet-gtk-0-10-fs-publish.png
+%{_infodir}/images/gnunet-gtk-0-10-fs-published.png
+%{_infodir}/images/gnunet-gtk-0-10-fs-search.png
+%{_infodir}/images/gnunet-gtk-0-10-fs.png
+%{_infodir}/images/gnunet-gtk-0-10-gns-a-done.png
+%{_infodir}/images/gnunet-gtk-0-10-gns-a.png
+%{_infodir}/images/gnunet-gtk-0-10-gns.png
+%{_infodir}/images/gnunet-gtk-0-10-identity.png
+%{_infodir}/images/gnunet-gtk-0-10-search-selected.png
+%{_infodir}/images/gnunet-gtk-0-10-traffic.png
+%{_infodir}/images/gnunet-namestore-gtk-phone.png
+%{_infodir}/images/gnunet-namestore-gtk-vpn.png
+%{_infodir}/images/gnunet-setup-exit.png
+%{_infodir}/images/gnunet-tutorial-service.png
+%{_infodir}/images/gnunet-tutorial-system.png
+%{_infodir}/images/iceweasel-preferences.png
+%{_infodir}/images/iceweasel-proxy.png
+%{_infodir}/images/lego_stack.svg.gz
+%{_infodir}/images/service_lego_block.png
+%{_infodir}/images/service_lego_block.svg.gz
+%{_infodir}/images/service_stack.png
+%{_infodir}/images/structure.dot.gz
+%{_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/sv/LC_MESSAGES/gnunet.mo
+%{_datadir}/locale/vi/LC_MESSAGES/gnunet.mo
+%{_datadir}/locale/zh_CN/LC_MESSAGES/gnunet.mo
+%{_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-config.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
+%{_mandir}/man1/gnunet-dns2gns.1.gz
+%{_mandir}/man1/gnunet-download.1.gz
+%{_mandir}/man1/gnunet-ecc.1.gz
+%{_mandir}/man1/gnunet-fs.1.gz
+%{_mandir}/man1/gnunet-gns-proxy-setup-ca.1.gz
+%{_mandir}/man1/gnunet-gns-proxy.1.gz
+%{_mandir}/man1/gnunet-gns.1.gz
+%{_mandir}/man1/gnunet-identity.1.gz
+%{_mandir}/man1/gnunet-namecache.1.gz
+%{_mandir}/man1/gnunet-namestore-fcfsd.1.gz
+%{_mandir}/man1/gnunet-namestore.1.gz
+%{_mandir}/man1/gnunet-nat-auto.1.gz
+%{_mandir}/man1/gnunet-nat-server.1.gz
+%{_mandir}/man1/gnunet-nat.1.gz
+%{_mandir}/man1/gnunet-nse.1.gz
+%{_mandir}/man1/gnunet-peerinfo.1.gz
+%{_mandir}/man1/gnunet-publish.1.gz
+%{_mandir}/man1/gnunet-qr.1.gz
+%{_mandir}/man1/gnunet-reclaim.1.gz
+%{_mandir}/man1/gnunet-resolver.1.gz
+%{_mandir}/man1/gnunet-revocation.1.gz
+%{_mandir}/man1/gnunet-scalarproduct.1.gz
+%{_mandir}/man1/gnunet-scrypt.1.gz
+%{_mandir}/man1/gnunet-search.1.gz
+%{_mandir}/man1/gnunet-statistics.1.gz
+%{_mandir}/man1/gnunet-testbed-profiler.1.gz
+%{_mandir}/man1/gnunet-testing-run-service.1.gz
+%{_mandir}/man1/gnunet-timeout.1.gz
+%{_mandir}/man1/gnunet-transport-certificate-creation.1.gz
+%{_mandir}/man1/gnunet-transport.1.gz
+%{_mandir}/man1/gnunet-unindex.1.gz
+%{_mandir}/man1/gnunet-uri.1.gz
+%{_mandir}/man1/gnunet-vpn.1.gz
 %{_mandir}/man1/gnunet-zoneimport.1.gz
 %{_mandir}/man5/gnunet.conf.5.gz