rpm/cglib
SHA256
1
0
Fork 0
forked from pool/cglib
Code Pull Requests Activity

Accepting request 653639 from Java:packages

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/653639
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cglib?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2018-12-07 13:30:34 +00:00 committed by Git OBS Bridge
commit 5353f82128
7 changed files with 91 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASE_3_1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a48c857232b902950cbd7c6b07bd70bfcc3773b9d4dd188f35f885c4477b8d3b
size 1417623

26
cglib-2.2.pom → cglib-3.1.pom
View File

@ -4,8 +4,9 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<name>Code Generation Library</name>
<version>2.2</version>
<version>3.1</version>
<url>http://cglib.sourceforge.net/</url>
<description>Code generation library</description>
<licenses>
<license>
<name>ASF 2.0</name>
@ -14,18 +15,19 @@
</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>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>3.1</version>
<version>4.2</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>3.1</version>
<version>4.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -35,4 +37,18 @@
<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>

11
cglib-build_xml.patch
View File

@ -1,13 +1,14 @@
--- 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 @@
--- cglib/build.xml 2013-12-07 17:08:18.000000000 +0100
+++ cglib/build.xml 2018-10-29 15:10:26.294707872 +0100
@@ -123,15 +123,6 @@
<include name="**/*"/>
<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"/>
- <zipfileset src="lib/asm-4.2.jar" excludes="META-INF"/>
- <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
- <include name="**/*"/>
- <exclude name="samples/**"/>

3
cglib-src-2.2.jar
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:762e0214f0d31f224e712a7a5b4768c16ad24741ba98fc2e94715ae390d07fcb
size 1520971

30
cglib.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Mon Oct 29 14:24:03 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 3.1, the last one buildable with ant
- Depend on asm5
- Modified patch:
* cglib-build_xml.patch
+ rediff to changed context
- Added patch:
* fix-javadoc.patch
+ Do not import with wildcards a package that has no classes
+ Fixes javadoc generation
-------------------------------------------------------------------
Mon Oct 29 13:45:46 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Add aliases to the maven artifact
-------------------------------------------------------------------
Wed Jun 13 15:39:52 UTC 2018 - fstrba@suse.com
- Depend on asm3 and not objectweb-asm, since the binaries
are equivalent.
-------------------------------------------------------------------
Wed May 16 09:07:44 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility
-------------------------------------------------------------------
Mon Sep 18 06:30:45 UTC 2017 - fstrba@suse.com

38
cglib.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package cglib
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,29 +12,30 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global tarball_name RELEASE_3_1
Name: cglib
Version: 2.2
Version: 3.1
Release: 0
Summary: Code Generation Library
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://cglib.sourceforge.net/
Source0: %{name}-src-%{version}.jar
Source1: /%{name}-%{version}.pom
URL: http://cglib.sourceforge.net/
Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz
Source1: http://central.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
# Remove the repackaging step that includes other jars into the final thing
Patch0: %{name}-build_xml.patch
Patch1: fix-javadoc.patch
BuildRequires: ant >= 1.6
BuildRequires: fdupes
BuildRequires: java-devel >= 1.6.0
# Needed for maven conversions
BuildRequires: asm5
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: objectweb-asm
BuildRequires: unzip
Provides: %{name}-nohook = %{version}-%{release}
Obsoletes: %{name}-nohook < %{version}-%{release}
BuildArch: noarch
@ -54,15 +55,15 @@ Library, It is used to extend JAVA classes and implements interfaces at
runtime.
%prep
%setup -q -T -c -n %{name}
unzip -q %{SOURCE0}
%setup -q -n %{name}-%{tarball_name}
rm lib/*.jar
build-jar-repository -s -p lib objectweb-asm ant
build-jar-repository -s -p lib asm5 ant
%patch0 -p1
%patch1 -p1
%build
ant \
-Dcompile.target=1.6 -Dcompile.source=1.6 \
-Dcompile.target=8 -Dcompile.source=8 \
jar javadoc
%install
@ -76,12 +77,13 @@ cp -r docs %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
#maven pom
mkdir -p %{buildroot}%{_mavenpomdir}
cp %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar
install -dm 755 %{buildroot}%{_mavenpomdir}
install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar -a "net.sf.cglib:cglib,cglib:cglib-full,cglib:cglib-nodep,org.sonatype.sisu.inject:cglib"
%files
%doc LICENSE NOTICE
%license LICENSE
%doc NOTICE
%{_javadir}/*.jar
%{_mavenpomdir}/*
%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml

11
fix-javadoc.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urEbwB cglib/src/proxy/net/sf/cglib/reflect/MethodDelegate.java cglib/src/proxy/net/sf/cglib/reflect/MethodDelegate.java
--- cglib/src/proxy/net/sf/cglib/reflect/MethodDelegate.java 2013-12-07 17:08:18.000000000 +0100
+++ cglib/src/proxy/net/sf/cglib/reflect/MethodDelegate.java 2018-10-29 15:15:55.528397043 +0100
@@ -16,7 +16,6 @@
package net.sf.cglib.reflect;
import java.lang.reflect.*;
-import net.sf.cglib.*;
import net.sf.cglib.core.*;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.Type;