Update to upstream version 3.1.3

- Remove bundled JARs from tarball
This commit is contained in:
Michal Srb 2013-03-15 08:35:33 +01:00
parent 5a255f5803
commit 35d1c90fc9
4 changed files with 15 additions and 5 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/guice-2.0-1219.tar.xz /guice-2.0-1219.tar.xz
/guice-3.0-rc2-src.zip /guice-3.0-rc2-src.zip
/google-guice-3.1.3.tar.xz

View File

@ -8,6 +8,8 @@ git checkout sisu-guice-${1}
git branch unbundled-guice-${1} git branch unbundled-guice-${1}
git checkout unbundled-guice-${1} git checkout unbundled-guice-${1}
rm -rf $(ls . | grep -E -v 'core|extensions|pom|COPYING') rm -rf $(ls . | grep -E -v 'core|extensions|pom|COPYING')
find . -name "*.jar" -delete
find . -name "*.class" -delete
git commit -a -m "Remove unneeded stuff" git commit -a -m "Remove unneeded stuff"
git tag unbundled-${1} git tag unbundled-${1}
git archive --format=tar --prefix=google-guice-${1}/ unbundled-${1} \ git archive --format=tar --prefix=google-guice-${1}/ unbundled-${1} \

View File

@ -5,14 +5,14 @@
%global short_name guice %global short_name guice
Name: google-%{short_name} Name: google-%{short_name}
Version: 3.1.2 Version: 3.1.3
Release: 11%{?dist} Release: 1%{?dist}
Summary: Lightweight dependency injection framework for Java 5 and above Summary: Lightweight dependency injection framework for Java 5 and above
Group: Development/Libraries Group: Development/Libraries
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/sonatype/sisu-%{short_name} URL: https://github.com/sonatype/sisu-%{short_name}
# ./create-tarball.sh %{version} # ./create-tarball.sh %{version}
Source: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
BuildArch: noarch BuildArch: noarch
BuildRequires: java-devel BuildRequires: java-devel
@ -157,7 +157,7 @@ This package provides %{summary}.
%prep %prep
%setup -q %setup -q -n %{name}-%{version}
# We don't have struts2 in Fedora yet. # We don't have struts2 in Fedora yet.
%pom_disable_module struts2 extensions %pom_disable_module struts2 extensions
@ -174,6 +174,9 @@ This package provides %{summary}.
# maven-javadoc-plugin to generate javadocs with default style. # maven-javadoc-plugin to generate javadocs with default style.
%pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-javadoc-plugin
%pom_remove_dep javax.persistence:persistence-api extensions/persist
%pom_add_dep org.hibernate.javax.persistence:hibernate-jpa-2.0-api extensions/persist
# Don't try to build extension modules unless they are needed # Don't try to build extension modules unless they are needed
%if %{without extensions} %if %{without extensions}
%pom_disable_module extensions %pom_disable_module extensions
@ -218,6 +221,10 @@ servlet,spring,throwingproviders}" "com.google.inject.extensions:guice-@1"
%changelog %changelog
* Thu Mar 14 2013 Michal Srb <msrb@redhat.com> - 3.1.3-1
- Update to upstream version 3.1.3
- Remove bundled JARs from tarball
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 3.1.2-11 * Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 3.1.2-11
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local - Replace maven BuildRequires with maven-local

View File

@ -1 +1 @@
f77dccf2a71a4461ce4244e4d7fe7a68 google-guice-3.1.2.tar.xz 337721d122a9c0ba3d9815b69d3cf6a1 google-guice-3.1.3.tar.xz