Attachment 579548 Details for Bug 815394 – cglib 2.2 - 2.2.2 diff

[patch] cglib 2.2 - 2.2.2 diff

cglib.diff (text/plain), 10.09 KB, created by gil cattaneo on 2012-04-23 14:07:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-04-23 14:07:54 UTC

Size: 10.09 KB

patch

obsolete

>diff -Nru cglib/cglib-2.2.2-build_xml.patch cglib-2.2.2/cglib-2.2.2-build_xml.patch
>--- cglib/cglib-2.2.2-build_xml.patch	1970-01-01 01:00:00.000000000 +0100
>+++ cglib-2.2.2/cglib-2.2.2-build_xml.patch	2012-04-23 13:25:47.000000000 +0200
>@@ -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 -Nru cglib/cglib-2.2.2.pom cglib-2.2.2/cglib-2.2.2.pom
>--- cglib/cglib-2.2.2.pom	1970-01-01 01:00:00.000000000 +0100
>+++ cglib-2.2.2/cglib-2.2.2.pom	2011-05-10 15:54:13.000000000 +0200
>@@ -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 -Nru cglib/cglib-2.2.2-pom.patch cglib-2.2.2/cglib-2.2.2-pom.patch
>--- cglib/cglib-2.2.2-pom.patch	1970-01-01 01:00:00.000000000 +0100
>+++ cglib-2.2.2/cglib-2.2.2-pom.patch	2012-04-23 13:27:18.000000000 +0200
>@@ -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 -Nru cglib/cglib-2.2.2-system-jars.patch cglib-2.2.2/cglib-2.2.2-system-jars.patch
>--- cglib/cglib-2.2.2-system-jars.patch	1970-01-01 01:00:00.000000000 +0100
>+++ cglib-2.2.2/cglib-2.2.2-system-jars.patch	2012-04-23 13:41:01.000000000 +0200
>@@ -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 -Nru cglib/cglib-2.2.pom cglib-2.2.2/cglib-2.2.pom
>--- cglib/cglib-2.2.pom	2012-04-23 13:09:23.860995419 +0200
>+++ cglib-2.2.2/cglib-2.2.pom	1970-01-01 01:00:00.000000000 +0100
>@@ -1,38 +0,0 @@
>-<?xml version="1.0"?>
>-<project>
>-  <modelVersion>4.0.0</modelVersion>
>-  <groupId>cglib</groupId>
>-  <artifactId>cglib</artifactId>
>-  <name>Code Generation Library</name>
>-  <version>2.2</version>
>-  <url>http://cglib.sourceforge.net/</url>
>-  <licenses>
>-    <license>
>-            <name>ASF 2.0</name>
>-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
>-            <distribution>repo</distribution>
>-    </license>
>-  </licenses>
>-  <scm>
>-    <url>http://cglib.cvs.sourceforge.net/cglib</url>
>-  </scm>
>-  <dependencies>
>-    <dependency>
>-      <groupId>asm</groupId>
>-      <artifactId>asm</artifactId>
>-      <version>3.1</version>
>-    </dependency>
>-    <dependency>
>-      <groupId>asm</groupId>
>-      <artifactId>asm-util</artifactId>
>-      <version>3.1</version>
>-      <optional>true</optional>
>-    </dependency>
>-    <dependency>
>-      <groupId>ant</groupId>
>-      <artifactId>ant</artifactId>
>-      <version>1.6.2</version>
>-      <optional>true</optional>
>-    </dependency>
>-  </dependencies>
>-</project>
>diff -Nru cglib/cglib-build_xml.patch cglib-2.2.2/cglib-build_xml.patch
>--- cglib/cglib-build_xml.patch	2012-04-23 13:09:23.860995419 +0200
>+++ cglib-2.2.2/cglib-build_xml.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,17 +0,0 @@
>---- cglib/build.xml.orig	2008-08-14 13:37:22.000000000 +0200
>-+++ cglib/build.xml	2008-08-14 13:35:51.000000000 +0200
>-@@ -124,14 +124,6 @@
>-       <exclude name="samples/**" />
>-     </jar> 
>- 
>--    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
>--    <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
>--      <zipfileset dir="lib" includes="asm*.txt"/>
>--      <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/>
>--      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
>--      <include name="**/*"/>
>--      <exclude name="samples/**"/>
>--    </jarjar> 
>-   </target>
>- 
>-   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
>diff -Nru cglib/cglib.spec cglib-2.2.2/cglib.spec
>--- cglib/cglib.spec	2012-04-23 13:09:23.860995419 +0200
>+++ cglib-2.2.2/cglib.spec	2012-04-23 14:08:36.000000000 +0200
>@@ -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 @@
> 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 @@
> %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
>

Actions: View | Diff

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