From b241e0c5f9ebec9a26e924f41b47f466cbb9a2c5 Mon Sep 17 00:00:00 2001
From: Permaine Cheung <pcheung@fedoraproject.org>
Date: Sep 19 2007 18:01:52 +0000
Subject: Update to 5.2


---

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--build.xml generated by maven from project.xml version 5.2
+  on date June 26 2007, time 1708-->
+<project default="jar" name="bcel" basedir=".">
+  <!--Load local and user build preferences-->
+  <property file="build.properties"></property>
+  <!--Build properties-->
+  <property name="defaulttargetdir" value="${basedir}/target"></property>
+  <property name="libdir" value="${basedir}/lib"></property>
+  <property name="classesdir" value="${basedir}/target/classes"></property>
+  <property name="distdir" value="${basedir}/dist"></property>
+  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
+  <property name="final.name" value="bcel-5.2"></property>
+  <property name="proxy.host" value=""></property>
+  <property name="proxy.port" value=""></property>
+  <property name="proxy.username" value=""></property>
+  <property name="proxy.password" value=""></property>
+  <path id="build.classpath">
+    <pathelement location="${libdir}/regexp.jar"></pathelement>
+  </path>
+  <target name="init" description="o Initializes some properties">
+    <mkdir dir="${libdir}"></mkdir>
+    <condition property="noget">
+      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
+    </condition>
+    <!--Test if JUNIT is present in ANT classpath-->
+    <available property="Junit.present" classname="junit.framework.Test"></available>
+    <!--Test if user defined a proxy-->
+    <condition property="useProxy">
+      <and>
+        <isset property="proxy.host"></isset>
+        <not>
+          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
+        </not>
+      </and>
+    </condition>
+  </target>
+  <target name="compile" description="o Compile the code" depends="get-deps">
+    <mkdir dir="${classesdir}"></mkdir>
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+      <src>
+        <pathelement location="${basedir}/src/java"></pathelement>
+      </src>
+      <classpath refid="build.classpath"></classpath>
+    </javac>
+    <mkdir dir="${classesdir}/META-INF"></mkdir>
+    <copy todir="${classesdir}/META-INF">
+      <fileset dir="${basedir}/.">
+        <include name="NOTICE.txt"></include>
+      </fileset>
+    </copy>
+  </target>
+  <target name="jar" description="o Create the jar" depends="compile,test">
+    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
+  </target>
+  <target name="clean" description="o Clean up the generated directories">
+    <delete dir="${defaulttargetdir}"></delete>
+    <delete dir="${distdir}"></delete>
+  </target>
+  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+    <mkdir dir="dist"></mkdir>
+    <copy todir="dist">
+      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
+      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
+    </copy>
+  </target>
+  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+    <fail message="There were test failures."></fail>
+  </target>
+  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"></target>
+  <target name="junit-present" unless="Junit.present" depends="init">
+    <echo>================================= WARNING ================================</echo>
+    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="compile-tests" if="Junit.present" depends="junit-present,compile"></target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="${javadocdir}"></mkdir>
+    <tstamp>
+      <format pattern="2002-yyyy" property="year"></format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved."></property>
+    <property name="title" value="jakarta-bcel 5.2 API"></property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.bcel.*">
+      <classpath>
+        <path refid="build.classpath"></path>
+      </classpath>
+    </javadoc>
+  </target>
+  <target name="get-dep-regexp.jar" description="o Download the dependency : regexp.jar" unless="regexp.jar" depends="init,setProxy,noProxy,get-custom-dep-regexp.jar">
+    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
+    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/regexp.jar"></get>
+  </target>
+  <target name="get-custom-dep-regexp.jar" if="regexp.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/JPP/jars/"></mkdir>
+    <get dest="${libdir}/JPP/jars/regexp.jar" usetimestamp="true" ignoreerrors="true" src="${regexp.jar}"></get>
+  </target>
+  <target name="get-deps" unless="noget" depends="get-dep-regexp.jar"></target>
+  <target name="setProxy" if="useProxy" depends="init">
+    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+    <echo>Proxy used :</echo>
+    <echo>Proxy host [${proxy.host}]</echo>
+    <echo>Proxy port [${proxy.port}]</echo>
+    <echo>Proxy user [${proxy.username}]</echo>
+    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy>
+  </target>
+  <target name="noProxy" unless="useProxy" depends="init">
+    <echo>Proxy not used.</echo>
+  </target>
+  <target name="install-maven">
+    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
+    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
+  </target>
+  <!-- can rename this target when we get the docs sorted out -->
+
+  <!-- ================================================================== -->
+  <!-- D O C S                                                            -->
+  <!-- ================================================================== -->
+  
+  <target 
+    name="check_for_jdom">
+    
+    <available 
+      property="jdom.present"
+      classname="org.jdom.JDOMException">
+      <classpath>
+        <pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
+      </classpath>
+    </available>
+  </target>
+    
+  <target 
+    depends="check_for_jdom" 
+    name="docs-prepare-error" 
+    unless="jdom.present">
+    
+    <echo>
+      The Jakarta-Site2 module is not present! Please check
+      to make sure that you have checked it out from CVS.
+
+      &lt;http://jakarta.apache.org/site/jakarta-site2.html&gt;
+    </echo>
+  </target>
+
+  <target 
+    name="xdocs"
+    depends="docs-prepare-error"
+    description="--> generates the HTML documentation"
+    if="jdom.present">
+
+    <taskdef 
+      name="anakia"
+      classname="org.apache.velocity.anakia.AnakiaTask">
+      <classpath>
+        <fileset dir="${jakarta.site2}/lib">
+          <include name="*.jar"/>
+        </fileset>
+      </classpath>
+    </taskdef>
+        
+    <anakia 
+      basedir="${docs.src}" 
+      destdir="${docs.dest}/"
+      extension=".html" 
+      style="./site.vsl"
+      projectFile="stylesheets/project.xml"
+      excludes="**/stylesheets/** empty.xml"
+      includes="**/*.xml"
+      lastModifiedCheck="true"
+      templatePath="${jakarta.site2}/xdocs/stylesheets">
+    </anakia>
+
+    <copy 
+      todir="${docs.dest}/images" 
+      filtering="no">
+      
+      <fileset dir="${docs.src}/images">
+        <include name="**/*.gif"/>
+        <include name="**/*.jpeg"/>
+        <include name="**/*.jpg"/>
+      </fileset>
+    </copy>
+  </target>
+
+</project>
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 @@
+<?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>
\ 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 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>bcel</groupId>
+  <artifactId>bcel</artifactId>
+  <version>5.2</version>
+  <dependencies>
+    <groupId>regexp</groupId>
+    <artifactId>regexp</artifactId>
+    <version>1.4</version>
+  </dependencies>
+</project>
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 <<EOT
 #
@@ -139,14 +140,14 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 #
 #EOT
 
-%setup -q -n BCEL_5_1
+%setup -q -n BCEL_5_2
+gzip -dc %{SOURCE5} | tar xf -
 # remove all binary libs
 #find . -name "*.jar" -exec rm -f {} \;
 for j in $(find . -name "*.jar"); do
-    mv $j $j.no
+    %{__mv} $j ${j}.no
 done
-gzip -dc %{SOURCE5} | tar xf -
-%if ! %{bootstrap}
+%if %{without_maven}
 mkdir jakarta-site2/lib
 pushd jakarta-site2/lib/
   build-jar-repository -s -p . jdom
@@ -156,178 +157,165 @@ pushd jakarta-site2/lib/
   build-jar-repository -s -p . werken-xpath
 popd
 %endif
-pushd lib
-  ln -sf $(build-classpath regexp) Regex.jar
-popd
-%patch0 -p1
-%patch1 -b .sav
-
-# very broken build
-perl -p -i -e 's| depends=\"examples\"||g;' build.xml
-touch manifest.txt
+cp %{SOURCE6} build.xml
+%patch0 -b .sav
 
 # fix wrong-file-end-of-line-encoding
 sed -i 's/\r//' docs/verifier/V_API_SD.eps docs/eps/classloader.fig
 
 %build
 %if %{with_maven}
-export DEPCAT=$(pwd)/bcel-5.1-depcat.new.xml
+export DEPCAT="$(pwd)/%{name}-%{version}-depcat.new.xml"
 echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
 echo '<depset>' >> $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 '</depset>' >> $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 <pcheung at redhat.com> 0:5.1-10jpp.4
-- Fixed another unowned directory
-
-* Mon Jul 09 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.3
-- Fixed unowned directory
-
-* Thu Apr 19 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.2
-- Rebuild
-
-* Fri Apr 13 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
-- Merge with upstream version and rpmlint cleanup, fix BR
+* Wed Sep 19 2007 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.1
+- Update to 5.2 in Fedora
+
+* Mon Sep  4 2007 Jason Corley <jason.corley@gmail.com> 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 <r.apel@r-apel.de> 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 <r.apel@r-apel.de> 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 <r.apel@r-apel.de> 0:5.1-9jpp
 - Optionally build without maven
 - Add bootstrap option
 
-* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp.1
-- Merge with upstream version:
- - Add missing javadoc requires
-
-* Thu Aug 10 2006 Karsten Hopp <karsten@redhat.de> 5.1-7jpp_334fc
-- last release was 333 (typo), need to build 334 now
-- Requires(post/postun): coreutils
-
-* Mon Jul 23 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp-3fc
-- rebuild
-
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_2fc
-- rebuild
-
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_1fc
-- Merged with upstream version
-- set to build with Ant instead of Maven
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp
+- Add missing requires for Javadoc task
 
-* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp
+* Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> 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 <r.apel@r-apel.de> 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