From 60cb231cdf335312f014c5a17e01ee2b6a31c58b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 11 2018 06:52:34 +0000
Subject: import rh-dotnet20-curl-7.47.1-1.4.el7


---

diff --git a/SOURCES/0103-curl-7.47.1-httpd24.patch b/SOURCES/0103-curl-7.47.1-httpd24.patch
deleted file mode 100644
index 9bc642c..0000000
--- a/SOURCES/0103-curl-7.47.1-httpd24.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c06de94bece991a3c9bb5911f6fde74c0dbbb342 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Tue, 9 Feb 2016 15:11:18 +0100
-Subject: [PATCH] use the httpd24 tag for libcurl.so
-
----
- lib/Makefile.am | 2 +-
- lib/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 6f5317a..aac224e 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -103,7 +103,7 @@ AM_LDFLAGS =
- AM_CFLAGS =
- 
- libcurl_la_CPPFLAGS_EXTRA =
--libcurl_la_LDFLAGS_EXTRA =
-+libcurl_la_LDFLAGS_EXTRA = -release httpd24
- libcurl_la_CFLAGS_EXTRA =
- 
- if CURL_LT_SHLIB_USE_VERSION_INFO
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 4478d64..f00262d 100644
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -647,7 +647,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl -I$(top_builddir)/include \
- AM_LDFLAGS = 
- AM_CFLAGS = 
- libcurl_la_CPPFLAGS_EXTRA = $(am__append_6) $(am__append_7)
--libcurl_la_LDFLAGS_EXTRA = $(am__append_2) $(am__append_3) \
-+libcurl_la_LDFLAGS_EXTRA = -release httpd24 $(am__append_2) $(am__append_3) \
- 	$(am__append_4) $(am__append_5)
- libcurl_la_CFLAGS_EXTRA = $(am__append_8)
- libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA)
--- 
-2.5.0
-
diff --git a/SPECS/curl.spec b/SPECS/curl.spec
index d882471..5ea659c 100644
--- a/SPECS/curl.spec
+++ b/SPECS/curl.spec
@@ -7,7 +7,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: %{?scl_prefix}curl
 Version: 7.47.1
-Release: 1.3%{?dist}
+Release: 1.4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{pkg_name}-%{version}.tar.lzma
@@ -19,9 +19,6 @@ Patch101: 0101-curl-7.32.0-multilib.patch
 # prevent configure script from discarding -g in CFLAGS (#496778)
 Patch102: 0102-curl-7.36.0-debug.patch
 
-# use the httpd24 tag for libcurl.so
-Patch103: 0103-curl-7.47.1-httpd24.patch
-
 # use localhost6 instead of ip6-localhost in the curl test-suite
 Patch104: 0104-curl-7.19.7-localhost6.patch
 
@@ -132,9 +129,6 @@ cd %{pkg_name}-%{version}
 %patch104 -p1
 %patch107 -p1
 
-# RHSCL patches
-%patch103 -p1
-
 # disable test 1112 (#565305) and test 1801
 # <https://github.com/bagder/curl/commit/21e82bd6#commitcomment-12226582>
 printf "1112\n1801\n" >> tests/data/DISABLED
@@ -251,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Jun 25 2018 Omair Majid <omajid@redhat.com> - 7.47.1-1.4
+- Don't use the httpd24 tag for libcurl.so
+- Resolves: rhbz#1549574
+
 * Fri Jul 14 2017 Omair Majid <omajid@redhat.com> - 7.47.1-1.3
 - Fix path names to make debuginfo parallel installable