Update to upstream version 4.3

- Drop group tag
This commit is contained in:
Michal Srb 2013-09-13 07:20:34 +02:00
parent 4fc2d03738
commit 3665f0eabf
3 changed files with 16 additions and 17 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ httpcomponents-client-4.1-src.tar.gz
/httpcomponents-client-4.2.3-src.tar.gz /httpcomponents-client-4.2.3-src.tar.gz
/httpcomponents-client-4.2.4-src.tar.gz /httpcomponents-client-4.2.4-src.tar.gz
/httpcomponents-client-4.2.5-src.tar.gz /httpcomponents-client-4.2.5-src.tar.gz
/httpcomponents-client-4.3-src.tar.gz

View File

@ -2,9 +2,8 @@
Name: httpcomponents-client Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.2.5 Version: 4.3
Release: 3%{?dist} Release: 1%{?dist}
Group: Development/Libraries
License: ASL 2.0 License: ASL 2.0
URL: http://hc.apache.org/ URL: http://hc.apache.org/
Source0: http://archive.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz Source0: http://archive.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz
@ -16,6 +15,7 @@ BuildRequires: mvn(commons-codec:commons-codec)
BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.httpcomponents:httpcore)
BuildRequires: mvn(org.apache.httpcomponents:project) BuildRequires: mvn(org.apache.httpcomponents:project)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
%if 0%{?fedora} %if 0%{?fedora}
# Test dependencies # Test dependencies
BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.mockito:mockito-core)
@ -32,7 +32,6 @@ encouraged to upgrade.
%package javadoc %package javadoc
Summary: API documentation for %{name} Summary: API documentation for %{name}
Group: Documentation
%description javadoc %description javadoc
%{summary}. %{summary}.
@ -41,6 +40,9 @@ Group: Documentation
%prep %prep
%setup -q %setup -q
# Don't install javadoc, sources and tests jars
%mvn_package ":{*}::{tests,sources,javadoc}:" __noinstall
# Remove optional build deps not available in Fedora # Remove optional build deps not available in Fedora
%pom_disable_module httpclient-cache %pom_disable_module httpclient-cache
%pom_disable_module httpclient-osgi %pom_disable_module httpclient-osgi
@ -48,10 +50,8 @@ Group: Documentation
%pom_remove_plugin :maven-notice-plugin %pom_remove_plugin :maven-notice-plugin
%pom_remove_plugin :docbkx-maven-plugin %pom_remove_plugin :docbkx-maven-plugin
%pom_remove_plugin :clirr-maven-plugin %pom_remove_plugin :clirr-maven-plugin
%pom_remove_plugin :maven-clover2-plugin httpclient %pom_remove_plugin :maven-checkstyle-plugin
%if !0%{?fedora} %{!?fedora: %pom_remove_dep :mockito-core httpclient}
%pom_remove_dep :mockito-core httpclient
%endif
# Add proper Apache felix bundle plugin instructions # Add proper Apache felix bundle plugin instructions
# so that we get a reasonable OSGi manifest. # so that we get a reasonable OSGi manifest.
@ -103,25 +103,23 @@ done
%mvn_file ":{*}" httpcomponents/@1 %mvn_file ":{*}" httpcomponents/@1
# Build with tests enabled on Fedora # Build with tests enabled on Fedora
%if 0%{?fedora} %mvn_build %{!?fedora: -f}
%mvn_build
%else
%mvn_build -f
%endif
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -f .mfiles
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
%doc README.txt RELEASE_NOTES.txt
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt
%changelog %changelog
* Fri Sep 13 2013 Michal Srb <msrb@redhat.com> - 4.3-1
- Update to upstream version 4.3
- Drop group tag
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.5-3 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

View File

@ -1 +1 @@
6f6255278e1680c3900e011d1bb31d84 httpcomponents-client-4.2.5-src.tar.gz 188f8bd74e6feae7de6b90dadd874afc httpcomponents-client-4.3-src.tar.gz