Merge with upstream

bcel.spec

@@ -43,7 +43,7 @@
 
 Name:           bcel
 Version:        5.2
-Release:        2jpp.2%{?dist}
+Release:        3jpp.2%{?dist}
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        ASL 2.0
@@ -213,12 +213,15 @@ ant     -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
 )
 # depmap frags
 %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+%add_to_maven_depmap org.apache.bcel %{name} %{version} JPP %{name}
 # pom
-%if %{with_maven}
 %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
 %{__install} -m 0644 %{SOURCE7} \
-    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
-%endif
+    %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+%{__mkdir_p} %{buildroot}%{_datadir}/maven2/default_poms
+%{__install} -m 0644 %{SOURCE7} \
+    %{buildroot}%{_datadir}/maven2/default_poms/JPP-%{name}.pom
+
 # javadoc
 %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
 %if %{with_maven}
@@ -269,6 +272,7 @@ fi
 %{_javadir}/*
 %if %{with_maven}
 %{_datadir}/maven2/poms/*
+%{_datadir}/maven2/default_poms/*
 %endif
 %{_mavendepmapfragdir}
 %if %{gcj_support}
@@ -286,9 +290,17 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-3jpp.1
+- Merge with upstream
+
 * Mon Jan 07 2008 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.2
 - Fixed unowned directory (Bugzilla 246185)
 
+* Fri Nov 16 2007 Ralph Apel <r.apel@r-apel.de> 0:5.2-3jpp
+- Install poms unconditionally
+- Add pom in ./maven2/default_poms
+- Add org.apache.bcel:bcel depmap frag
+
 * Wed Sep 19 2007 Permaine Cheung <pcheung at redhat.com> 0:5.2-2jpp.1
 - Update to 5.2 in Fedora