commit 1ce5b20d34aa51f12cfe8cd777ba7516faea092b
parent 204f7e2e93009936e6a9a66f903d9f3ad231a868
Author: Yosl <yosl@seattlemesh.net>
Date: Mon, 17 Feb 2020 18:41:52 -0800
naively resolve merge conflicts
Diffstat:
1 file changed, 0 insertions(+), 236 deletions(-)
diff --git a/rpmbuild/SPECS/gnunet-fedora.spec b/rpmbuild/SPECS/gnunet-fedora.spec
@@ -16,18 +16,8 @@ URL: https://%{name}.org
%undefine _disable_source_fetch
Source0: https://ftpmirror.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
#%define SHA512SUM0 bcdcd9452a905dcc0c474517f2941ae5822bda23e918c4ba5d61d085016d69eba5b1477bb30cf8179a6d6290898ea23ec485e3f1acfb3cf4ed0979ce8054af7e
-<<<<<<< HEAD
-<<<<<<< HEAD
-%define SHA512SUM0 210a9f06679d32dbb399a056e7a20e411cbfacf7945a282bd7e63eb8bfd7a324815efc48caedff32894d0a3f7a4ba9d1e879e2e04db0222282399ae6fc065c7b
-BuildRequires: libtool
-=======
%define SHA512SUM0 210a9f06679d32dbb399a056e7a20e411cbfacf7945a282bd7e63eb8bfd7a324815efc48caedff32894d0a3f7a4ba9d1e879e2e04db0222282399ae6fc065c7b
BuildRequires: libtool
->>>>>>> subpkg
-=======
-%define SHA512SUM0 210a9f06679d32dbb399a056e7a20e411cbfacf7945a282bd7e63eb8bfd7a324815efc48caedff32894d0a3f7a4ba9d1e879e2e04db0222282399ae6fc065c7b
-BuildRequires: libtool
->>>>>>> subpkg
BuildRequires: libtool-ltdl
BuildRequires: libtool-ltdl-devel
BuildRequires: autoconf
@@ -57,10 +47,7 @@ BuildRequires: pkgconf
BuildRequires: libgsf
##BuildRequires: libltdl7
BuildRequires: chrpath
-<<<<<<< HEAD
-=======
BuildRequires: pkgconfig
->>>>>>> subpkg
# The following package required adding a repo to Tumbleweed:
#BuildRequires: libextractor
#Requires:
@@ -156,14 +143,7 @@ libtool --finish %{buildroot}/%{_libdir}/%{name}/nss
#libtool --finish %{buildroot}/%{_usr}/local/lib/%{name}
mv %{buildroot}/%{buildroot}/share/* %{buildroot}/%{_datadir}/
rm -rf %{buildroot}/%{buildroot}
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-rm -rf %{buildroot}/%{name}-%{version}
->>>>>>> subpkg
-=======
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
@@ -252,213 +232,6 @@ 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
-<<<<<<< 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
-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}/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
-<<<<<<< HEAD
->>>>>>> subpkg
-=======
->>>>>>> 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
@@ -480,17 +253,8 @@ touch /etc/gnunet/gnunet.conf
%files
%attr(0700, %{gnunetuser}, %{gnunetuser})
%dir %{gnunethome}
-<<<<<<< HEAD
-<<<<<<< HEAD
-%license COPYING
-=======
-%license %{_datadir}/%{name}/LICENSE
-%doc %{_defaultdocdir}/%{name}/COPYING
->>>>>>> subpkg
-=======
%license %{_datadir}/%{name}/LICENSE
%doc %{_defaultdocdir}/%{name}/COPYING
->>>>>>> subpkg
%doc doc AUTHORS ChangeLog NEWS README
#%config %{_sysconfdir}/gnunet.conf
%{_bindir}/gnunet-ats
