Update to upstream version 4.3
This commit is contained in:
parent
dff62ab590
commit
fceb01f6ec
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ httpcomponents-core-4.1.4-src.tar.gz
|
|||||||
/httpcomponents-core-4.2.1-src.tar.gz
|
/httpcomponents-core-4.2.1-src.tar.gz
|
||||||
/httpcomponents-core-4.2.3-src.tar.gz
|
/httpcomponents-core-4.2.3-src.tar.gz
|
||||||
/httpcomponents-core-4.2.4-src.tar.gz
|
/httpcomponents-core-4.2.4-src.tar.gz
|
||||||
|
/httpcomponents-core-4.3-src.tar.gz
|
||||||
|
@ -2,9 +2,8 @@
|
|||||||
|
|
||||||
Name: httpcomponents-core
|
Name: httpcomponents-core
|
||||||
Summary: Set of low level Java HTTP transport components for HTTP services
|
Summary: Set of low level Java HTTP transport components for HTTP services
|
||||||
Version: 4.2.4
|
Version: 4.3
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Group: Development/Libraries
|
|
||||||
# The project is licensed under ASL 2.0, but it contains annotations
|
# The project is licensed under ASL 2.0, but it contains annotations
|
||||||
# in the package org.apache.http.annotation which are derived
|
# in the package org.apache.http.annotation which are derived
|
||||||
# from JCIP-ANNOTATIONS project (CC-BY licensed)
|
# from JCIP-ANNOTATIONS project (CC-BY licensed)
|
||||||
@ -20,7 +19,8 @@ BuildRequires: jpackage-utils
|
|||||||
BuildRequires: maven-surefire-provider-junit4
|
BuildRequires: maven-surefire-provider-junit4
|
||||||
BuildRequires: apache-commons-logging
|
BuildRequires: apache-commons-logging
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
%if 0%{?rhel} <= 0
|
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||||
|
%if 0%{?fedora}
|
||||||
BuildRequires: mockito
|
BuildRequires: mockito
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -39,7 +39,6 @@ HTTP connections in a resource efficient manner.
|
|||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: API documentation for %{name}
|
Summary: API documentation for %{name}
|
||||||
Group: Documentation
|
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -48,10 +47,7 @@ Group: Documentation
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%pom_remove_plugin :maven-clover2-plugin httpcore-nio
|
%pom_remove_plugin :maven-checkstyle-plugin
|
||||||
%pom_remove_plugin :maven-clover2-plugin httpcore
|
|
||||||
%pom_remove_plugin :maven-notice-plugin
|
|
||||||
%pom_remove_plugin :docbkx-maven-plugin
|
|
||||||
|
|
||||||
# we don't need these artifacts right now
|
# we don't need these artifacts right now
|
||||||
%pom_disable_module httpcore-osgi
|
%pom_disable_module httpcore-osgi
|
||||||
@ -81,24 +77,22 @@ done
|
|||||||
%mvn_file ":{*}" httpcomponents/@1
|
%mvn_file ":{*}" httpcomponents/@1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build \
|
%mvn_build %{!?fedora -f}
|
||||||
%if 0%{?rhel}
|
|
||||||
-f
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
%dir %{_javadir}/httpcomponents
|
%dir %{_javadir}/httpcomponents
|
||||||
%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
|
||||||
|
* Tue Sep 03 2013 Michal Srb <msrb@redhat.com> - 4.3-1
|
||||||
|
- Update to upstream version 4.3
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.4-5
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.4-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user