[xalan-j2] Fix review comments.

[Alexander Kurtakov]

commit 832fd388b771bd1cbde3ea98280c895e9f9362f9
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jul 26 17:43:28 2011 +0300

    Fix review comments.

 xalan-j2-crosslink.patch       |   26 ---------
 xalan-j2-manifest.patch        |  118 ----------------------------------------
 xalan-j2-src-MANIFEST-MF.patch |   32 -----------
 xalan-j2.spec                  |   60 +++++++++------------
 4 files changed, 25 insertions(+), 211 deletions(-)
---
diff --git a/xalan-j2.spec b/xalan-j2.spec
index dd03fa7..467e3e7 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -32,7 +32,7 @@
 
 Name:           xalan-j2
 Version:        2.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 # samples/servlet/ApplyXSLTException.java is ASL 1.1
@@ -41,12 +41,8 @@ License:        ASL 1.1 and ASL 2.0 and W3C
 Source0:        http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz
 Source1:        %{name}-serializer-MANIFEST.MF
 Patch0:         %{name}-noxsltcdeps.patch
-Patch1:         %{name}-manifest.patch
-Patch2:         %{name}-crosslink.patch
-#This patch uses xalan-j2-serializer.jar in the MANIFEST files instead of serializer
-Patch3:		%{name}-src-MANIFEST-MF.patch
 URL:            http://xalan.apache.org/
-Group:          Text Processing/Markup/XML
+Group:          Development/Libraries
 
 BuildArch:      noarch
 Provides:       jaxp_transform_impl
@@ -54,14 +50,14 @@ Requires:       xerces-j2
 Requires(post): chkconfig
 Requires(preun): chkconfig
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:	java-devel
+BuildRequires:  java-devel
 BuildRequires:  ant
 BuildRequires:  bcel
-BuildRequires:	jlex
-BuildRequires:	java_cup
-BuildRequires:	regexp
-BuildRequires:	sed
-BuildRequires:	servlet25
+BuildRequires:  jlex
+BuildRequires:  java_cup
+BuildRequires:  regexp
+BuildRequires:  sed
+BuildRequires:  servlet25
 BuildRequires:  xerces-j2 >= 0:2.7.1
 BuildRequires:  xml-commons-apis >= 0:1.3
 BuildRequires:  xml-stylebook
@@ -76,12 +72,12 @@ in other program.
 
 %package        xsltc
 Summary:        XSLT compiler
-Group:          Text Processing/Markup/XML
+Group:          Development/Tools
 Requires:       java_cup
-Requires:	bcel
-Requires:	jlex
-Requires:	regexp
-Requires:	xerces-j2
+Requires:       bcel
+Requires:       jlex
+Requires:       regexp
+Requires:       xerces-j2
 
 %description    xsltc
 The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets into
@@ -89,14 +85,14 @@ lightweight and portable Java byte codes called translets.
 
 %package        manual
 Summary:        Manual for %{name}
-Group:          Text Processing/Markup/XML
+Group:          Documentation
 
 %description    manual
 Documentation for %{name}.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       jpackage-utils
 BuildRequires:  java-javadoc
 
@@ -105,7 +101,7 @@ Javadoc for %{name}.
 
 %package        demo
 Summary:        Demo for %{name}
-Group:          Text Processing/Markup/XML
+Group:          Documentation
 Requires:       %{name} = %{epoch}:%{version}-%{release}, servlet25
 
 %description    demo
@@ -114,12 +110,9 @@ Demonstrations and samples for %{name}.
 %prep
 %setup -q -n xalan-j_%{cvs_version}
 %patch0 -p0
-#%patch3 -p0
-#%patch1 -p0
-#%patch2 -p0
 # Remove all binary libs, except ones needed to build docs and N/A elsewhere.
 for j in $(find . -name "*.jar"); do
-	mv $j $j.no
+    mv $j $j.no
 done
 # FIXME who knows where the sources are? xalan-j1 ?
 mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar
@@ -201,16 +194,6 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
   update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
-#%post xsltc
-#update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
-#  jaxp_transform_impl %{_javadir}/xsltc.jar 10
-
-#%preun xsltc
-#{
-#  [ $1 = 0 ] || exit 0
-#  update-alternatives --remove jaxp_transform_impl %{_javadir}/xsltc.jar
-#} >/dev/null 2>&1 || :
-
 %files
 %doc KEYS LICENSE.txt NOTICE.txt readme.html
 %{_javadir}/%{name}.jar
@@ -218,18 +201,25 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 %ghost %{_javadir}/jaxp_transform_impl.jar
 
 %files xsltc
+%doc LICENSE.txt
 %{_javadir}/xsltc.jar
 
 %files manual
+%doc LICENSE.txt
 %doc build/docs/*
 
 %files javadoc
+%doc LICENSE.txt
 %doc %{_javadocdir}/%{name}
 
 %files demo
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jul 26 2011 Alexander Kurtakov <akurtako at redhat.com> 0:2.7.1-5
+- Remove old commented parts.
+- Fix rpmlint warnings.
+
 * Tue Jun 28 2011 Alexander Kurtakov <akurtako at redhat.com> 0:2.7.1-4
 - Fix FTBFS.
 
@@ -496,7 +486,7 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 * Fri Sep 14 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.2.D10-1mdk
 - cvs references
 - splitted demo package
-- moved demo files to %{_datadir}/%{name}
+- moved demo files to %%{_datadir}/%%{name}
 - only manual package requires stylebook-1.0b3
 - only demo package requires servletapi3