From a8aafd868fa1c48fb778734e8bfdea8d996e6e02 Mon Sep 17 00:00:00 2001
From: Thomas Crain <thcrain@microsoft.com>
Date: Wed, 14 Oct 2020 09:00:22 -0700
Subject: [PATCH 1/3] Update libestr.spec

---
 SPECS/libestr/libestr.spec | 55 +++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/SPECS/libestr/libestr.spec b/SPECS/libestr/libestr.spec
index a7c4e8406e4..a50f6945c80 100644
--- a/SPECS/libestr/libestr.spec
+++ b/SPECS/libestr/libestr.spec
@@ -1,21 +1,22 @@
-Summary:	String handling essentials library
-Name:		libestr
-Version:	0.1.10
-Release:        4%{?dist}
-License:	LGPLv2+
-URL:		http://libestr.adiscon.com/
-Source0:	http://libestr.adiscon.com/files/download/%{name}-%{version}.tar.gz
-%define sha1 libestr=35cc717f5ae737a28140dd1472e13ce2ec317c6c
-Group:		System Environment/Base
+Summary:        String handling essentials library
+Name:           libestr
+Version:        0.1.10
+Release:        5%{?dist}
+License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+Group:          System Environment/Base
+URL:            https://libestr.adiscon.com/
+Source0:        http://%{name}.adiscon.com/files/download/%{name}-%{version}.tar.gz
+BuildRequires:  gcc
+
 %description
 This package compiles the string handling essentials library
 used by the Rsyslog daemon.
 
 %package devel
-Summary:	Development libraries for string handling
-Requires:	libestr
+Summary:        Development libraries for string handling
+Requires:       libestr
 
 %description devel
 The package contains libraries and header files for
@@ -23,33 +24,45 @@ developing applications that use libestr.
 
 %prep
 %setup -q
+
 %build
-./configure \
-	--prefix=%{_prefix}
+%configure
 make %{?_smp_mflags}
+
 %install
 make DESTDIR=%{buildroot} install
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %license COPYING
 %{_libdir}/*.so.*
 %{_libdir}/*.a
-%{_libdir}/*.la
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+
 %changelog
-* Sat May 09 00:21:00 PST 2020 Nick Samson <nisamson@microsoft.com> - 0.1.10-4
+* Mon Oct 12 2020 Thomas Crain <thcrain@microsoft.com> - 0.1.10-5
+- Remove %sha1 line
+- Lint to Mariner style
+- Remove *.la files
+- License verified.
+
+* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 0.1.10-4
 - Added %%license line automatically
 
-*   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.1.10-3
--   Initial CBL-Mariner import from Photon (license: Apache2).
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.1.10-2
--	GA - Bump release of all rpms
-*	Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 0.1.10-1
--	Initial build. First version
+* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> - 0.1.10-3
+- Initial CBL-Mariner import from Photon (license: Apache2).
+
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 0.1.10-2
+- GA - Bump release of all rpms
+
+* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> - 0.1.10-1
+- Initial build. First version

From 8f3b3aaad1c43e6ac54850653dbe5f24c9106611 Mon Sep 17 00:00:00 2001
From: Thomas Crain <thcrain@microsoft.com>
Date: Thu, 15 Oct 2020 10:44:15 -0700
Subject: [PATCH 2/3] Fix formatting err

---
 SPECS/libestr/libestr.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SPECS/libestr/libestr.spec b/SPECS/libestr/libestr.spec
index a50f6945c80..11e88050519 100644
--- a/SPECS/libestr/libestr.spec
+++ b/SPECS/libestr/libestr.spec
@@ -33,8 +33,8 @@ make %{?_smp_mflags}
 make DESTDIR=%{buildroot} install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)

From 9a19882b2496c7ee668131898ef308bab6cc81e3 Mon Sep 17 00:00:00 2001
From: Thomas Crain <thcrain@microsoft.com>
Date: Thu, 15 Oct 2020 12:57:07 -0700
Subject: [PATCH 3/3] Formatting issue

---
 SPECS/libestr/libestr.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SPECS/libestr/libestr.spec b/SPECS/libestr/libestr.spec
index 11e88050519..e0dcc6a8a1d 100644
--- a/SPECS/libestr/libestr.spec
+++ b/SPECS/libestr/libestr.spec
@@ -50,7 +50,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %changelog
 * Mon Oct 12 2020 Thomas Crain <thcrain@microsoft.com> - 0.1.10-5
-- Remove %sha1 line
+- Remove %%sha1 line
 - Lint to Mariner style
 - Remove *.la files
 - License verified.