From 4f319933b5cb145db21fc5f72db1900f0fe14dc1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 19 Jan 2015 09:58:56 +0100
Subject: [PATCH] Update to upstream version 4.4 beta1

---
 .gitignore                 |  2 ++
 httpcomponents-client.spec | 38 +++++++++++++++++++++-----------------
 sources                    |  3 ++-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90dc73e..789ede1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ httpcomponents-client-4.1-src.tar.gz
 /httpcomponents-client-4.3.3-src.tar.gz
 /httpcomponents-client-4.3.4-src.tar.gz
 /httpcomponents-client-4.3.5-src.tar.gz
+/httpcomponents-client-4.4-beta1-src.tar.gz
+/effective_tld_names.dat
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index a5d43c5..24bb6b5 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -2,11 +2,12 @@
 
 Name:              httpcomponents-client
 Summary:           HTTP agent implementation based on httpcomponents HttpCore
-Version:           4.3.5
-Release:           3%{?dist}
-License:           ASL 2.0
+Version:           4.4
+Release:           0.1.beta1%{?dist}
+License:           ASL 2.0 and MPL
 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}-beta1-src.tar.gz
+Source1:           https://publicsuffix.org/list/effective_tld_names.dat
 
 BuildArch:         noarch
 
@@ -19,6 +20,11 @@ BuildRequires:     mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:     mvn(org.mockito:mockito-core)
 BuildRequires:     mvn(net.sf.ehcache:ehcache-core)
 BuildRequires:     mvn(spy:spymemcached)
+# TODO: unbundle publicsuffix-list once it gets into Fedora
+# see https://bugzilla.redhat.com/show_bug.cgi?id=1175293
+#BuildRequires:     publicsuffix-list
+
+Obsoletes:         %{name}-tests < 4.4
 
 %description
 HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on
@@ -34,27 +40,20 @@ Summary:        API documentation for %{name}
 %description    javadoc
 %{summary}.
 
-%package        tests
-Summary:        Classes for testing client applications
-
-%description    tests
-Classes for testing client applications.
-
-
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-beta1
 
 # Don't install javadoc and sources jars
 %mvn_package ":{*}::{sources,javadoc}:" __noinstall
 
-%mvn_package ":{*}::tests:" tests
-
 # Remove optional build deps not available in Fedora
 %pom_disable_module httpclient-osgi
 %pom_disable_module fluent-hc
+%pom_disable_module httpclient-win
 %pom_remove_plugin :docbkx-maven-plugin
 %pom_remove_plugin :clirr-maven-plugin
 %pom_remove_plugin :maven-checkstyle-plugin
+%pom_remove_plugin :apache-rat-plugin
 
 # Don't compile/run httpclient-cache tests - they are incompatible with EasyMock 3.3
 %pom_remove_plugin org.apache.maven.plugins:maven-jar-plugin httpclient-cache
@@ -64,6 +63,10 @@ for dep in org.easymock:easymockclassextension org.slf4j:slf4j-jcl; do
 done
 rm -rf httpclient-cache/src/test
 
+%pom_remove_plugin :download-maven-plugin httpclient
+mkdir -p httpclient/target/classes/mozilla
+cp -a %{SOURCE1} httpclient/target/classes/mozilla/public-suffix-list.txt
+
 # Add proper Apache felix bundle plugin instructions
 # so that we get a reasonable OSGi manifest.
 for module in httpclient httpmime; do
@@ -123,13 +126,14 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
 %files -f .mfiles
 %doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
 
-%files tests -f .mfiles-tests
-%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
-
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Jan 19 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4-0.1.beta1
+- Update to upstream version 4.4 beta1
+- Remove tests subpackage
+
 * Fri Jan  9 2015 Richard Fearn <richardfearn@gmail.com> - 4.3.5-3
 - Also build HttpClient Cache (bug #1180696)
 
diff --git a/sources b/sources
index f268532..cdaa0fb 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-e401a2fcc6a16981f69aeafc26875451  httpcomponents-client-4.3.5-src.tar.gz
+2a1b26a5a10384a02016d072ee0fea98  httpcomponents-client-4.4-beta1-src.tar.gz
+bcd261f923113157fa42db633aa4bc16  effective_tld_names.dat