rpms/avalon-logkit/devel avalon-logkit-javadoc.patch, NONE, 1.1 avalon-logkit.spec, 1.8, 1.9
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 4 12:38:38 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/avalon-logkit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23956
Modified Files:
avalon-logkit.spec
Added Files:
avalon-logkit-javadoc.patch
Log Message:
Reenable building of classes that require jms, and build with servletapi5
avalon-logkit-javadoc.patch:
build.xml | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE avalon-logkit-javadoc.patch ---
--- LogKit-1.2/build.xml~ 2005-07-04 12:58:51.000000000 +0100
+++ LogKit-1.2/build.xml 2005-07-04 13:35:40.000000000 +0100
@@ -467,6 +467,7 @@
sourcepath="${build.src}"
destdir="${build.javadocs}">
<classpath refid="project.class.path" />
+<!--
<doclet name="com.sun.tools.doclets.standard.Standard">
<param name="-author"/>
<param name="-version"/>
@@ -478,6 +479,7 @@
<param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
<param name="-link" value="http://avalon.apache.org/api/"/>
</doclet>
+-->
</javadoc>
</target>
Index: avalon-logkit.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-logkit/devel/avalon-logkit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- avalon-logkit.spec 11 Jan 2005 16:10:49 -0000 1.8
+++ avalon-logkit.spec 4 Jul 2005 12:38:36 -0000 1.9
@@ -2,9 +2,8 @@
%define short_Name LogKit
%define name avalon-%{short_name}
%define version 1.2
-%define release 2jpp_4fc
+%define release 3jpp_1fc
%define section free
-%define use_nonfree %{?_with_nonfree:1}%{!?_without_nonfree:0}
Name: %{name}
Version: %{version}
@@ -13,16 +12,13 @@
Summary: Java logging toolkit
License: Apache Software License
Group: Development/Libraries/Java
-#Distribution: JPackage
-#Vendor: JPackage Project
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
Requires: avalon-framework >= 0:4.1.4
-Requires: servlet
-%if %{use_nonfree}
+Requires: servletapi5
Requires: jms
-%endif
Requires: jdbc-stdext
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: ant
@@ -30,10 +26,8 @@
BuildRequires: junit
BuildRequires: log4j
BuildRequires: avalon-framework >= 0:4.1.4
-BuildRequires: servlet
-%if %{use_nonfree}
+BuildRequires: servletapi5
BuildRequires: jms
-%endif
BuildRequires: jdbc-stdext
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -52,13 +46,14 @@
%prep
rm -rf $RPM_BUILD_ROOT
-%setup -n %{short_Name}-%{version}
+%setup -q -n %{short_Name}-%{version}
%patch
+%patch1 -p1
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%build
-export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes
+export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servletapi5 jdbc-stdext avalon-framework junit):$PWD/build/classes
ant clean jar javadocs
%install
@@ -92,8 +87,12 @@
%{_javadocdir}/%{name}-%{version}
%changelog
+* Mon Jul 4 2005 Gary Benson <gbenson at redhat.com> 0:1.2-3jpp_1fc
+- Reenable building of classes that require jms.
+- Build with servletapi5.
+
* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:1.2-2jpp_4fc
-- Reenable building of classes that require javax.swing (#130006).
+- Reenable building of classes that require swing (#130006).
* Thu Nov 4 2004 Gary Benson <gbenson at redhat.com> 0:1.2-2jpp_3fc
- Build into Fedora.
@@ -101,6 +100,9 @@
* Thu Oct 28 2004 Gary Benson <gbenson at redhat.com> 0:1.2-2jpp_2fc
- Bootstrap into Fedora.
+* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-3jpp
+- Build with ant-1.6.2
+
* Fri Mar 5 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.2-2jpp_1rh
- RH vacuuming
More information about the fedora-cvs-commits
mailing list