rpms/httpcomponents-client
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build with httpcomponents-core-4.4.5

Browse Source
This commit is contained in:
Michael Simacek 2016-06-24 10:34:04 +02:00
parent 079850c94d
commit 8e3a101cea
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Use-system-copy-of-effective_tld_names.dat.patch
View File

@ -1,7 +1,7 @@
From aa26c8d92170f5ec9c94063f01679bde15e736c9 Mon Sep 17 00:00:00 2001 From f4d129a1c230f559ada08070927db6edc900cd01 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Jan 2015 16:04:31 +0100 Date: Tue, 20 Jan 2015 16:04:31 +0100
Subject: [PATCH] Use system copy of effective_tld_names.dat Subject: [PATCH 1/2] Use system copy of effective_tld_names.dat
--- ---
.../java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java | 7 +++---- .../java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java | 7 +++----
@ -27,5 +27,5 @@ index 5a25b46..f5b5b45 100644
// Should never happen // Should never happen
final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class); final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class);
-- --
2.5.0 2.7.4

8
httpcomponents-client.spec
View File

@ -7,12 +7,14 @@
Name: httpcomponents-client Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.5.2 Version: 4.5.2
Release: 3%{?dist} Release: 4%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: http://hc.apache.org/ URL: http://hc.apache.org/
Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz
Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch
# Some compile-time only annotations were removed from httpcore
Patch1: 0002-Remove-missing-compile-time-annotations.patch
BuildArch: noarch BuildArch: noarch
@ -58,6 +60,7 @@ Summary: API documentation for %{name}
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
# Don't install javadoc and sources jars # Don't install javadoc and sources jars
%mvn_package ":{*}::{sources,javadoc}:" __noinstall %mvn_package ":{*}::{sources,javadoc}:" __noinstall
@ -174,6 +177,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt
%changelog %changelog
* Fri Jun 24 2016 Michael Simacek <msimacek@redhat.com> - 4.5.2-4
- Fix build with httpcomponents-core-4.4.5
* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.2-3 * Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.2-3
- Add missing build-requires - Add missing build-requires