[tagsoup] Fix FTBFS.

[Alexander Kurtakov]

commit 072cdab4944316c461b9ab60a65949f21018fd08
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Dec 21 13:10:12 2010 +0200

    Fix FTBFS.
    
    - Drop gcj.
    - Adapt to current guidelines.

 tagsoup.spec |   67 ++++++++++++---------------------------------------------
 1 files changed, 14 insertions(+), 53 deletions(-)
---
diff --git a/tagsoup.spec b/tagsoup.spec
index 6f32c9e..7c28b09 100644
--- a/tagsoup.spec
+++ b/tagsoup.spec
@@ -10,7 +10,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the
-#    distribution.
+#    distributio4.3n.
 # 3. Neither the name of the JPackage Project nor the names of its
 #    contributors may be used to endorse or promote products derived
 #    from this software without specific prior written permission.
@@ -28,15 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%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 gcj_support 1
-
-%define section free
-
 Name:           tagsoup
 Version:        1.0.1
-Release:        4.3%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        A SAX-compliant HTML parser written in Java 
 License:        GPLv2+ or AFL
@@ -46,19 +40,11 @@ Group:          Text Processing/Markup/XML
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # see https://bugzilla.redhat.com/show_bug.cgi?id=502328
 ExcludeArch:  ppc64
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 # Used to ensure that jpackage-utils is available till uninstallation of package
 Requires:          jpackage-utils >= 0:1.6
 Requires(postun):       jpackage-utils >= 0:1.6
-BuildRequires:  ant, ant-trax, xalan-j2, /bin/bash
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
+BuildRequires:  ant, ant-nodeps, xalan-j2, bash
 
 %description 
 TagSoup is a SAX-compliant parser written in Java that, instead of
@@ -82,6 +68,7 @@ Javadoc for %{name}.
 %setup -q
 
 %build
+export CLASSPATH=$(build-classpath xalan-j2-serializer)
 ant \
   -Dversion=%{version} \
   -Dj2se.apiurl=%{_javadocdir}/java \
@@ -91,51 +78,25 @@ ant \
 rm -fr $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/lib/%{name}-%{version}.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $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
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+               $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_javadir}/*.jar
 %doc CHANGES README LICENSE
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tagsoup-1.0.1.jar.*
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Dec 21 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0.1-5
+- Fix FTBFS.
+- Drop gcj.
+- Adapt to current guidelines.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.1-4.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild