From a48a097f31bd0e5d2181665fe742db428186a3c5 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Feb 20 2019 14:16:12 +0000
Subject: fix RHBZ#1678932


---

diff --git a/SOURCES/curlbuild.h b/SOURCES/curlbuild.h
deleted file mode 100644
index b488626..0000000
--- a/SOURCES/curlbuild.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/SPECS/curl.spec b/SPECS/curl.spec
index a1395e6..1430aa6 100644
--- a/SPECS/curl.spec
+++ b/SPECS/curl.spec
@@ -7,11 +7,10 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: %{?scl_prefix}curl
 Version: 7.61.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{pkg_name}-%{version}.tar.gz
-Source2: curlbuild.h
 
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
@@ -182,6 +181,8 @@ make %{?_smp_mflags} V=1
 
 %install
 %{?scl:scl enable %{scl} - << \EOF}
+set -ex
+
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
@@ -195,18 +196,6 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 install -d $RPM_BUILD_ROOT%{_datadir}/aclocal
 install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
 
-# Make libcurl-devel multilib-ready (bug #488922)
-%if 0%{?__isa_bits} == 64
-%global _curlbuild_h curlbuild-64.h
-%else
-%global _curlbuild_h curlbuild-32.h
-%endif
-mv $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h \
-   $RPM_BUILD_ROOT%{_includedir}/curl/%{_curlbuild_h}
-
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h
-
-mv %{buildroot}%{_libdir}/pkgconfig/libcurl.pc %{buildroot}%{_libdir}/pkgconfig/%{scl_prefix}libcurl.pc
 %{?scl:EOF}
 
 %clean
@@ -242,6 +231,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Feb 19 2019 Omair Majid <omajid@redhat.com> - 7.61.1-2
+- Fix %%install section to fail if any command errors out
+- Do not try and install a non-existant curlbuild.h file
+- Resolves: RHBZ#1678932
+
 * Fri Nov 16 2018 Omair Majid <omajid@redhat.com> - 7.61.1-1
 - Build for .NET Core 2.2
 - Resolves: RHBZ#1649584