diff --git a/avalon-logkit.spec b/avalon-logkit.spec index 28c0e1b..fec35d6 100644 --- a/avalon-logkit.spec +++ b/avalon-logkit.spec @@ -2,9 +2,9 @@ %define short_Name LogKit %define name avalon-%{short_name} %define version 1.2 -%define release 2jpp_3fc +%define release 2jpp_4fc %define section free -%define use_nonfree %{?_with_nonfree:1}%{!?_without_nonfree:0} +%define use_nonfree %{?_with_nonfree:1}%{!?_without_nonfree:0} Name: %{name} Version: %{version} @@ -56,10 +56,6 @@ rm -rf $RPM_BUILD_ROOT %patch # remove all binary libs find . -name "*.jar" -exec rm -f {} \; -# delete stuff that doesn't work with gcj log4j (ultimatly #130006). -if java -version 2>&1 | grep -q "gcj"; then - rm -f src/java/org/apache/log/output/lf5/LF5LogTarget.java -fi %build export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes @@ -96,6 +92,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Tue Jan 11 2005 Gary Benson 0:1.2-2jpp_4fc +- Reenable building of classes that require javax.swing (#130006). + * Thu Nov 4 2004 Gary Benson 0:1.2-2jpp_3fc - Build into Fedora.