Attachment 581211 Details for Bug 817560 – Test commit

[patch] Test commit

0001-Test-commit.patch (text/plain), 5.71 KB, created by gil cattaneo on 2012-04-30 15:53:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-04-30 15:53:27 UTC

Size: 5.71 KB

patch

obsolete

>From 722177bc2c84edea8d0a5d74a922d665ce5b305b Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Mon, 30 Apr 2012 15:53:39 +0200
>Subject: [PATCH] Test commit
>
>---
> guava-11.0.2-remove-animal-sniffer.patch |   20 ++++++
> guava.spec                               |   98 ++++++++++++++++++-----------
> 2 files changed, 81 insertions(+), 37 deletions(-)
> create mode 100644 guava-11.0.2-remove-animal-sniffer.patch
>
>diff --git a/guava-11.0.2-remove-animal-sniffer.patch b/guava-11.0.2-remove-animal-sniffer.patch
>new file mode 100644
>index 0000000..2e62eb3
>--- /dev/null
>+++ b/guava-11.0.2-remove-animal-sniffer.patch
>@@ -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.apache.maven.plugins</groupId>
>+         <artifactId>maven-javadoc-plugin</artifactId>
>diff --git a/guava.spec b/guava.spec
>index 413257a..5cc2b6a 100644
>--- a/guava.spec
>+++ b/guava.spec
>@@ -1,28 +1,40 @@
>-Name:           guava
>-Version:        09
>-Release:        2%{?dist}
>-Summary:        Google Core Libraries for Java
>-
>-Group:          Development/Libraries
>-License:        ASL 2.0 
>-URL:            http://code.google.com/p/guava-libraries
>-#svn export http://guava-libraries.googlecode.com/svn/tags/release05/ guava-r05
>-#tar jcf guava-r05.tar.bz2 guava-r05/
>-Source0:        %{name}-r%{version}.tar.bz2
>-#Remove parent definition which doesn't really to be used
>-Patch0:        %{name}-pom.patch
>-
>-BuildArch: noarch
>-
>-BuildRequires:  maven
>-BuildRequires:  maven-surefire-provider-junit4
>-BuildRequires:  java-devel >= 0:1.7.0
>-BuildRequires:  jpackage-utils
>-BuildRequires:  jsr-305 >= 0-0.7.20090319svn
>-BuildRequires:  ant-nodeps
>-
>-Requires:       java
>-Requires:       jpackage-utils
>+Name:          guava
>+Version:       11.0.2
>+Release:       1%{?dist}
>+Summary:       Google Core Libraries for Java
>+
>+Group:         Development/Libraries
>+License:       ASL 2.0 
>+URL:           http://code.google.com/p/guava-libraries
>+# git clone https://code.google.com/p/guava-libraries/
>+# cd guava-libraries && git archive --format=tar --prefix=guava-11.0.2/ v11.0.2 | xz > guava-11.0.2.tar.xz
>+Source0:       %{name}-%{version}.tar.xz
>+Patch0:        guava-11.0.2-remove-animal-sniffer.patch
>+
>+BuildRequires: java-devel >= 0:1.7.0
>+BuildRequires: jpackage-utils
>+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: jdiff
>+
>+Requires:      jsr-305
>+
>+Requires:      java
>+Requires:      jpackage-utils
>+BuildArch:     noarch
> 
> %description
> Guava is a suite of core and expanded libraries that include 
>@@ -40,14 +52,18 @@ Requires:       jpackage-utils
> %description javadoc
> API documentation for %{name}.
> 
>-
> %prep
> %setup -q -n %{name}-r%{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>||" pom.xml
>+sed -i "s|<module>guava-testlib</module>||" pom.xml
>+sed -i "s|<module>guava-tests</module>||" pom.xml
> 
> %build
> 
>@@ -56,13 +72,18 @@ mvn-rpmbuild install javadoc:aggregate
> %install
> 
> # 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
>-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"
>+install -pm 644 %{name}-bootstrap/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-bootstrap.pom
>+%add_maven_depmap JPP-%{name}-bootstrap.pom %{name}-bootstrap.jar
> 
> # javadoc
> 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} ] && \
> rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> 
>-
> %files
>-%doc COPYING README README.maven
>-%{_javadir}/*
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>+%doc AUTHORS CONTRIBUTORS COPYING README*
>+%{_javadir}/%{name}*.jar
>+%{_mavenpomdir}/JPP-%{name}*.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %files javadoc
> %{_javadocdir}/%{name}
>+%doc COPYING
> 
> %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
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 817560: 581190 | 581191 | 581211 | 581213 | 582961 | 582962