Merge more hunks

1 files changed, 26 insertions, 1 deletions

diff --git a/rpmbuild/SPECS/gnunet-fedora.spec b/rpmbuild/SPECS/gnunet-fedora.spec
index 732539b..c2ad348 100644
--- a/rpmbuild/SPECS/gnunet-fedora.spec
+++ b/rpmbuild/SPECS/gnunet-fedora.spec
@@ -17,12 +17,17 @@ URL:            https://%{name}.org
 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
@@ -52,6 +57,10 @@ BuildRequires:  pkgconf
 BuildRequires:  libgsf
 ##BuildRequires:  libltdl7
 BuildRequires:  chrpath
+<<<<<<< HEAD
+=======
+BuildRequires:  pkgconfig
+>>>>>>> subpkg
 # The following package required adding a repo to Tumbleweed:
 #BuildRequires:  libextractor
 #Requires:
@@ -148,6 +157,10 @@ libtool --finish %{buildroot}/%{_libdir}/%{name}/nss
 mv %{buildroot}/%{buildroot}/share/* %{buildroot}/%{_datadir}/
 rm -rf %{buildroot}/%{buildroot}
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+rm -rf %{buildroot}/%{name}-%{version}
+>>>>>>> subpkg
 =======
 rm -rf %{buildroot}/%{name}-%{version}
 >>>>>>> subpkg
@@ -240,6 +253,7 @@ 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
@@ -340,6 +354,8 @@ 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
@@ -439,6 +455,9 @@ 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/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
@@ -462,11 +481,16 @@ touch /etc/gnunet/gnunet.conf
 %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
@@ -630,7 +654,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
@@ -1190,3 +1214,4 @@ touch /etc/gnunet/gnunet.conf
 %changelog
 * Sun Dec 1 2019 Joseph Burchetta <joseph@seattlemesh.net> - 0.11.8-0-1550
 - First GNUnet RPM
+