diff --git a/.cvsignore b/.cvsignore
index 6c83bc5..3b95841 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,2 @@
-bcel-5.1-src.tar.gz
-jakarta-site2.tar.gz
+bcel-5.2-src.tar.gz
bcel-jakarta-site2.tar.gz
diff --git a/bcel-5.2-build.xml b/bcel-5.2-build.xml
new file mode 100644
index 0000000..13e6f21
--- /dev/null
+++ b/bcel-5.2-build.xml
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ================================= WARNING ================================
+ Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.
+ ==========================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Proxy used :
+ Proxy host [${proxy.host}]
+ Proxy port [${proxy.port}]
+ Proxy user [${proxy.username}]
+
+
+
+ Proxy not used.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The Jakarta-Site2 module is not present! Please check
+ to make sure that you have checked it out from CVS.
+
+ <http://jakarta.apache.org/site/jakarta-site2.html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bcel-5.2-jpp-depmap.xml b/bcel-5.2-jpp-depmap.xml
new file mode 100644
index 0000000..f515b68
--- /dev/null
+++ b/bcel-5.2-jpp-depmap.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ regexp
+ regexp
+ 1.2
+
+
+ JPP
+ regexp
+ regexp.jar
+ 1.2
+
+
+
\ No newline at end of file
diff --git a/bcel-5.2-project_properties.patch b/bcel-5.2-project_properties.patch
new file mode 100644
index 0000000..73734fb
--- /dev/null
+++ b/bcel-5.2-project_properties.patch
@@ -0,0 +1,11 @@
+--- project.properties.sav 2007-06-26 15:21:10.000000000 +0200
++++ project.properties 2007-06-26 15:21:35.000000000 +0200
+@@ -42,7 +42,7 @@
+
+ maven.changes.issue.template = %URL%/bugzilla/show_bug.cgi?id=%ISSUE%
+
+-maven.xdoc.jsl = ../commons-build/commons-site.jsl
++maven.xdoc.jsl = file:${basedir}/commons-build/commons-site.jsl
+ maven.xdoc.date = left
+ maven.xdoc.poweredby.image = maven-feather.png
+ maven.xdoc.version = ${pom.currentVersion}
diff --git a/bcel-5.2.pom b/bcel-5.2.pom
new file mode 100644
index 0000000..02a5b6e
--- /dev/null
+++ b/bcel-5.2.pom
@@ -0,0 +1,11 @@
+
+ 4.0.0
+ bcel
+ bcel
+ 5.2
+
+ regexp
+ regexp
+ 1.4
+
+
diff --git a/bcel.spec b/bcel.spec
index 4339660..8b24a60 100644
--- a/bcel.spec
+++ b/bcel.spec
@@ -32,12 +32,9 @@
%define _with_gcj_support 1
#Fedora currently does not support maven
%define _without_maven 1
-%define _without_bootstrap 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}}}
-%define bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
-
# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'
@@ -45,22 +42,24 @@
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
Name: bcel
-Version: 5.1
-Release: 10jpp.4%{?dist}
+Version: 5.2
+Release: 2jpp.1%{?dist}
Epoch: 0
Summary: Byte Code Engineering Library
-License: Apache Software License
-Source0: bcel-5.1-src.tar.gz
-#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_1
-#tar czvf bcel-5.1-src.tar.gz BCEL_5_1
+License: ASL 2.0
+Source0: %{name}-%{version}-src.tar.gz
+#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_2
+#tar czvf bcel-5.2-src.tar.gz BCEL_5_2
Source1: pom-maven2jpp-depcat.xsl
Source2: pom-maven2jpp-newdepmap.xsl
Source3: pom-maven2jpp-mapdeps.xsl
-Source4: bcel-5.1-jpp-depmap.xml
+Source4: %{name}-%{version}-jpp-depmap.xml
+#Source5: commons-build.tar.gz
Source5: bcel-jakarta-site2.tar.gz
+Source6: %{name}-%{version}-build.xml
+Source7: %{name}-%{version}.pom
-Patch0: bcel-5.1-build.patch
-Patch1: bcel-5.1-project_xml.patch
+Patch0: %{name}-%{version}-project_properties.patch
URL: http://jakarta.apache.org/%{name}/
Group: Development/Libraries/Java
Requires: regexp
@@ -69,8 +68,18 @@ BuildRequires: ant
BuildRequires: maven >= 0:1.1
BuildRequires: saxon
BuildRequires: saxon-scripts
-%endif
-%if ! %{bootstrap}
+BuildRequires: maven-plugins-base
+BuildRequires: maven-plugin-changelog
+BuildRequires: maven-plugin-changes
+BuildRequires: maven-plugin-developer-activity
+BuildRequires: maven-plugin-jxr
+BuildRequires: maven-plugin-license
+BuildRequires: maven-plugin-pmd
+BuildRequires: maven-plugin-test
+BuildRequires: maven-plugin-xdoc
+Requires(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2
+%else
BuildRequires: jdom
BuildRequires: velocity
BuildRequires: jakarta-commons-collections
@@ -81,16 +90,16 @@ BuildRequires: werken-xpath
#BuildRequires: ant-apache-regexp
%endif
BuildRequires: regexp
-BuildRequires: jpackage-utils >= 0:1.6
+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
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%endif
%description
@@ -123,14 +132,6 @@ Group: Development/Libraries/Java
%description manual
%{summary}.
-%package demo
-Summary: Examples for %{name}
-Group: Development/Libraries/Java
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description demo
-%{summary}.
-
%prep
#cat <' > $DEPCAT
echo '' >> $DEPCAT
for p in $(find . -name project.xml); do
pushd $(dirname $p)
- /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+ /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
popd
done
echo >> $DEPCAT
echo '' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > bcel-5.1-depmap.new.xml
+/usr/bin/saxon $DEPCAT %{SOURCE2} > %{name}-%{version}-depmap.new.xml
for p in $(find . -name project.xml); do
pushd $(dirname $p)
- cp -pr project.xml project.xml.orig
- /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+ %{__cp} -pr project.xml project.xml.orig
+ /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} \
+ map="%{SOURCE4}"
popd
done
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
+export MAVEN_HOME_LOCAL="$(pwd)/.maven"
-maven \
+maven -e \
-Dmaven.repo.remote=file:/usr/share/maven/repository \
-Dmaven.home.local=${MAVEN_HOME_LOCAL} \
jar:jar javadoc:generate xdoc:transform
%else
-ant -Dbuild.dest=build/classes -Dbuild.dir=build \
+#ant -Dregexp.jar="file://$(build-classpath regexp)" jar javadoc
+ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
-Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
- compile jar apidocs xdocs
+ -Dregexp.jar="file://$(build-classpath regexp)" \
+ jar javadoc xdocs
%endif
%install
-%__rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
# jars
-%__mkdir_p %{buildroot}%{_javadir}
+%{__mkdir_p} %{buildroot}%{_javadir}
+%{__install} -m 0644 target/%{name}-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(
+ cd %{buildroot}%{_javadir}
+ for jar in *-%{version}*; do
+ %{__ln_s} ${jar} `echo $jar | %{__sed} "s|-%{version}||g"`
+ done
+)
+# depmap frags
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+# pom
%if %{with_maven}
-%__install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-%else
-%__install -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
+%{__install} -m 0644 %{SOURCE7} \
+ %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
%endif
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
%if %{with_maven}
-%__cp -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__rm -rf target/docs/apidocs
+%{__cp} -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__rm} -rf target/docs/apidocs
%else
-%__cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__rm -rf docs/api
+%{__cp} -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__rm} -rf dist/docs/api
%endif
-
-# samples
-%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}/demo
-%__cp -pr examples/ %{buildroot}%{_datadir}/%{name}-%{version}/demo/
-#TODO: need some kind of doc for the demo package for instructions on how to
-# build and run the demos.
+%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
# manual
-%__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
%if %{with_maven}
-%__cp -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%{__cp} -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}
%else
-%__cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%{__cp} -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
%endif
-%__cp -pr LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/
+%{__cp} LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
-%__rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
-%if %{gcj_support}
%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
+ %{_bindir}/rebuild-gcj-db
fi
%endif
-%if %{gcj_support}
%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
+%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)
-%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/*
-
+%if %{with_maven}
+%{_datadir}/maven2/poms/*
+%endif
+%{_mavendepmapfragdir}
%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/bcel-5.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*.jar.*
%endif
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}
-%files demo
-%defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}/demo
-
-# -----------------------------------------------------------------------------
-
%changelog
-* Tue Aug 14 2007 Permaine Cheung 0:5.1-10jpp.4
-- Fixed another unowned directory
-
-* Mon Jul 09 2007 Permaine Cheung 0:5.1-10jpp.3
-- Fixed unowned directory
-
-* Thu Apr 19 2007 Permaine Cheung 0:5.1-10jpp.2
-- Rebuild
-
-* Fri Apr 13 2007 Permaine Cheung 0:5.1-10jpp.1
-- Merge with upstream version and rpmlint cleanup, fix BR
+* Wed Sep 19 2007 Permaine Cheung 0:5.2-2jpp.1
+- Update to 5.2 in Fedora
+
+* Mon Sep 4 2007 Jason Corley 0:5.2-2jpp
+- use official 5.2 release tarballs and location
+- change vendor and distribution to macros
+- add missing requires on and maven-plugin-test, maven-plugins-base, and
+ maven-plugin-xdoc
+- macro bracket fixes
+- remove demo subpackage (examples are not included in the distribution tarball)
+- build in mock
+
+* Wed Jun 27 2007 Ralph Apel 0:5.2-1jpp
+- Upgrade to 5.2
+- Drop bootstrap option: not necessary any more
+- Add pom and depmap frags
* Fri Feb 09 2007 Ralph Apel 0:5.1-10jpp
-- Fix empty-post and empty-postun
+- Fix empty-%%post and empty-%%postun
- Fix no-cleaning-of-buildroot
* Fri Feb 09 2007 Ralph Apel 0:5.1-9jpp
- Optionally build without maven
- Add bootstrap option
-* Thu Aug 10 2006 Matt Wringe 0:5.1-8jpp.1
-- Merge with upstream version:
- - Add missing javadoc requires
-
-* Thu Aug 10 2006 Karsten Hopp 5.1-7jpp_334fc
-- last release was 333 (typo), need to build 334 now
-- Requires(post/postun): coreutils
-
-* Mon Jul 23 2006 Matt Wringe 0:5.1-7jpp-3fc
-- rebuild
-
-* Thu Jul 20 2006 Matt Wringe 0:5.1-7jpp_2fc
-- rebuild
-
-* Thu Jul 20 2006 Matt Wringe 0:5.1-7jpp_1fc
-- Merged with upstream version
-- set to build with Ant instead of Maven
+* Thu Aug 10 2006 Matt Wringe 0:5.1-8jpp
+- Add missing requires for Javadoc task
-* Thu Jul 20 2006 Matt Wringe 0:5.1-7jpp
+* Sun Jul 23 2006 Matt Wringe 0:5.1-7jpp
+- Add conditional native compilation
+- Change spec file encoding from ISO-8859-1 to UTF-8
- Add missing BR werken.xpath and ant-apache-regexp
-- Added conditional native compilation
-- Changed spec file encoding from ISO-8859-1 to UTF-8
* Tue Apr 11 2006 Ralph Apel 0:5.1-6jpp
- First JPP-1.7 release
diff --git a/sources b/sources
index bf00634..a66fbdd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f32a91243963d601aa34194657a53d60 bcel-5.1-src.tar.gz
+15c882886f67f90ee773cb526b84b4fa bcel-5.2-src.tar.gz
2c511b30e00109b501c6f3bd757a1ce1 bcel-jakarta-site2.tar.gz