update to 11.0.2
This commit is contained in:
gil
Marek Goldmann
parent
a0f6864a54
commit
b497bf10be
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
guava-r05.tar.bz2
|
guava-r05.tar.bz2
|
||||||
/guava-r09.tar.bz2
|
/guava-r09.tar.bz2
|
||||||
|
/guava-11.0.2.tar.xz
|
||||||
|
|||||||
20
guava-11.0.2-remove-animal-sniffer.patch
Normal file
20
guava-11.0.2-remove-animal-sniffer.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- guava/pom.xml 2012-02-22 14:59:24.000000000 +0100
|
||||||
|
+++ guava/pom.xml-gil 2012-04-28 13:55:54.793020732 +0200
|
||||||
|
@@ -84,7 +84,7 @@
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
- <plugin>
|
||||||
|
+ <!--plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>animal-sniffer-maven-plugin</artifactId>
|
||||||
|
<version>1.7</version>
|
||||||
|
@@ -104,7 +104,7 @@
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
- </plugin>
|
||||||
|
+ </plugin-->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
74
guava.spec
74
guava.spec
@ -1,28 +1,40 @@
|
|||||||
Name: guava
|
Name: guava
|
||||||
Version: 09
|
Version: 11.0.2
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Google Core Libraries for Java
|
Summary: Google Core Libraries for Java
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://code.google.com/p/guava-libraries
|
URL: http://code.google.com/p/guava-libraries
|
||||||
#svn export http://guava-libraries.googlecode.com/svn/tags/release05/ guava-r05
|
# git clone https://code.google.com/p/guava-libraries/
|
||||||
#tar jcf guava-r05.tar.bz2 guava-r05/
|
# cd guava-libraries && git archive --format=tar --prefix=guava-11.0.2/ v11.0.2 | xz > guava-11.0.2.tar.xz
|
||||||
Source0: %{name}-r%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.xz
|
||||||
#Remove parent definition which doesn't really to be used
|
Patch0: guava-11.0.2-remove-animal-sniffer.patch
|
||||||
Patch0: %{name}-pom.patch
|
|
||||||
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
BuildRequires: maven
|
|
||||||
BuildRequires: maven-surefire-provider-junit4
|
|
||||||
BuildRequires: java-devel >= 0:1.7.0
|
BuildRequires: java-devel >= 0:1.7.0
|
||||||
BuildRequires: jpackage-utils
|
BuildRequires: jpackage-utils
|
||||||
BuildRequires: jsr-305 >= 0-0.7.20090319svn
|
BuildRequires: sonatype-oss-parent
|
||||||
|
|
||||||
|
BuildRequires: maven
|
||||||
|
BuildRequires: maven-compiler-plugin
|
||||||
|
BuildRequires: maven-dependency-plugin
|
||||||
|
BuildRequires: maven-enforcer-plugin
|
||||||
|
BuildRequires: maven-install-plugin
|
||||||
|
BuildRequires: maven-jar-plugin
|
||||||
|
BuildRequires: maven-resources-plugin
|
||||||
|
BuildRequires: maven-surefire-provider-junit4
|
||||||
|
#BuildRequires: animal-sniffer
|
||||||
|
#BuildRequires: mojo-signatures
|
||||||
|
|
||||||
|
BuildRequires: jsr-305 >= 0-0.6.20090319svn
|
||||||
BuildRequires: ant-nodeps
|
BuildRequires: ant-nodeps
|
||||||
|
BuildRequires: jdiff
|
||||||
|
|
||||||
|
Requires: jsr-305
|
||||||
|
|
||||||
Requires: java
|
Requires: java
|
||||||
Requires: jpackage-utils
|
Requires: jpackage-utils
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Guava is a suite of core and expanded libraries that include
|
Guava is a suite of core and expanded libraries that include
|
||||||
@ -40,14 +52,18 @@ Requires: jpackage-utils
|
|||||||
%description javadoc
|
%description javadoc
|
||||||
API documentation for %{name}.
|
API documentation for %{name}.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-r%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
|
find . -name '*.jar' -delete
|
||||||
|
|
||||||
rm -r lib/* gwt-*
|
# guava/lib/jdiff.jar
|
||||||
|
ln -sf $(build-classpath jdiff) guava/lib/jdiff.jar
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p0
|
||||||
|
|
||||||
|
sed -i "s|<module>guava-gwt</module>|<!--module>guava-gwt</module-->|" pom.xml
|
||||||
|
sed -i "s|<module>guava-testlib</module>|<!--module>guava-testlib</module-->|" pom.xml
|
||||||
|
sed -i "s|<module>guava-tests</module>|<!--module>guava-tests</module-->|" pom.xml
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -56,13 +72,18 @@ mvn-rpmbuild install javadoc:aggregate
|
|||||||
%install
|
%install
|
||||||
|
|
||||||
# jars
|
# jars
|
||||||
install -Dpm 644 target/guava-r%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
mkdir -p %{buildroot}%{_javadir}
|
||||||
|
install -pm 644 %{name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
|
install -pm 644 %{name}-bootstrap/target/%{name}-bootstrap-%{version}.jar %{buildroot}%{_javadir}/guava-bootstrap.jar
|
||||||
|
|
||||||
# poms
|
# poms
|
||||||
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
mkdir -p %{buildroot}%{_mavenpomdir}
|
||||||
|
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
|
||||||
|
%add_maven_depmap JPP-%{name}-parent.pom
|
||||||
|
install -pm 644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "com.google.collections:google-collections"
|
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "com.google.collections:google-collections"
|
||||||
|
install -pm 644 %{name}-bootstrap/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-bootstrap.pom
|
||||||
|
%add_maven_depmap JPP-%{name}-bootstrap.pom %{name}-bootstrap.jar
|
||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
|
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
@ -73,17 +94,20 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
|
|||||||
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
||||||
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYING README README.maven
|
%doc AUTHORS CONTRIBUTORS COPYING README*
|
||||||
%{_javadir}/*
|
%{_javadir}/%{name}*.jar
|
||||||
%{_mavenpomdir}/*
|
%{_mavenpomdir}/JPP-%{name}*.pom
|
||||||
%{_mavendepmapfragdir}/*
|
%{_mavendepmapfragdir}/%{name}
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
%doc COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Apr 28 2012 gil cattaneo <puntogil@libero.it> 11.0.2-1
|
||||||
|
- Update to 11.0.2
|
||||||
|
|
||||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 09-2
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 09-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user