[httpcomponents-client] Update to upstream version 4.4

Mikolaj Izdebski mizdebsk at fedoraproject.org
Wed Feb 18 20:40:54 UTC 2015


commit 366cf718eaf10f76a5b9362a0afa0ddb1448f812
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Feb 18 21:36:06 2015 +0100

    Update to upstream version 4.4

 .gitignore                                         |    1 +
 ...se-system-copy-of-effective_tld_names.dat.patch |    6 +++---
 httpcomponents-client.spec                         |    9 ++++++---
 sources                                            |    2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 789ede1..eb00859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ httpcomponents-client-4.1-src.tar.gz
 /httpcomponents-client-4.3.5-src.tar.gz
 /httpcomponents-client-4.4-beta1-src.tar.gz
 /effective_tld_names.dat
+/httpcomponents-client-4.4-src.tar.gz
diff --git a/0001-Use-system-copy-of-effective_tld_names.dat.patch b/0001-Use-system-copy-of-effective_tld_names.dat.patch
index 87df41d..c3a84a6 100644
--- a/0001-Use-system-copy-of-effective_tld_names.dat.patch
+++ b/0001-Use-system-copy-of-effective_tld_names.dat.patch
@@ -1,4 +1,4 @@
-From b4954ca99dcc6daa344c9223a5997487e0806605 Mon Sep 17 00:00:00 2001
+From 52ebf0fdea572cb42fdf415baab346e2057594c7 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Tue, 20 Jan 2015 16:04:31 +0100
 Subject: [PATCH] Use system copy of effective_tld_names.dat
@@ -8,7 +8,7 @@ Subject: [PATCH] Use system copy of effective_tld_names.dat
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
-index 173763a..d792eca 100644
+index 9017406..d792eca 100644
 --- a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
 +++ b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
 @@ -80,11 +80,10 @@ public final class PublicSuffixMatcherLoader {
@@ -16,7 +16,7 @@ index 173763a..d792eca 100644
              synchronized (PublicSuffixMatcherLoader.class) {
                  if (DEFAULT_INSTANCE == null){
 -                    final URL url = PublicSuffixMatcherLoader.class.getResource(
--                            "mozilla/public-suffix-list.txt");
+-                            "/mozilla/public-suffix-list.txt");
 -                    if (url != null) {
 +                    final File file = new File("/usr/share/publicsuffix/effective_tld_names.dat");
 +                    if (file.exists()) {
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 19b08de..9376d44 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -3,10 +3,10 @@
 Name:              httpcomponents-client
 Summary:           HTTP agent implementation based on httpcomponents HttpCore
 Version:           4.4
-Release:           0.3.beta1%{?dist}
+Release:           1%{?dist}
 License:           ASL 2.0
 URL:               http://hc.apache.org/
-Source0:           http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-beta1-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
 
@@ -48,7 +48,7 @@ Summary:        API documentation for %{name}
 %{summary}.
 
 %prep
-%setup -q -n %{name}-%{version}-beta1
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 
 # Don't install javadoc and sources jars
@@ -140,6 +140,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Feb 18 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 4.4-1
+- Update to upstream version 4.4
+
 * Thu Jan 22 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 4.4-0.3.beta1
 - Split httpclient-cache into subpackage
 
diff --git a/sources b/sources
index 6813e0b..a4ccbf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a1b26a5a10384a02016d072ee0fea98  httpcomponents-client-4.4-beta1-src.tar.gz
+befd6f1f9ad1cf642581f31b63ae559e  httpcomponents-client-4.4-src.tar.gz


More information about the scm-commits mailing list