Update to upstream version 4.1

This commit is contained in:
Mikolaj Izdebski 2016-08-04 13:20:30 +02:00
parent 57c7a0aa60
commit 759b14eea8
2 changed files with 12 additions and 11 deletions

View File

@ -5,8 +5,8 @@
%global short_name guice
Name: google-%{short_name}
Version: 4.0
Release: 6%{?dist}
Version: 4.1
Release: 1%{?dist}
Summary: Lightweight dependency injection framework for Java 5 and above
License: ASL 2.0
URL: https://github.com/google/%{short_name}
@ -160,11 +160,11 @@ Summary: ThrowingProviders extension module for Guice
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides ThrowingProviders module for Guice.
%endif # with extensions
%package -n %{short_name}-bom
Summary: Bill of Materials for Guice
%endif # with extensions
%description -n %{short_name}-bom
Guice is a lightweight dependency injection framework for Java 5
and above. This package provides Bill of Materials module for Guice.
@ -179,9 +179,9 @@ This package provides %{summary}.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch100 -p1
%patch101 -p1
#%patch0 -p1
#%patch100 -p1
#%patch101 -p1
# We don't have struts2 in Fedora yet.
%pom_disable_module struts2 extensions
@ -207,8 +207,6 @@ This package provides %{summary}.
%pom_remove_dep :guava-testlib extensions
%pom_xpath_remove "pom:dependency[pom:classifier[text()='tests']]" extensions
%pom_xpath_inject "pom:dependency[pom:artifactId='aopalliance']" "<optional>true</optional>" core
%pom_remove_parent
%pom_set_parent com.google.inject:guice-parent:%{version} jdk8-tests
@ -217,7 +215,7 @@ This package provides %{summary}.
%pom_disable_module extensions
%endif
%mvn_package :jdk8-tests __noinstall
%pom_disable_module jdk8-tests
%build
%if %{with extensions}
@ -262,6 +260,9 @@ This package provides %{summary}.
%changelog
* Thu Aug 4 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1-1
- Update to upstream version 4.1
* Wed Jun 29 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0-6
- Make aopalliance dependency optional

View File

@ -1 +1 @@
bf431704d50d3548b85e3e9031005f05 google-guice-4.0.tar.xz
8e54f0c2bab596dcac751362af15b271 google-guice-4.1.tar.xz