rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec, 1.46, 1.47

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-logging/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15964/devel

Modified Files:
	jakarta-commons-logging.spec 
Log Message:
- Drop gcj_support.
- Do not compile avalon parts.


Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- jakarta-commons-logging.spec	25 Jul 2009 03:51:13 -0000	1.46
+++ jakarta-commons-logging.spec	5 Mar 2010 11:29:02 -0000	1.47
@@ -28,21 +28,17 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %define base_name  logging
 %define short_name commons-%{base_name}
 %define section    free
 
 Name:           jakarta-%{short_name}
 Version:        1.0.4
-Release:        9.8%{?dist}
+Release:        9.9%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        ASL 2.0
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 URL:            http://jakarta.apache.org/commons/%{base_name}/
 #wget http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-1.0.4-src.tar.gz
 Source0:        commons-logging-1.0.4-src.tar.gz
@@ -51,20 +47,9 @@ Patch1:         %{short_name}-eclipse-ma
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  junit
-BuildRequires:  avalon-logkit
-BuildRequires:	avalon-framework
 BuildRequires:  log4j
-%if ! %{gcj_support}
-BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
-
 %description
 The commons-logging package provides a simple, component oriented
 interface (org.apache.commons.logging.Log) together with wrappers for
@@ -78,7 +63,7 @@ logging implementation.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 # for /bin/rm and /bin/ln
 Requires(post):   coreutils
 Requires(postun): coreutils
@@ -102,19 +87,9 @@ cat > build.properties <<EOBM
 junit.jar=$(build-classpath junit)
 log4j.jar=$(build-classpath log4j)
 log4j12.jar=$(build-classpath log4j)
-logkit.jar=$(build-classpath avalon-logkit)
-avalon-framework-api.jar=$(build-classpath avalon-framework)
-avalon-framework-impl.jar=$(build-classpath avalon-framework)
 EOBM
 
-ant compile.tests dist
-
-# FIXME: There are failures with gcj. Ignore them for now.
-%if %{gcj_support}
-  ant -Dtest.failonerror=false test
-%else
-  ant test
-%endif
+ant dist test
 
 # -----------------------------------------------------------------------------
 
@@ -132,11 +107,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_java
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 # -----------------------------------------------------------------------------
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -153,31 +123,11 @@ fi
 
 # -----------------------------------------------------------------------------
 
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
@@ -185,6 +135,10 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Mar 5 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0.4-9.9
+- Drop gcj_support.
+- Do not compile avalon parts.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.4-9.8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild