diff --git a/.cvsignore b/.cvsignore
index d657436..e78a4bb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-adaptx-0.9.13-src-RHCLEAN.tar.gz
+adaptx-0.9.13-src.tar.bz2
diff --git a/adaptx.spec b/adaptx.spec
index 9e25eef..b95c6a4 100644
--- a/adaptx.spec
+++ b/adaptx.spec
@@ -32,43 +32,46 @@
 
 %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
+Name:          adaptx
+Version:       0.9.13
+Release:       4jpp.1%{?dist}
+Summary:       AdaptX XSLT processor and XPath engine
+License:       BSD
+Group:         Applications/Text
+# svn export http://svn.codehaus.org/castor/adaptx/tags/0.9.13/ adaptx-0.9.13-src
+# tar cjf adaptx-0.9.13-src.tar.bz2 adaptx-0.9.13-src
+Source0:       %{name}-%{version}-src.tar.bz2
 
-Name:		adaptx
-Version:	0.9.13
-Release:	3jpp.1
-Epoch:		0
-Summary:	AdaptX
-License:	Exolab Software License
-Group:		Development/Libraries/Java
-Source0:	%{name}-%{version}-src-RHCLEAN.tar.gz
-# svn export http://svn.codehaus.org/castor/adaptx
-
-Patch0:		%{name}-%{version}-xsl.patch
-Patch1:		%{name}-%{version}-missingstubs.patch
-Url:		http://castor.codehaus.org/
-BuildRequires:	ant >= 0:1.6
-BuildRequires:	jpackage-utils >= 0:1.6
-BuildRequires:	log4j
-BuildRequires:  xml-commons-apis
-BuildRequires:	xerces-j2
+Patch0:        %{name}-%{version}-xsl.patch
+Patch1:        %{name}-%{version}-missingstubs.patch
+Url:           http://castor.codehaus.org/
+BuildRequires: ant >= 0:1.6
+BuildRequires: jpackage-utils >= 0:1.6
+BuildRequires: log4j
+BuildRequires: xml-commons-apis
+BuildRequires: xerces-j2
+Requires:      log4j
+Requires:      xml-commons-apis
+Requires:      xerces-j2
+Requires(pre):    jpackage-utils
+Requires(postun): jpackage-utils
 %if ! %{gcj_support}
-BuildArch:	noarch
+BuildArch:    noarch
 %endif
-BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
 %endif
 
 %description
 Adaptx is an XSLT processor and XPath engine.
 
 %package javadoc
-Group:		Development/Java
-Summary:	Javadoc for %{name}
+Group:            Documentation
+Summary:          Javadoc for %{name}
 Requires(post):   /bin/rm,/bin/ln
 Requires(postun): /bin/rm
 
@@ -76,8 +79,8 @@ Requires(postun): /bin/rm
 Javadoc for %{name}.
 
 %package doc
-Summary:	Documentation for %{name}
-Group:		Development/Documentation
+Summary:    Documentation for %{name}
+Group:      Documentation
 
 %description doc
 Documentation for %{name}.
@@ -88,7 +91,7 @@ Documentation for %{name}.
 for dir in `find . -type d -name CVS`; do rm -rf $dir; done
 # remove all binary libs
 for j in $(find . -name "*.jar"); do
-	mv $j $j.no
+    mv $j $j.no
 done
 
 %patch0
@@ -96,13 +99,14 @@ done
 
 %build
 perl -p -i -e 's|classic|modern|' src/build.xml
-#export CLASSPATH=$(build-classpath js log4j xerces-j2 xml-commons-apis)
 export CLASSPATH=$(build-classpath xml-commons-apis log4j xerces-j2)
 ant -buildfile src/build.xml jar javadoc
 CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar
 ant -buildfile src/build.xml doc
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/%{name}_%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -162,6 +166,9 @@ fi
 %doc build/doc/*
 
 %changelog
+* Wed Jan 31 2007 Deepak Bhole <dbhole@redhat.com> 0.9.13-4jpp.1
+- Fixed issues raised by rpmlint
+
 * Thu Aug 03 2006 Deepak Bhole <dbhole@redhat.com> 0:0.9.13-3jpp.1
 - Added missing requirements. 
 
diff --git a/sources b/sources
index 10fc213..de7cd43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d9765b42d49bb83b7b8ac00a57cabc9  adaptx-0.9.13-src-RHCLEAN.tar.gz
+a8990dd15db443266ffceb3646de26b6  adaptx-0.9.13-src.tar.bz2