Attachment 582132 Details for Bug 815394 – update to 2.2.2

[patch] update to 2.2.2

0001-update-to-2.2.2.patch (text/plain), 8.72 KB, created by gil cattaneo on 2012-05-04 14:33:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-04 14:33:36 UTC

Size: 8.72 KB

patch

obsolete

>From 181a132cde13d9f8701cbae31841c5fdf3c0fffb Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 4 May 2012 14:34:09 +0200
>Subject: [PATCH] update to 2.2.2
>
>---
> .gitignore                    |    1 +
> cglib-2.2.2-build_xml.patch   |   19 ++++++++++
> cglib-2.2.2-pom.patch         |   11 ++++++
> cglib-2.2.2-system-jars.patch |   16 ++++++++
> cglib-2.2.2.pom               |   54 ++++++++++++++++++++++++++++
> cglib.spec                    |   78 ++++++++++++++++++++++------------------
> sources                       |    2 +-
> 7 files changed, 145 insertions(+), 36 deletions(-)
> create mode 100644 cglib-2.2.2-build_xml.patch
> create mode 100644 cglib-2.2.2-pom.patch
> create mode 100644 cglib-2.2.2-system-jars.patch
> create mode 100644 cglib-2.2.2.pom
>
>diff --git a/.gitignore b/.gitignore
>index 6a71757..81a4539 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> cglib-src-2.2.jar
>+/cglib-src-2.2.2.jar
>diff --git a/cglib-2.2.2-build_xml.patch b/cglib-2.2.2-build_xml.patch
>new file mode 100644
>index 0000000..1140bb8
>--- /dev/null
>+++ b/cglib-2.2.2-build_xml.patch
>@@ -0,0 +1,19 @@
>+--- build.xml	2011-04-20 12:24:24.000000000 +0200
>++++ build.xml-gil	2012-04-23 13:24:36.197017056 +0200
>+@@ -124,14 +124,14 @@
>+       <exclude name="samples/**" />
>+     </jar> 
>+ 
>+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
>++     
>+   </target>
>+ 
>+   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
>diff --git a/cglib-2.2.2-pom.patch b/cglib-2.2.2-pom.patch
>new file mode 100644
>index 0000000..2def95e
>--- /dev/null
>+++ b/cglib-2.2.2-pom.patch
>@@ -0,0 +1,11 @@
>+--- pom.xml	2011-05-10 15:54:13.000000000 +0200
>++++ pom.xml-gil	2012-04-23 13:26:50.174020233 +0200
>+@@ -31,7 +31,7 @@
>+       <optional>true</optional>
>+     </dependency>
>+     <dependency>
>+-      <groupId>ant</groupId>
>++      <groupId>org.apache.ant</groupId>
>+       <artifactId>ant</artifactId>
>+       <version>1.6.2</version>
>+       <optional>true</optional>
>diff --git a/cglib-2.2.2-system-jars.patch b/cglib-2.2.2-system-jars.patch
>new file mode 100644
>index 0000000..22d1fd7
>--- /dev/null
>+++ b/cglib-2.2.2-system-jars.patch
>@@ -0,0 +1,16 @@
>+--- build.xml	2012-04-23 13:40:38.121039871 +0200
>++++ build.xml-gil	2012-04-23 13:40:46.870040078 +0200
>+@@ -40,8 +40,11 @@
>+ 
>+     <path id="compile.classpath">
>+       <pathelement location="${build.home}/classes"/>
>+-      <fileset dir="./lib">
>+-		<include name="*.jar"/>
>++      <fileset dir="/usr/share/java">
>++		<include name="ant.jar"/>
>++		<include name="objectweb-asm/asm.jar"/>
>++		<include name="objectweb-asm/asm-commons.jar"/>
>++		<include name="objectweb-asm/asm-util.jar"/>
>+        </fileset>
>+     </path>
>+ 
>diff --git a/cglib-2.2.2.pom b/cglib-2.2.2.pom
>new file mode 100644
>index 0000000..0954069
>--- /dev/null
>+++ b/cglib-2.2.2.pom
>@@ -0,0 +1,54 @@
>+<?xml version="1.0"?>
>+<project>
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>cglib</groupId>
>+  <artifactId>cglib</artifactId>
>+  <name>Code Generation Library</name>
>+  <version>2.2.2</version>
>+  <url>http://cglib.sourceforge.net/</url>
>+  <description>Code generation library</description>
>+  <licenses>
>+    <license>
>+            <name>ASF 2.0</name>
>+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
>+            <distribution>repo</distribution>
>+    </license>
>+  </licenses>
>+  <scm>
>+    <connection>scm:cvs:pserver:anonymous@cglib.cvs.sourceforge.net:/cvsroot/cglib:cglib</connection>
>+    <url>http://cglib.cvs.sourceforge.net/cglib</url>
>+  </scm>
>+  <dependencies>
>+    <dependency>
>+      <groupId>asm</groupId>
>+      <artifactId>asm</artifactId>
>+      <version>3.3.1</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>asm</groupId>
>+      <artifactId>asm-util</artifactId>
>+      <version>3.3.1</version>
>+      <optional>true</optional>
>+    </dependency>
>+    <dependency>
>+      <groupId>ant</groupId>
>+      <artifactId>ant</artifactId>
>+      <version>1.6.2</version>
>+      <optional>true</optional>
>+    </dependency>
>+  </dependencies>
>+  <developers>
>+    <developer>
>+      <id>baliuka</id>
>+      <name>Juozas Baliuka</name>
>+    </developer>
>+    <developer>
>+      <id>herbyderby</id>
>+      <name>Chris Nokleberg</name>
>+    </developer>
>+    <developer>
>+      <id>sameb</id>
>+      <name>Sam Berlin</name>
>+    </developer>
>+  </developers>
>+</project>
>diff --git a/cglib.spec b/cglib.spec
>index ad6b3b7..8d24a42 100644
>--- a/cglib.spec
>+++ b/cglib.spec
>@@ -1,6 +1,6 @@
> Name:           cglib
>-Version:        2.2
>-Release:        9%{?dist}
>+Version:        2.2.2
>+Release:        1%{?dist}
> Summary:        Code Generation Library for Java
> License:        ASL 2.0
> Group:          Development/Tools
>@@ -8,21 +8,23 @@ Url:            http://cglib.sourceforge.net/
> Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.jar
> Source1:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
> # Remove the repackaging step that includes other jars into the final thing
>-Patch0:         %{name}-build_xml.patch
>+Patch0:         %{name}-%{version}-build_xml.patch
>+# add path for objectweb-asm and ant jars
>+Patch1:         %{name}-%{version}-system-jars.patch
>+# change ant groupId in org.apache.ant
>+Patch2:         %{name}-%{version}-pom.patch
> 
>-Requires: java >= 0:1.6.0
>-Requires: objectweb-asm
>+BuildRequires:  java-devel >= 0:1.6.0
>+BuildRequires:  jpackage-utils >= 0:1.5
> 
> BuildRequires:  ant
>-BuildRequires:  jpackage-utils >= 0:1.5
>-BuildRequires:  java-devel >= 0:1.6.0
> BuildRequires:  objectweb-asm
>-BuildRequires:  unzip
>-BuildArch:      noarch
>-Requires(post): jpackage-utils
>-Requires(postun): jpackage-utils
> 
>-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>+Requires:       objectweb-asm
>+
>+Requires:       java >= 0:1.6.0
>+Requires:       jpackage-utils
>+BuildArch:      noarch
> 
> %description
> cglib is a powerful, high performance and quality code generation library 
>@@ -38,45 +40,51 @@ Documentation for the cglib code generation library.
> %prep
> %setup -q -c %{name}-%{version}
> rm lib/*.jar
>-%patch0 -p1
>+
>+%patch0 -p0
>+%patch1 -p0
>+cp -pr %{SOURCE1} pom.xml
>+%patch2 -p0
> 
> %build
>-export CLASSPATH=`build-classpath objectweb-asm`
>+
> ant jar javadoc
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>-mkdir -p ${RPM_BUILD_ROOT}%{_javadocdir}/
>-cp -r docs ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version}
>+
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p dist/%{name}-%{version}.jar  $RPM_BUILD_ROOT%{_javadir}
>-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> 
> mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
>-cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>-%add_to_maven_depmap net.sf.cglib %{name} %{version} JPP %{name}
>-
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>+# see https://bugzilla.redhat.com/show_bug.cgi?id=806571
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "net.sf.cglib:cglib"
> 
>-%post
>-%update_maven_depmap
>-
>-%postun
>-%update_maven_depmap
>+mkdir -p ${RPM_BUILD_ROOT}%{_javadocdir}/
>+cp -r docs ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
> 
> %files
>-%defattr(-,root,root,-)
> %doc LICENSE NOTICE
>-%{_javadir}/*.jar
>-%{_mavenpomdir}/*
>-%config(noreplace) %{_mavendepmapfragdir}/%{name}
>+%{_javadir}/%{name}.jar
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
>+
>+%pre javadoc
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> 
> %files javadoc
>-%defattr(-,root,root,-)
>-%{_javadocdir}/%{name}-%{version}
>+%{_javadocdir}/%{name}
>+%doc LICENSE
> 
> %changelog
>+* Mon Apr 23 2012 gil cattaneo <puntogil@libero.it> 2.2.2-1
>+- update to 2.2.2
>+- adapt to current guideline
>+- remove BuildRequires:  unzip
>+- add %%pre javadoc script
>+- Resolves rhbz#806571
>+
> * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-9
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 2b2ef43..8ca3758 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-b1e6ebfb76ec7071b6a3f5f9d7df2e57  cglib-src-2.2.jar
>+4a9c754d16b0bb110030da5fbaf87c48  cglib-src-2.2.2.jar
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 815394: 579548 | 579561 | 579562 | 579564 | 579698 | 580767 | 582132 | 582133 | 632020