diff --git a/avalon-logkit-pom-deps.patch b/avalon-logkit-pom-deps.patch new file mode 100644 index 0000000..1ad37de --- /dev/null +++ b/avalon-logkit-pom-deps.patch @@ -0,0 +1,33 @@ +--- pom.xml 2011-04-21 14:24:29.000000000 +0200 ++++ pom.xml.new 2011-05-05 14:37:27.016877493 +0200 +@@ -13,19 +13,19 @@ + 1.2.11 + + +- servletapi +- servletapi +- 2.3 ++ javax.servlet ++ servlet-api ++ 2.5 + + +- geronimo-spec +- geronimo-spec-javamail +- 1.3.1-rc3 ++ javax.mail ++ mail ++ 1.4.3 + + +- geronimo-spec +- geronimo-spec-jms +- 1.1-rc4 ++ javax.jms ++ jms ++ 1.1.1 + + +- +\ No newline at end of file ++ diff --git a/avalon-logkit.spec b/avalon-logkit.spec index 0ab1b5f..2dc9c70 100644 --- a/avalon-logkit.spec +++ b/avalon-logkit.spec @@ -33,7 +33,7 @@ Name: avalon-%{short_name} Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Java logging toolkit License: ASL 1.1 @@ -42,6 +42,7 @@ URL: http://avalon.apache.org/%{short_name}/ Source0: http://www.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip Source1: http://repo1.maven.org/maven2/avalon-logkit/avalon-logkit/%{version}/%{name}-%{version}.pom Patch0: fix-java6-compile.patch +Patch1: avalon-logkit-pom-deps.patch Requires: avalon-framework >= 0:4.1.4 Requires: servlet25 Requires: jms @@ -82,6 +83,9 @@ Javadoc for %{name}. %setup -q %patch0 +cp %{SOURCE1} pom.xml +%patch1 + # remove all binary libs find . -name "*.jar" -exec rm -f {} \; @@ -98,7 +102,7 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir} install -m 644 target/%{name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom +install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %add_to_maven_depmap %{name} %{name} %{version} JPP %{name} # compatibility depmaps @@ -134,6 +138,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadocdir}/%{name} %changelog +* Fri May 6 2011 Stanislav Ochotnicky - 0:2.1-5 +- Fix up depdenencies in pom + * Tue May 3 2011 Severin Gehwolf 0:2.1-4 - Convert jar's to OSGi bundles using aqute-bndlib.