From c48f77302bac6cc8c7c3ad372f201791b3a31de3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Dec 14 2005 18:07:09 +0000 Subject: patch to not use target= in build.xml --- diff --git a/.cvsignore b/.cvsignore index 438603d..b2afcb5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ LogKit-1.2 avalon-site noarch *.src.rpm +avalon-logkit-notarget.patch diff --git a/avalon-logkit.spec b/avalon-logkit.spec index 1ef694b..7a4e731 100644 --- a/avalon-logkit.spec +++ b/avalon-logkit.spec @@ -2,7 +2,7 @@ %define short_Name LogKit %define name avalon-%{short_name} %define version 1.2 -%define release 3jpp_1fc.1 +%define release 3jpp_1fc.2 %define section free Name: %{name} @@ -16,6 +16,7 @@ Url: http://avalon.apache.org/%{short_name}/ Source0: http://jakarta.apache.org/builds/jakarta-avalon/release/logkit/latest/LogKit-1.2-src.tar.gz Patch0: %{name}-build.patch Patch1: %{name}-javadoc.patch +Patch1: %{name}-notarget.patch Requires: avalon-framework >= 0:4.1.4 Requires: servletapi5 Requires: jms @@ -49,6 +50,7 @@ rm -rf $RPM_BUILD_ROOT %setup -q -n %{short_Name}-%{version} %patch %patch1 -p1 +%patch1 -p0 # remove all binary libs find . -name "*.jar" -exec rm -f {} \; @@ -87,8 +89,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog -* Wed Dec 14 2005 Jesse Keating 0:1.2-3jpp_1fc.1 +* Wed Dec 14 2005 Jesse Keating 0:1.2-3jpp_1fc.2 - bump for new gcj +- change to not use target= in build.xml * Mon Jul 4 2005 Gary Benson 0:1.2-3jpp_1fc - Reenable building of classes that require jms. diff --git a/sources b/sources index 2dbda40..feab16c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 17ede0a7d297ad610b47c476757c2b96 LogKit-1.2-src.tar.gz +02fa0fd5e0c3cef980d1c0d6f31067af avalon-logkit-notarget.patch