rpms/bcel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Use global.

Browse Source 
- Drop gcj_support.
- Fix groups.
- Fix build.
This commit is contained in:
Alexander Kurtakov 2010-07-13 08:14:26 +00:00
parent b715f09e55
commit 8c9a327be9
4 changed files with 15 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
bcel-5.1-build.patch
View File

@ -1,49 +0,0 @@
--- bcel-5.1/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java~ 2004-10-16 15:06:59.231184305 -0400
+++ bcel-5.1/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java 2004-10-16 15:07:47.577200177 -0400
@@ -345,7 +345,7 @@
for (int i=0; i<atts.length; i++){
if ((! (atts[i] instanceof SourceFile)) &&
- (! (atts[i] instanceof Deprecated)) &&
+ (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated)) &&
(! (atts[i] instanceof InnerClasses)) &&
(! (atts[i] instanceof Synthetic))){
addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of the ClassFile structure '"+tostring(obj)+"' is unknown and will therefore be ignored.");
@@ -519,7 +519,7 @@
for (int i=0; i<atts.length; i++){
if ((! (atts[i] instanceof ConstantValue)) &&
(! (atts[i] instanceof Synthetic)) &&
- (! (atts[i] instanceof Deprecated))){
+ (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated))){
addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of Field '"+tostring(obj)+"' is unknown and will therefore be ignored.");
}
if (! (atts[i] instanceof ConstantValue)){
@@ -660,7 +660,7 @@
if ((! (atts[i] instanceof Code)) &&
(! (atts[i] instanceof ExceptionTable)) &&
(! (atts[i] instanceof Synthetic)) &&
- (! (atts[i] instanceof Deprecated))){
+ (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated))){
addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of Method '"+tostring(obj)+"' is unknown and will therefore be ignored.");
}
if ((! (atts[i] instanceof Code)) &&
@@ -702,7 +702,7 @@
addMessage("SourceFile attribute '"+tostring(obj)+"' has a funny name: remember not to confuse certain parsers working on javap's output. Also, this name ('"+sourcefilename+"') is considered an unqualified (simple) file name only.");
}
}
- public void visitDeprecated(Deprecated obj){//vmspec2 4.7.10
+ public void visitDeprecated(org.apache.bcel.classfile.Deprecated obj){//vmspec2 4.7.10
checkIndex(obj, obj.getNameIndex(), CONST_Utf8);
String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes();
--- bcel-5.1/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java~ 2004-10-16 15:09:58.664972664 -0400
+++ bcel-5.1/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java 2004-10-16 15:10:15.874842037 -0400
@@ -172,7 +172,7 @@
public void visitConstantValue(ConstantValue obj){
tostring = toString(obj);
}
- public void visitDeprecated(Deprecated obj){
+ public void visitDeprecated(org.apache.bcel.classfile.Deprecated obj){
tostring = toString(obj);
}
public void visitExceptionTable(ExceptionTable obj){

16
bcel-5.1-jpp-depmap.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<depset>
<dependency>
<maven>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>1.2</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>regexp</artifactId>
<jar>regexp.jar</jar>
<version>1.2</version>
</jpp>
</dependency>
</depset>

33
bcel-5.1-project_xml.patch
View File

@ -1,33 +0,0 @@
--- project.xml.sav 2003-04-25 10:25:37.000000000 +0200
+++ project.xml 2006-04-11 16:23:12.000000000 +0200
@@ -21,7 +21,6 @@
</description>
<url>http://jakarta.apache.org/bcel/</url>
- <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-bcel/</cvsWebUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/bcel/</siteDirectory>
@@ -73,22 +72,7 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
- <aspectSourceDirectory/>
- <testSourceDirectory>src/java</testSourceDirectory>
- <!-- Unit test classes -->
- <unitTestPatterns>
- <unitTestPattern>exclude = **/*.class</unitTestPattern>
- </unitTestPatterns>
-
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
-
- <jarResources>
- </jarResources>
-
- <jars>
- </jars>
</build>
</project>

52
bcel.spec
View File

@ -28,22 +28,18 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
#For fedora, we want a native gcj compilation
%define _with_gcj_support 1
#Fedora currently does not support maven
%define _without_maven 1
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
%global _without_maven 1
# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'
%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
%global with_maven %{!?_without_maven:1}%{?_without_maven:0}
%global without_maven %{?_without_maven:1}%{!?_without_maven:0}
Name: bcel
Version: 5.2
Release: 7.1%{?dist}
Release: 8%{?dist}
Epoch: 0
Summary: Byte Code Engineering Library
License: ASL 2.0
@ -61,7 +57,7 @@ Source7: %{name}-%{version}.pom
Patch0: %{name}-%{version}-project_properties.patch
URL: http://jakarta.apache.org/%{name}/
Group: Development/Libraries/Java
Group: Development/Libraries
Requires: regexp
BuildRequires: ant
%if %{with_maven}
@ -83,6 +79,7 @@ Requires(postun): jpackage-utils >= 0:1.7.2
BuildRequires: jdom
BuildRequires: velocity
BuildRequires: jakarta-commons-collections
BuildRequires: apache-commons-lang
#excalibur-avalong-logkit should be used once Maven is supported in Fedora
BuildRequires: avalon-logkit
#BuildRequires: excalibur-avalon-logkit
@ -91,17 +88,9 @@ BuildRequires: werken-xpath
%endif
BuildRequires: regexp
BuildRequires: jpackage-utils >= 0:1.7.2
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
%description
The Byte Code Engineering Library (formerly known as JavaClass) is
intended to give users a convenient possibility to analyze, create, and
@ -120,14 +109,14 @@ being the Xalan XSLT processor at Apache.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Group: Documentation
%description javadoc
%{summary}.
%package manual
Summary: Manual for %{name}
Group: Development/Libraries/Java
Group: Documentation
%description manual
%{summary}.
@ -153,6 +142,7 @@ pushd jakarta-site2/lib/
build-jar-repository -s -p . jdom
build-jar-repository -s -p . velocity
build-jar-repository -s -p . commons-collections
build-jar-repository -s -p . commons-lang
build-jar-repository -s -p . avalon-logkit
build-jar-repository -s -p . werken-xpath
popd
@ -239,28 +229,14 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
%endif
%{__cp} LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
%{__rm} -rf %{buildroot}
%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%endif
%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(0644,root,root,0755)
@ -269,10 +245,6 @@ fi
%{_javadir}/*
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*.jar.*
%endif
%files javadoc
%defattr(0644,root,root,0755)
@ -284,6 +256,12 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
* Tue Jul 13 2010 Alexander Kurtakov <akurtako@redhat.com> 0:5.2-8
- Use global.
- Drop gcj_support.
- Fix groups.
- Fix build.
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-7.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild