diff --git a/.cvsignore b/.cvsignore
index e69de29..3ce170b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+xom-1.0.tar.gz
diff --git a/sources b/sources
index e69de29..374ea3a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+af472e90685eef0ac1e731eb84a49763 xom-1.0.tar.gz
diff --git a/xom-betterdocclasspath.patch b/xom-betterdocclasspath.patch
new file mode 100644
index 0000000..9a55dbd
--- /dev/null
+++ b/xom-betterdocclasspath.patch
@@ -0,0 +1,15 @@
+--- build.xml.orig 2007-02-14 17:22:32.000000000 -0500
++++ build.xml 2007-02-14 17:22:36.000000000 -0500
+@@ -368,7 +368,11 @@
+ encoding="UTF-8"
+ includes="nu/xom/tools/*">
+
+-
++
++
++
++
++
+
+
+
diff --git a/xom-gjdocissues.patch b/xom-gjdocissues.patch
new file mode 100644
index 0000000..8417f2a
--- /dev/null
+++ b/xom-gjdocissues.patch
@@ -0,0 +1,21 @@
+--- build.xml.orig 2007-02-14 16:57:41.000000000 -0500
++++ build.xml 2007-02-14 16:57:56.000000000 -0500
+@@ -294,7 +294,7 @@
+ windowtitle="${Name} ${version} API"
+ docencoding="UTF-8"
+ charset="UTF-8"
+- link="http://www.junit.org/junit/javadoc/3.8.1"
++ linkoffline="http://www.junit.org/junit/javadoc/3.8.1 org.junit"
+ doctitle="${Name} ${version}"
+ bottom="Copyright 2002-${year} <a href='http://www.elharo.com/'>Elliotte Rusty Harold</a>
+ <br/> <a href='mailto:elharo@metalab.unc.edu?Subject=XOM'>elharo@metalab.unc.edu</a>">
+@@ -346,8 +346,7 @@
+ windowtitle="${Name} ${version} API"
+ docencoding="UTF-8"
+ charset="UTF-8"
+- noqualifier="java.lang:java.io"
+- link="http://www.junit.org/junit/javadoc/3.8.1"
++ linkoffline="http://www.junit.org/junit/javadoc/3.8.1 org.junit"
+ doctitle="${Name} ${version}"
+ bottom="Copyright 2002-${year} <a href='http://www.elharo.com/'>Elliotte Rusty Harold</a>
+ <br/> <a href='mailto:elharo@metalab.unc.edu?Subject=XOM'>elharo@metalab.unc.edu</a>">
diff --git a/xom.spec b/xom.spec
new file mode 100644
index 0000000..527e1bc
--- /dev/null
+++ b/xom.spec
@@ -0,0 +1,190 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 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.
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+Summary: XML Pull Parser
+Name: xom
+Version: 1.0
+Release: 3jpp.1%{?dist}
+Epoch: 0
+License: LGPL
+URL: http://www.xom.nu
+Group: Development/Libraries
+Source0: http://www.cafeconleche.org/XOM/xom-1.0.tar.gz
+
+# Evidently gjdoc doesn't know about the noqualifier option; also, it
+# must do linkoffline and not link
+Patch0: %{name}-gjdocissues.patch
+# FIXME: file this
+# I don't know if this is a libgcj bug or if this is a legitimate typo
+# in build.xml
+Patch1: %{name}-betterdocclasspath.patch
+
+BuildRequires: ant >= 0:1.6, jpackage-utils >= 0:1.6
+BuildRequires: junit
+BuildRequires: xalan-j2
+BuildRequires: xerces-j2
+BuildRequires: icu4j
+BuildRequires: xml-commons-apis
+
+BuildRequires: tagsoup
+BuildRequires: classpathx-jaxp
+BuildRequires: xml-commons-resolver
+BuildRequires: servlet
+
+Requires: xalan-j2
+Requires: xerces-j2
+Requires: icu4j
+Requires: xml-commons-apis
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+XOM is a new XML object model. It is an open source (LGPL),
+tree-based API for processing XML with Java that strives
+for correctness, simplicity, and performance, in that order.
+XOM is designed to be easy to learn and easy to use. It
+works very straight-forwardly, and has a very shallow
+learning curve. Assuming you're already familiar with XML,
+you should be able to get up and running with XOM very quickly.
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation
+
+%description javadoc
+%{summary}.
+
+%package demo
+Summary: Samples for %{name}
+Group: Documentation
+Requires: %{name} = 0:%{version}
+
+%description demo
+%{summary}.
+
+%prep
+%setup -q -n XOM
+%patch0
+%patch1
+# remove all binary libs
+find . -name "*.jar" -exec rm -f {} \;
+
+%build
+pushd lib
+ln -sf $(build-classpath junit) junit.jar
+ln -sf $(build-classpath xerces-j2) xercesImpl.jar
+ln -sf $(build-classpath xalan-j2) xalan.jar
+ln -sf $(build-classpath icu4j) normalizer.jar
+ln -sf $(build-classpath xml-commons-apis) xmlParserAPIs.jar
+popd
+mkdir lib2
+pushd lib2
+ln -sf $(build-classpath tagsoup) tagsoup-1.0rc1.jar
+ln -sf $(build-classpath classpathx-jaxp/gnujaxp) gnujaxp.jar
+ln -sf $(build-classpath xml-commons-resolver) resolver.jar
+DOM4J_PRESENT=$(build-classpath dom4j)
+if [ -n "$DOM4J_PRESENT" ]; then
+ln -sf $(build-classpath dom4j) dom4j-1.5.1.jar
+fi
+ln -sf $(build-classpath servlet) servlet.jar
+popd
+
+ant jar samples betterdoc
+
+# Fix encoding
+sed -i 's/\r//g' LICENSE.txt
+pushd apidocs
+for f in `find -name \*.css -o -name \*.html`; do
+ sed -i 's/\r//g' $f
+done
+popd
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+
+install -m 644 build/%{name}-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+# demo
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+install -m 644 build/xom-samples.jar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(0644,root,root,0755)
+%doc overview.html
+%doc README.txt
+%doc LICENSE.txt
+%doc Todo.txt
+%doc lgpl.txt
+%doc %{name}.graffle
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/*
+
+%files demo
+%defattr(0644,root,root,0755)
+%{_datadir}/%{name}-%{version}/xom-samples.jar
+
+%changelog
+* Wed Feb 14 2007 Andrew Overholt 0:1.0-3jpp.1
+- Update for Fedora review
+- Remov Vendor & Distribution tags
+- Add .1%%{?dist} to release
+- Remove bad javadoc symlinking and %%post{,un}
+- Fixe buildroot
+- Use %%doc for doc files
+- Change group to Development/Libraries
+- Remove running of tests; should perhaps move to %%check
+- Fix encoding of LICENSE.txt and generated javadocs
+- Remove BR: saxon
+
+* Tue Feb 28 2006 Fernando Nasser - 0:1.0-3jpp
+- Remove dependency on clover10 (non-free)
+
+* Sun Feb 26 2006 Fernando Nasser - 0:1.0-2jpp
+- First JPP 1.7 release
+
+* Wed Aug 17 2005 Ralph Apel - 0:1.0-1jpp
+- First JPP release