From 85575573c03c6b3709489129cb67736f83f6ef1a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 03:28:09 +0000 Subject: auto-import changelog data from bcel-5.0-14.src.rpm Fri May 28 2004 Gary Benson 5.0-14 - Build with katana. --- diff --git a/.cvsignore b/.cvsignore index 675701f..a5a51ca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ bcel-5.0-src.tar.gz -rhug-bcel-20031215.tar.bz2 diff --git a/bcel.spec b/bcel.spec index 18e3372..b7f29cd 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,25 +1,21 @@ -%define rhugversion 20031215 -%define rhugsource1 %{name}-%{version} upstream -%define rhugpatches 3 - Summary: Bytecode Engineering Library Name: bcel Version: 5.0 -Release: 13 +Release: 14 URL: http://jakarta.apache.org/bcel/ -Source: rhug-%{name}-%{rhugversion}.tar.bz2 -Source1: %{name}-%{version}-src.tar.gz -Patch1: %{name}-rhjpp.patch +Source: %{name}-%{version}-src.tar.gz +Source1: katana.omissions Patch3: %{name}-jdk14.patch License: Apache Software License Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: gcc34-c++ -BuildPrereq: gcc34-java >= 3.4.0-1 -BuildPrereq: jakarta-regexp >= 1.2-15 -Prereq: redhat-java-rpm-scripts >= 1.0.2-2 -Requires: libgcj34 >= 3.4.0-1 -Requires: jakarta-regexp >= 1.2-15 +BuildPrereq: katana-build +BuildPrereq: bootstrap-ant +BuildPrereq: jakarta-regexp >= 1.2-16 +Prereq: katana +Requires: libgcj >= 3.4.0 +Requires: jakarta-regexp >= 1.2-16 +ExcludeArch: ppc64 ia64 %description The Byte Code Engineering Library (formerly known as JavaClass) is @@ -46,26 +42,20 @@ The bcel-devel package contains the headers required to develop Cygnus Native Interface (CNI) extensions that use BCEL. %prep -%setup -q -a 1 -mv %{rhugsource1} -%patch1 -p0 -b .rhjpp +%setup -q %patch3 -p1 -b .jdk14 -mv ChangeLog ChangeLog.rhug -mv TODO TODO.rhug +katana prep %build -CC=gcc34 CXX=g++34 GCJ=gcj34 GCJH=gcjh34 \ -./configure \ - --disable-static \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} -make +CLASSPATH=%{_datadir}/java/jakarta-regexp.jar bootstrap-ant + +mv bin/%{name}.jar katana/%{name}-%{version}.jar +katana build + +mv src/java/org katana %install -rm -rf ${RPM_BUILD_ROOT} -%makeinstall -rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la -find ${RPM_BUILD_ROOT}%{_libdir} -type l | xargs rm -f +katana install %post %{_sbindir}/javaconfig \ @@ -78,19 +68,23 @@ find ${RPM_BUILD_ROOT}%{_libdir} -type l | xargs rm -f %{_datadir}/java/bcel.jar %clean -rm -rf $RPM_BUILD_ROOT +katana clean %files %defattr(-,root,root) -%doc *.rhug upstream/{LICENSE,README} upstream/docs +%doc LICENSE README docs %{_libdir}/*.so %{_datadir}/java/*.jar +%{_datadir}/katana/*.cp %files devel %defattr(-,root,root) %{_includedir}/org/apache/bcel %changelog +* Fri May 28 2004 Gary Benson 5.0-14 +- Build with katana. + * Tue May 4 2004 Gary Benson 5.0-13 - Rebuild with new compiler. diff --git a/sources b/sources index 8801766..d413dd8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 90d777a81c4e8cdb24dc4487c2553d46 bcel-5.0-src.tar.gz -4528dbf3870fa8b7df33c2d336812f2a rhug-bcel-20031215.tar.bz2