From 88d8600abd43218cc69b2d9b91cb9b33f484b2b9 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: May 03 2011 19:42:21 +0000
Subject: Merge Stanislav's changes on top of what I've been doing meanwhile.


Conflicts (resolved):
	avalon-framework.spec

---

diff --git a/avalon-framework.spec b/avalon-framework.spec
index f394f52..4f51230 100644
--- a/avalon-framework.spec
+++ b/avalon-framework.spec
@@ -33,7 +33,7 @@
 
 Name:        avalon-%{short_name}
 Version:     4.3
-Release:     2%{?dist}
+Release:     3%{?dist}
 Epoch:       0
 Summary:     Java components interfaces
 License:     ASL 2.0
@@ -128,6 +128,7 @@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-api
 # pom file
 install -pm 644 %{name}-api-%{version}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-api.pom
 %add_to_maven_depmap %{name} %{name}-api %{version} JPP %{name}-api
+%add_to_maven_depmap org.apache.avalon.framework %{name}-api %{version} JPP %{name}-api
 
 # javadocs
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-api/
@@ -140,6 +141,7 @@ ln -sf %{_javadir}/%{name}-impl.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}.jar
 # pom file
 install -pm 644 %{name}-impl-%{version}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-impl.pom
 %add_to_maven_depmap %{name} %{name}-impl %{version} JPP %{name}-impl
+%add_to_maven_depmap org.apache.avalon.framework %{name}-impl %{version} JPP %{name}-impl
 %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}-impl
 
 # javadocs
@@ -170,9 +172,12 @@ popd
 %{_javadocdir}/%{name}
 
 %changelog
-* Tue May 3 2011 Severin Gehwolf <sgehwolf@redhat.com> 0:4.3-2
+* Tue May 3 2011 Severin Gehwolf <sgehwolf@redhat.com> 0:4.3-3
 - Convert jar's to OSGi bundles using aqute-bndlib.
 
+* Tue May  3 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:4.3-2
+- Add compatibility depmap for org.apache.avalon.framework groupId
+
 * Wed Apr 20 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:4.3-1
 - Latest version
 - Split into two jars, provide backward compatible symlink