[wsdl4j] - Drop gcj support. - Fix groups.

[Alexander Kurtakov]

commit 60d16350fcceb65f621be73794e56558435956c1
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Oct 6 13:07:36 2010 +0300

    - Drop gcj support.
    - Fix groups.

 wsdl4j.spec |   68 +++++++++-------------------------------------------------
 1 files changed, 11 insertions(+), 57 deletions(-)
---
diff --git a/wsdl4j.spec b/wsdl4j.spec
index 21e608f..95c4a48 100644
--- a/wsdl4j.spec
+++ b/wsdl4j.spec
@@ -28,25 +28,15 @@
 # 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 section         free
-
-# -----------------------------------------------------------------------------
-
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
 Version:        1.5.2
-Release:        7.7%{?dist}
+Release:        8%{?dist}
 Epoch:          0
-Group:          Text Processing/Markup/XML
+Group:          Development/Libraries
 License:        CPL
 URL:            http://sourceforge.net/projects/wsdl4j
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 Source0:        wsdl4j-%{version}-src-RHCLEAN.tar.gz
 ##cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j login
 ##cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_5_2 wsdl4j
@@ -57,12 +47,6 @@ BuildRequires:  ant, ant-junit, java-devel
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	junit
 
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
-
 %description
 The Web Services Description Language for Java Toolkit (WSDL4J) allows the
 creation, representation, and manipulation of WSDL documents describing
@@ -70,7 +54,7 @@ services.  This codebase will eventually serve as a reference implementation
 of the standard created by JSR110.
 
 %package javadoc
-Group:          Development/Documentation
+Group:          Documentation
 Summary:        Javadoc for %{name}
 # for /bin/rm and /bin/ln
 Requires(post):   coreutils
@@ -80,7 +64,6 @@ Requires(postun): coreutils
 Javadoc for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{name}-%{version}
 
 %build
@@ -113,53 +96,24 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-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)
+%defattr(-,root,root,-)
 %doc license.html
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
 
 %changelog
+* Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.2-8
+- Drop gcj support.
+- Fix groups.
+
 * Mon May 31 2010 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.2-7.7
 - Fix specfile encoding.
 
@@ -203,7 +157,7 @@ fi
 
 * Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> 0:1.5.2-1jpp
 - update to 1.5.2
-- move qname*.jar to %{_javadir}/wsdl4j/qname*.jar
+- move qname*.jar to %%{_javadir}/wsdl4j/qname*.jar
   to make place for qname provided by geronimo-specs
 
 * Thu Jun 02 2005 Fernando Nasser <fnasser at redhat.com> 0:1.5.1-1jpp