Attachment 632020 Details for Bug 815394 – update to 3.0 (in complete)

[patch] update to 3.0 (in complete)

0001-Update-to-upstream-version-3.0.patch (text/plain), 3.75 KB, created by Mikolaj Izdebski on 2012-10-23 10:38:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2012-10-23 10:38:34 UTC

Size: 3.75 KB

patch

obsolete

>From b52956ecc480a1e79097bdbb98940534f7dbcde6 Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Tue, 23 Oct 2012 12:30:25 +0200
>Subject: [PATCH] Update to upstream version 3.0
>
>- Remove redundant add_to_maven_depmap call
>---
> cglib-build_xml.patch | 17 -----------------
> cglib.spec            | 21 ++++++++++++---------
> 2 files changed, 12 insertions(+), 26 deletions(-)
> delete mode 100644 cglib-build_xml.patch
>
>diff --git a/cglib-build_xml.patch b/cglib-build_xml.patch
>deleted file mode 100644
>index f3e591a..0000000
>--- a/cglib-build_xml.patch
>+++ /dev/null
>@@ -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 --git a/cglib.spec b/cglib.spec
>index 587e80c..0dbb8cf 100644
>--- a/cglib.spec
>+++ b/cglib.spec
>@@ -1,6 +1,6 @@
> Name:           cglib
>-Version:        2.2
>-Release:        13%{?dist}
>+Version:        3.0
>+Release:        1%{?dist}
> Summary:        Code Generation Library for Java
> License:        ASL 2.0 and BSD
> Group:          Development/Tools
>@@ -8,16 +8,14 @@ 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
> Source2:        bnd.properties
>-# Remove the repackaging step that includes other jars into the final thing
>-Patch0:         %{name}-build_xml.patch
> 
> Requires: java >= 0:1.6.0
>-Requires: objectweb-asm
>+Requires: objectweb-asm4
> 
> BuildRequires:  ant
> BuildRequires:  jpackage-utils >= 0:1.5
> BuildRequires:  java-devel >= 0:1.6.0
>-BuildRequires:  objectweb-asm
>+BuildRequires:  objectweb-asm4
> BuildRequires:  unzip
> BuildRequires:  aqute-bnd
> BuildArch:      noarch
>@@ -36,10 +34,12 @@ Documentation for the cglib code generation library.
> %prep
> %setup -q -c %{name}-%{version}
> rm lib/*.jar
>-%patch0 -p1
>+
>+# Remove the repackaging step that includes other jars into the final thing
>+sed -i "/<taskdef name=.jarjar/,/<.jarjar>/d" build.xml
> 
> %build
>-export CLASSPATH=`build-classpath objectweb-asm`
>+export CLASSPATH=`build-classpath objectweb-asm4`
> ant jar javadoc
> # Convert to OSGi bundle
> pushd dist
>@@ -53,7 +53,6 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
> install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
> mkdir -p %{buildroot}%{_mavenpomdir}
> cp %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>-%add_to_maven_depmap net.sf.cglib %{name} %{version} JPP %{name}
> # yes, this is really *.bar - aqute bnd created it
> install -p -m 644 dist/%{name}-%{version}.bar %{buildroot}%{_javadir}/%{name}.jar
> install -p -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>@@ -72,6 +71,10 @@ cp -rp docs/* %{buildroot}%{_javadocdir}/%{name}
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Tue Oct 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0-1
>+- Update to upstream version 3.0
>+- Remove redundant add_to_maven_depmap call
>+
> * Mon Sep 17 2012 Severin Gehwolf <sgehwolf@redhat.com> 2.2-13
> - Use aqute bnd in order to generate OSGi metadata.
> 
>-- 
>1.7.11.2
>

Actions: View | Diff

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