diff --git a/.gitignore b/.gitignore index 2a45185..a73c244 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ httpcomponents-client-4.1-src.tar.gz /httpcomponents-client-4.2.4-src.tar.gz /httpcomponents-client-4.2.5-src.tar.gz /httpcomponents-client-4.3-src.tar.gz +/httpcomponents-client-4.3.1-src.tar.gz diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index f1da43a..cd40c0f 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -2,8 +2,8 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore -Version: 4.3 -Release: 2%{?dist} +Version: 4.3.1 +Release: 1%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://archive.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz @@ -16,11 +16,6 @@ BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.httpcomponents:project) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -%if 0%{?fedora} -# Test dependencies -BuildRequires: mvn(org.mockito:mockito-core) -BuildRequires: mvn(junit:junit) -%endif %description HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on @@ -101,8 +96,8 @@ done %build %mvn_file ":{*}" httpcomponents/@1 -# Build with tests enabled on Fedora -%mvn_build %{!?fedora: -f} +# tests are disabled due to bug in mockito (rhbz#1040350) +%mvn_build -f %install %mvn_install @@ -115,6 +110,10 @@ done %doc LICENSE.txt NOTICE.txt %changelog +* Mon Jan 06 2014 Michael Simacek - 4.3.1-1 +- Update to upstream version 4.3.1 +- Temporarily disable tests due to bug in mockito + * Thu Oct 3 2013 Mikolaj Izdebski - 4.3-2 - Don't try to remove maven-notice-plugin from POM diff --git a/sources b/sources index 2ccecb2..d5165bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -188f8bd74e6feae7de6b90dadd874afc httpcomponents-client-4.3-src.tar.gz +edb3ba0e707772b1a51212379d5b8f76 httpcomponents-client-4.3.1-src.tar.gz