Merge branch 'subpkg-merge'

3 files changed, 333 insertions, 95 deletions

diff --git a/.copr/Makefile b/.copr/Makefile
new file mode 100644
index 0000000..963a194
--- /dev/null
+++ b/.copr/Makefile
@@ -0,0 +1,8 @@
+srpm:
+        dnf -y install libtool libtool-ltdl libtool-ltdl-devel autoconf make \
+                        texinfo gettext gcc openssl libgcrypt-devel \
+                        libunistring-devel miniupnpc libidn-devel zlib-devel \
+                        jansson-devel gnutls-devel libsqlite3x \
+                        libmicrohttpd-devel opus-devel libogg-devel sqlite-devel \
+                        zbar-devel gnutls-dane glibc pkgconf libgsf chrpath
+        rpmbuild -ba gnunet-fedora.spec
diff --git a/rpmbuild/SPECS/gnunet-fedora.spec b/rpmbuild/SPECS/gnunet-fedora.spec
index 87ec40d..ec50eb9 100644
--- a/rpmbuild/SPECS/gnunet-fedora.spec
+++ b/rpmbuild/SPECS/gnunet-fedora.spec
@@ -1,22 +1,29 @@
+%define gnunetuser gnunet
+%define gnunethome %{_sharedstatedir}/%{name}
+
+
 Name:           gnunet
-Version:        0.11.8
+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
-BuildRequires:  libtool
+#%define         SHA512SUM0 bcdcd9452a905dcc0c474517f2941ae5822bda23e918c4ba5d61d085016d69eba5b1477bb30cf8179a6d6290898ea23ec485e3f1acfb3cf4ed0979ce8054af7e
+%define         SHA512SUM0 210a9f06679d32dbb399a056e7a20e411cbfacf7945a282bd7e63eb8bfd7a324815efc48caedff32894d0a3f7a4ba9d1e879e2e04db0222282399ae6fc065c7b
+BuildRequires:  libtool
+BuildRequires:  libtool-ltdl
+BuildRequires:  libtool-ltdl-devel
 BuildRequires:  autoconf
 BuildRequires:  make
-BuildRequires:  makeinfo
-BuildRequires:  gettext-tools
+BuildRequires:  texinfo
+BuildRequires:  gettext
 BuildRequires:  gcc
 BuildRequires:  openssl
 BuildRequires:  libgcrypt-devel
@@ -25,25 +32,27 @@ BuildRequires:  miniupnpc
 BuildRequires:  libidn-devel
 BuildRequires:  zlib-devel
 #BuildRequires:  libglpk40
-BuildRequires:  libjansson-devel
-BuildRequires:  libgnutls-devel
-BuildRequires:  libsqlite3-0
+BuildRequires:  jansson-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  libsqlite3x
 BuildRequires:  libmicrohttpd-devel
-BuildRequires:  libopus-devel
-BuildRequires:  libpulse-devel
+BuildRequires:  opus-devel
+##BuildRequires:  pulse-devel
 BuildRequires:  libogg-devel
-BuildRequires:  sqlite3-devel
-BuildRequires:  libzbar-devel
-BuildRequires:  libgnutls-dane-devel
+BuildRequires:  sqlite-devel
+BuildRequires:  zbar-devel
+BuildRequires:  gnutls-dane
 BuildRequires:  glibc
 BuildRequires:  pkgconf
 BuildRequires:  libgsf
-BuildRequires:  libltdl7
+##BuildRequires:  libltdl7
+BuildRequires:  chrpath
+BuildRequires:  pkgconfig
 # 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
@@ -78,14 +87,25 @@ echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
 
 %build
 #%configure 
-%configure --disable-rpath 
+#%configure --disable-rpath 
 #--prefix=%{_prefix}
-#./configure 
+./configure --prefix=/usr --libdir=/lib64 --disable-rpath --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make clean
 %{make_build} 
 
+%pre
+/usr/sbin/groupadd -r %{name}
+/usr/sbin/groupadd -r %{name}dns
+/usr/sbin/useradd -r -g %{name} -G %{name}dns -m --base-dir %{gnunethome}  %{gnunetuser}
+
 %install
+#find %{buildroot} -type f -name '*.la' -delete
 rm -rf $RPM_BUILD_ROOT
-#cp -r %{_builddir}/* %{buildroot}/
+mkdir -p %{buildroot}/%{_sharedstatedir}/%{name}
+mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
+cp -r %{_builddir}/* %{buildroot}/
 #mkdir -p %{buildroot}/%{_datadir}/%{name}
 #mkdir -p %{buildroot}/%{_datadir}/%{name}/config.d
 #mkdir -p %{buildroot}/%{_oldincludedir}/%{name}
@@ -97,11 +117,12 @@ rm -rf $RPM_BUILD_ROOT
 #%{make_install} PREFIX=%{_prefix} INSTALL=%{__install}
 ##%{make_build}
 #make clean
-#autoreconf
 #mkdir -p %{buildroot}/{%_libdir}
 #mkdir -p %{buildroot}/{%_libdir}/%{name}
-%{make_install}
+#./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/
@@ -113,23 +134,129 @@ rm -rf $RPM_BUILD_ROOT
 # BINDIR=%{buildroot}/%{_bindir}
 #make install DESTDIR=$RPM_BUILD_ROOT
 find %{buildroot} -type f | xargs sed -i "s|%{buildroot}||g"
-libtool --finish %{buildroot}/%{_libdir}
+####libtool --finish %{buildroot}/%{_libdir}
+#mv %{buildroot}/%{_libdir}/libgnunetnt.la %{buildroot}/local/lib/libgnunetnt.la
 libtool --finish %{buildroot}/%{_libdir}/%{name}
 libtool --finish %{buildroot}/%{_libdir}/%{name}/nss
+#libtool --finish %{buildroot}/%{_libdir}/pkconfig
+#libtool --finish %{buildroot}/%{_usr}/local/lib
+#libtool --finish %{buildroot}/%{_usr}/local/lib/%{name}
 mv %{buildroot}/%{buildroot}/share/* %{buildroot}/%{_datadir}/
 rm -rf %{buildroot}/%{buildroot}
+rm -rf %{buildroot}/%{name}-%{version}
+#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*
+#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/${name}/*
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetconsensus.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetvpn.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetblockgroup.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunethello.so.0.1.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettransportcommunicator.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetfs.so.2.1.1 
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettransportcore.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetjson.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetnse.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetregex.so.3.0.1
+#chrpath --delete %{buildroot}/%{_libdir}/libgnunetcore.so.0.0.1
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetpeerinfo.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetnt.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettesting.so.1.1.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetreclaim.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetcadet.so.7.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetarm.so.2.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetdht.so.3.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettestbed.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetdatastore.so.1.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettransportmonitor.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetrevocation.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetats.so.4.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettransporttesting.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetfriends.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetnamestore.so.0.0.1
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetdatacache.so.0.0.1
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettransportapplication.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetnatnew.so.2.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetblock.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetfs.so.2.1.1
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetdns.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetscalarproduct.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetsq.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetfragmentation.so.2.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetregexblock.so.1.0.0
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_gns.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_regex.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_datacache_sqlite.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_datastore_sqlite.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_fs.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_dns.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_peerinfo.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_gns.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_gns.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_datacache_heap.so 
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_dns.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_reclaim_attribute_gnuid.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_namestore.so 
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_copying.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_test.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_transport_https_server.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_consensus.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_set_test.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_dht.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_datastore_heap.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_reclaim.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_namecache_sqlite.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_namestore_sqlite.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_ats_proportional.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_block_revocation.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_transport_unix.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_config.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_openid_connect.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_peerstore_sqlite.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_transport_http_server.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_namestore_flat.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_gnsrecord_reclaim.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_transport_tcp.so
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/libgnunet_plugin_rest_identity.so
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetidentity.so.1.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettransport.so.2.2.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettransporttesting2.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetnatauto.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetpeerstore.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetatstesting.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetgns.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunettestbedlogger.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetset.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetrest.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetreclaimattribute.so.0.0.0
+chrpath --delete %{buildroot}/%{_libdir}/libgnunetnamecache.so.0.0.0
+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
+#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
+#chrpath --delete %{buildroot}/usr/lib64/libgnunetconversation.so.0.0.0
+#chrpath --delete %{buildroot}/usr/lib64/gnunet/libgnunet_plugin_datastore_mysql.so
+#chrpath --delete %{buildroot}/usr/lib64/gnunet/libgnunet_plugin_gnsrecord_conversation.so
+#chrpath --delete %{buildroot}/usr/lib64/libgnunetmysql.so.0.0.0
+#chrpath --delete %{buildroot}/usr/lib64/libgnunetmicrophone.so.0.0.0
+
 %check
 #make check
 
 %post
-mkdir -p /etc/gnunet
+#mkdir -p /etc/gnunet
 touch /etc/gnunet/gnunet.conf
 
 %clean
 
 %files
-%license COPYING
-%doc doc
+%attr(0700, %{gnunetuser}, %{gnunetuser})
+%dir %{gnunethome}
+%license %{_datadir}/%{name}/LICENSE
+%doc %{_defaultdocdir}/%{name}/COPYING
+%doc doc AUTHORS ChangeLog NEWS README
+#%config %{_sysconfdir}/gnunet.conf
 %{_bindir}/gnunet-ats
 %{_bindir}/gnunet-arm
 %{_bindir}/gnunet-auto-share
@@ -138,8 +265,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
@@ -291,7 +418,7 @@ touch /etc/gnunet/gnunet.conf
 %{_oldincludedir}/%{name}/gnunet_util_lib.h
 %{_oldincludedir}/%{name}/gnunet_vpn_service.h
 %{_oldincludedir}/%{name}/platform.h
-%dir /%{_libdir}
+#%dir /%{_libdir}
 /%{_libdir}/pkgconfig/gnunetarm.pc
 /%{_libdir}/pkgconfig/gnunetats.pc
 /%{_libdir}/pkgconfig/gnunetblock.pc
@@ -339,8 +466,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
@@ -354,7 +481,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
@@ -417,8 +544,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
@@ -459,8 +586,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
@@ -498,10 +625,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
@@ -554,10 +681,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
@@ -626,10 +753,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
@@ -686,7 +813,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
@@ -694,7 +821,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
@@ -739,49 +866,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
@@ -835,10 +930,52 @@ 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
 
 
 
 %changelog
 * Sun Dec 1 2019 Joseph Burchetta <joseph@seattlemesh.net> - 0.11.8-0-1550
 - First GNUnet RPM
+
diff --git a/rpmbuild/SPECS/gnunet-suse.spec b/rpmbuild/SPECS/gnunet-suse.spec
index 87ec40d..7a0d3cc 100644
--- a/rpmbuild/SPECS/gnunet-suse.spec
+++ b/rpmbuild/SPECS/gnunet-suse.spec
@@ -1,3 +1,6 @@
+%define gnunetuser gnunet
+%define gnunethome %{_sharedstatedir}/%{name}
+
 Name:           gnunet
 Version:        0.11.8
 %if %{defined suse_version}
@@ -83,8 +86,15 @@ echo "%SHA512SUM0 %SOURCE0" | sha512sum -c -
 #./configure 
 %{make_build} 
 
+%pre
+/usr/sbin/groupadd -r %{name}
+/usr/sbin/groupadd -r %{name}dns
+/usr/sbin/useradd -r -g %{name} -G %{name}dns -m --base-dir %{gnunethome}  %{gnunetuser}
+
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}/%{_sharedstatedir}/%{name}
+mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
 #cp -r %{_builddir}/* %{buildroot}/
 #mkdir -p %{buildroot}/%{_datadir}/%{name}
 #mkdir -p %{buildroot}/%{_datadir}/%{name}/config.d
@@ -122,14 +132,17 @@ rm -rf %{buildroot}/%{buildroot}
 #make check
 
 %post
-mkdir -p /etc/gnunet
+#mkdir -p /etc/gnunet
 touch /etc/gnunet/gnunet.conf
 
 %clean
 
 %files
+%attr(0700, %{gnunetuser}, %{gnunetuser})
+%dir %{gnunethome}
 %license COPYING
-%doc doc
+%doc doc AUTHORS ChangeLog NEWS README
+#%config %{_sysconfdir}/gnunet.conf
 %{_bindir}/gnunet-ats
 %{_bindir}/gnunet-arm
 %{_bindir}/gnunet-auto-share
@@ -833,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