From de633fbd27c243cfb5698e5892e541892ad3679e Mon Sep 17 00:00:00 2001
From: virtbuilder_pel7x64builder0 <virtbuilder@powerel.org>
Date: Sat, 21 Sep 2019 21:15:35 +0200
Subject: [PATCH] slirp4netdns package update

Signed-off-by: virtbuilder_pel7x64builder0 <virtbuilder@powerel.org>
---
 SPECS/slirp4netns.spec | 49 ++++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/SPECS/slirp4netns.spec b/SPECS/slirp4netns.spec
index 2562f8c..fd35104 100644
--- a/SPECS/slirp4netns.spec
+++ b/SPECS/slirp4netns.spec
@@ -1,20 +1,34 @@
 %global git0 https://github.com/rootless-containers/%{name}
+<<<<<<< HEAD
 %global commit0 19d199a6ca424fcf9516320a327cedad85cf4dfb
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+||||||| merged common ancestors
+%global commit0 30883b5aef81510915ca0e0b28072e809172e1f6
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+=======
+>>>>>>> slirp4netdns package update
 
 # Used for comparing with latest upstream tag
 # to decide whether to autobuild (non-rawhide only)
 %global built_tag v0.4.0-beta.2
 
 Name: slirp4netns
+<<<<<<< HEAD
 Version: 0.4.0
 Release: 4.git%{shortcommit0}%{?dist}
+||||||| merged common ancestors
+Version: 0.3.0
+Release: 1.alpha.2.git%{shortcommit0}%{?dist}
+=======
+Version: 0.3.2
+Release: 1%{?dist}
+>>>>>>> slirp4netdns package update
 # no go-md2man in ppc64
 #ExcludeArch: ppc64
 Summary: slirp for network namespaces
 License: GPLv2
-URL: %{git0}
-Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+URL: https://github.com/rootless-containers/slirp4netns/
+Source0: https://github.com/rootless-containers/slirp4netns/archive/v%{version}.tar.gz
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gcc
@@ -30,36 +44,42 @@ slirp for network namespaces, without copying buffers across the namespaces.
 %package devel
 Summary: %{summary}
 BuildArch: noarch
-
 %description devel
 %{summary}
-
 This package contains library source intended for
 building other packages which use import path with
 %{import_path} prefix.
 
+
 %prep
-%autosetup -Sgit -n %{name}-%{commit0}
+%autosetup -Sgit -n %{name}-%{version}
+
 
 %build
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+export GCCFLAGS="%{optflags}"
 ./autogen.sh
 ./configure --prefix=%{_usr} --libdir=%{_libdir}
 %{__make} generate-man
 
+
 %install
 make DESTDIR=%{buildroot} install install-man
 
-%check
 
+%check
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
+
 %files
 %license COPYING
 %doc README.md
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 
+<<<<<<< HEAD
 %changelog
 * Wed Jul 31 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.4.0-4.git19d199a
 - BR: libcap-devel
@@ -80,13 +100,14 @@ make DESTDIR=%{buildroot} install install-man
 
 * Sun Feb 17 2019 Dan Walsh <dwalsh@fedoraproject.org> - v0.3.0-alpha.2
 - Latest release
+||||||| merged common ancestors
+%changelog
+* Wed Feb 27 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.3.0-1.alpha.2
+- make version tag consistent with upstream
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-3.dev.git0037042
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Aug 20 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.1-2.dev.git0037042
-- built 0037042
+* Sun Feb 17 2019 Dan Walsh <dwalsh@fedoraproject.org> - v0.3.0-alpha.2
+- Latest release
+=======
+>>>>>>> slirp4netdns package update
 
-* Fri Jul 27 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.1-1.dev.gitc4e1bc5
-- Resolves: #1609595 - initial upload
-- First package for Fedora
+%changelog