From a5c3ad3d30425c60d7ff17565a18e98fc163798d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:41:06 +0000
Subject: [PATCH 01/21] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f57e6ea..1615be1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: xpp2
-# $Id$
+# $Id: Makefile,v 1.1 2007/02/21 22:20:39 wtogami Exp $
 NAME := xpp2
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 34b41e09a8cfd61dbc57c0d89f8870221624ade1 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <peter@fedoraproject.org>
Date: Wed, 10 Mar 2010 11:36:33 +0000
Subject: [PATCH 02/21] Missing requires jpackage-utils added

---
 import.log | 1 +
 xpp2.spec  | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 import.log

diff --git a/import.log b/import.log
new file mode 100644
index 0000000..a2cf1e3
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+xpp2-2_1_10-8_3_fc12:HEAD:xpp2-2.1.10-8.3.fc12.src.rpm:1268220944
diff --git a/xpp2.spec b/xpp2.spec
index 3058dcc..b6ded52 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        8.2%{?dist}
+Release:        8.3%{?dist}
 Epoch:          0
 License:        ASL 1.1
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -52,12 +52,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser.
-NOTE: XPP2 is no longer developed and is on maintenance mode. 
+NOTE: XPP2 is no longer developed and is on maintenance mode.
 All active development concentrates on its successor XPP3/MXP1.
 
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 %{summary}.
@@ -159,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Wed Mar 10 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:2.1.10-8.3
+- Added missing requires - jpackage-utils
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-8.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 50cf646729fecbac5e97af91c5af9417989c02e8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 16:10:31 +0000
Subject: [PATCH 03/21] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 import.log               |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1615be1..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xpp2
-# $Id: Makefile,v 1.1 2007/02/21 22:20:39 wtogami Exp $
-NAME := xpp2
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index a2cf1e3..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-xpp2-2_1_10-8_3_fc12:HEAD:xpp2-2.1.10-8.3.fc12.src.rpm:1268220944

From 0275defb8ad9fe6e302a41bed88ccabe996427b3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 27 Aug 2010 15:16:15 -0400
Subject: [PATCH 04/21] Retire xpp2.

---
 dead.package         |   1 +
 sources              |   1 -
 xpp2-build_xml.patch | 199 ------------------------------------------
 xpp2.spec            | 202 -------------------------------------------
 4 files changed, 1 insertion(+), 402 deletions(-)
 create mode 100644 dead.package
 delete mode 100644 sources
 delete mode 100644 xpp2-build_xml.patch
 delete mode 100644 xpp2.spec

diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..7dcad86
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+This package was retired due to no active owner on 2010-08-27
diff --git a/sources b/sources
deleted file mode 100644
index d129abc..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-865ca4e2496c215d301b57450137626f  PullParser2.1.10.tgz
diff --git a/xpp2-build_xml.patch b/xpp2-build_xml.patch
deleted file mode 100644
index 9df42aa..0000000
--- a/xpp2-build_xml.patch
+++ /dev/null
@@ -1,199 +0,0 @@
---- build.xml.sav	2003-11-15 06:42:11.000000000 +0100
-+++ build.xml	2005-08-10 11:58:48.000000000 +0200
-@@ -9,7 +9,8 @@
-   <property name="midp4palm.home" value="c:/util/midp4palm1.0" />
- 
- 
--  <property name="target" value="1.1" />
-+  <property name="target" value="1.4" />
-+  <property name="source" value="1.4" />
-   <!-- set global properties for this build -->
- 
-   <property name="name" value="XML Pull Parser"/>
-@@ -165,7 +166,7 @@
- 
-   <target name="intf" depends="prepare">
-     <mkdir dir="${build_intf}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_intf}" destdir="${build_intf}"/>
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_intf}" destdir="${build_intf}"/>
-     <touch file="${build_intf}/PullParser${version}_VERSION"/>
-   </target>
- 
-@@ -175,7 +176,7 @@
- 
-   <target name="impl_tag" depends="intf">
-     <mkdir dir="${build_impl_tag}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_tag}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_tag}"
-       destdir="${build_impl_tag}"
-       classpath="${build_intf}">
- 
-@@ -185,7 +186,7 @@
- 
-   <target name="impl_node" depends="intf">
-     <mkdir dir="${build_impl_node}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_node}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_node}"
-       destdir="${build_impl_node}"
-       classpath="${build_intf}:${build_impl_tag}">
- 
-@@ -195,7 +196,7 @@
- 
-   <target name="impl_format" depends="intf">
-     <mkdir dir="${build_impl_format}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_format}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_format}"
-       destdir="${build_impl_format}"
-       classpath="${build_intf}">
- 
-@@ -205,7 +206,7 @@
- 
-   <target name="impl_pp" depends="impl_tag,intf">
-     <mkdir dir="${build_impl_pp}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_pp}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_pp}"
-       destdir="${build_impl_pp}"
-       classpath="${build_intf}:${build_impl_tag}">
- 
-@@ -215,7 +216,7 @@
- 
-   <target name="impl" depends="intf,impl_tag,impl_pp,impl_node,impl_format,drivers">
-     <mkdir dir="${build_impl_factory}/META-INF/services"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_factory}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_factory}"
-       destdir="${build_impl_factory}"
-       classpath="${build_intf}:${build_impl_tag}:${build_impl_pp}:${build_impl_node}:${build_impl_format}">
-         <patternset refid="all.source.files"/>
-@@ -247,7 +248,7 @@
- 
-   <target name="impl_small" depends="intf,impl_tag,impl_pp">
-     <mkdir dir="${build_impl_small}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_small}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_small}"
-       destdir="${build_impl_small}"
-       classpath="${build_intf}:${build_impl_tag}:${build_impl_pp}">
-       <patternset refid="all.source.files"/>
-@@ -271,7 +272,7 @@
- 
-   <target name="x2impl_pp" if="x2_present" depends="intf,check_x2">
-     <mkdir dir="${build_x2impl_pp}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_x2impl_pp}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_x2impl_pp}"
-       destdir="${build_x2impl_pp}"
-       classpath="${build_intf}">
-     </javac>
-@@ -279,7 +280,7 @@
- 
-   <target name="x2impl" if="x2_present" depends="x2impl_pp,drivers">
-     <mkdir dir="${build_x2impl_factory}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_x2impl_factory}"
-       destdir="${build_x2impl_factory}"
-       classpath="${build_intf}:${build_impl_tag}:${build_x2impl_pp}:${build_impl_node}:${build_impl_format}">
-@@ -304,7 +305,7 @@
- 
-   <target name="samples" depends="intf">
-     <mkdir dir="${build_samples}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_samples}" destdir="${build_samples}"
-       classpath="${build_intf}"
-     >
-@@ -319,7 +320,7 @@
- 
-   <target name="api_sax2" depends="prepare">
-     <mkdir dir="${build_api_sax2}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_api_sax2}" destdir="${build_api_sax2}"
-     >
-     </javac>
-@@ -327,7 +328,7 @@
- 
-   <target name="driver_sax2" depends="api_sax2,intf">
-     <mkdir dir="${build_driver_sax2}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_driver_sax2}" destdir="${build_driver_sax2}"
-       classpath="${build_api_sax2}:${build_intf}"
-     >
-@@ -336,7 +337,7 @@
- 
-   <target name="api_jaxp11" depends="api_sax2">
-     <mkdir dir="${build_api_jaxp11}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_api_jaxp11}" destdir="${build_api_jaxp11}"
-       classpath="${build_api_sax2}"
-     >
-@@ -350,7 +351,7 @@
-     <!--copy todir="${build_driver_jaxp11}/META-INF/services">
-       <fileset dir="${src_driver_jaxp11}/META-INF/services/"/>
-     </copy-->
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_driver_jaxp11}" destdir="${build_driver_jaxp11}"
-       classpath="${build_api_sax2}:${build_driver_sax2}:${build_api_jaxp11}:${build_intf}"
-     >
-@@ -385,7 +386,7 @@
-     <delete dir="${build_j2me}/count_midlet" />
-     <mkdir dir="${build_j2me}/count_midlet"/>
- 
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_samples}" destdir="${build_j2me}/count_midlet"
-       bootclasspath="${j2mewtk.home}/lib/midpapi.zip"
-       classpath="${build_intf}"
-@@ -426,7 +427,7 @@
-   <!-- thi is special verion of XPP2 that is equivalent to impl_small but smaller -->
-   <target name="impl_tiny" depends="prepare">
-     <mkdir dir="${build_impl_tiny}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_impl_tiny}"
-       destdir="${build_impl_tiny}"
-       >
-@@ -443,7 +444,7 @@
-     <delete dir="${build_j2me}/count_midlet_tiny" />
-     <mkdir dir="${build_j2me}/count_midlet_tiny"/>
- 
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_samples}" destdir="${build_j2me}/count_midlet_tiny"
-       bootclasspath="${j2mewtk.home}/lib/midpapi.zip"
-       classpath="${build_impl_tiny}"
-@@ -529,7 +530,7 @@
- 
-   <target name="tests" if="junit.present" depends="intf,check_junit">
-     <mkdir dir="${build_tests}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-        srcdir="${src_tests}" destdir="${build_tests}">
-       <classpath refid="test_classpath" />
-     </javac>
-@@ -537,7 +538,7 @@
- 
-   <target name="tiny_tests" if="junit.present" depends="impl_tiny,check_junit">
-     <mkdir dir="${build_tiny_tests}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_tests}" destdir="${build_tiny_tests}" classpath="${build_impl_tiny}:${java.class.path}">
-       <patternset>
-          <exclude name="All**"/>
-@@ -580,6 +581,7 @@
-     <javadoc packagenames="${apidoc_packages}"
-              sourcepath="${src_intf}"
-              destdir="${build_apidoc}"
-+             source="1.4"
-              author="true"
-              version="true"
-              use="true"
-@@ -596,6 +598,7 @@
-     <javadoc packagenames="${javadoc_packages}"
-              sourcepath="${src_intf}:${src_impl_factory}:${src_impl_small}:${src_impl_tag}:${src_impl_pp}:${src_impl_node}:${src_impl_format}:${src_x2impl}:${src_x2impl_factory}:${src_x2impl_pp}"
-              destdir="${build_javadoc}"
-+             source="1.4"
-              author="true"
-              version="true"
-              use="true"
diff --git a/xpp2.spec b/xpp2.spec
deleted file mode 100644
index b6ded52..0000000
--- a/xpp2.spec
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright (c) 2000-2007, 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.
-#
-
-%define originalname PullParser
-
-Summary:        XML Pull Parser
-Name:           xpp2
-Version:        2.1.10
-Release:        8.3%{?dist}
-Epoch:          0
-License:        ASL 1.1
-URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
-Group:          Text Processing/Markup/XML
-Source0:        http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-Patch0:         xpp2-build_xml.patch
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-junit >= 0:1.6
-BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  junit
-BuildRequires:  xml-commons-apis
-Requires:       xml-commons-apis
-Requires:       jpackage-utils
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser.
-NOTE: XPP2 is no longer developed and is on maintenance mode.
-All active development concentrates on its successor XPP3/MXP1.
-
-%package javadoc
-Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires:       jpackage-utils
-
-%description javadoc
-%{summary}.
-
-%package doc
-Summary:        Manual for %{name}
-Group:          Development/Documentation
-
-%description doc
-%{summary}.
-
-%package demo
-Summary:        Samples for %{name}
-Group:          Development/Documentation
-Requires:       %{name} = %{epoch}:%{version}
-
-%description demo
-%{summary}.
-
-%prep
-%setup -q -n %{originalname}%{version}
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-
-%patch0 -b .sav
-
-%build
-export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=$(build-classpath xml-commons-apis)
-ant all api api.impl
-CLASSPATH=$CLASSPATH:$(build-classpath junit):build/tests:build/lib/PullParser-2.1.10.jar
-java AllTests
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-
-cp -p build/lib/%{originalname}-intf-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-intf-%{version}.jar
-cp -p build/lib/%{originalname}-standard-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-standard-%{version}.jar
-cp -p build/lib/%{originalname}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p build/lib/%{originalname}-x2-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-x2-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
-cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
-rm -rf doc/{build.txt,api,api_impl}
-
-# doc
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-cp -pr doc/* $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
-
-# demo
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(0644,root,root,0755)
-%doc README.html
-%doc LICENSE.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
-%{_javadir}/%{name}-intf.jar
-%{_javadir}/%{name}-intf-%{version}.jar
-%{_javadir}/%{name}-standard.jar
-%{_javadir}/%{name}-standard-%{version}.jar
-%{_javadir}/%{name}-x2.jar
-%{_javadir}/%{name}-x2-%{version}.jar
-
-%files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
-
-%files doc
-%defattr(0644,root,root,0755)
-%doc %{_datadir}/doc/%{name}-%{version}
-%doc %{_datadir}/doc/%{name}
-
-%files demo
-%defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}
-%{_datadir}/%{name}
-
-%changelog
-* Wed Mar 10 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:2.1.10-8.3
-- Added missing requires - jpackage-utils
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-8.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-7.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:2.1.10-6.2
-- drop repotag
-- fix license tag
-
-* Tue Feb 13 2007 Permaine Cheung <pcheung@redhat.com> - 0:2.1.10-6jpp.1
-- Fix release, license, buildroot, typo, and other rpmlint issues.
-- Got rid of Vendor and Distribution.
-- Rename manual subpackage to doc.
-- Move README and LICENSE file back into main package, and mark all docs.
-
-* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-6jpp
-- First JPP-1.7 release
-
-* Wed Aug 10 2005 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-5jpp
-- Fix Bug 17 installed but unpackaged symlinks
-- Patch build.xml for source=1.4 and target=1.4
-
-* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-4jpp
-- Build with ant-1.6.2
-- Relax some versioned dependencies
-
-* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:2.1.10-3jpp
-- Upgrade to Ant 1.6.X
-
-* Mon Jan 19 2004 Ralph Apel <r.apel@r-apel.de> - 0:2.1.10-2jpp
-- Fix rpm var _originalname to originalname
-- Include versionless symlinks for javadoc, manual and demo
-- demo requires main package
-
-* Thu Jan 15 2004 Ralph Apel <r.apel@r-apel.de> - 0:2.1.10-1jpp
-- First JPackage build

From c8635fde7a94adaab423872da71cd2b589e02390 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 27 Aug 2010 15:18:55 -0400
Subject: [PATCH 05/21] Revert "Retire xpp2."

This reverts commit 0275defb8ad9fe6e302a41bed88ccabe996427b3.
---
 dead.package         |   1 -
 sources              |   1 +
 xpp2-build_xml.patch | 199 ++++++++++++++++++++++++++++++++++++++++++
 xpp2.spec            | 202 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 402 insertions(+), 1 deletion(-)
 delete mode 100644 dead.package
 create mode 100644 sources
 create mode 100644 xpp2-build_xml.patch
 create mode 100644 xpp2.spec

diff --git a/dead.package b/dead.package
deleted file mode 100644
index 7dcad86..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-This package was retired due to no active owner on 2010-08-27
diff --git a/sources b/sources
new file mode 100644
index 0000000..d129abc
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+865ca4e2496c215d301b57450137626f  PullParser2.1.10.tgz
diff --git a/xpp2-build_xml.patch b/xpp2-build_xml.patch
new file mode 100644
index 0000000..9df42aa
--- /dev/null
+++ b/xpp2-build_xml.patch
@@ -0,0 +1,199 @@
+--- build.xml.sav	2003-11-15 06:42:11.000000000 +0100
++++ build.xml	2005-08-10 11:58:48.000000000 +0200
+@@ -9,7 +9,8 @@
+   <property name="midp4palm.home" value="c:/util/midp4palm1.0" />
+ 
+ 
+-  <property name="target" value="1.1" />
++  <property name="target" value="1.4" />
++  <property name="source" value="1.4" />
+   <!-- set global properties for this build -->
+ 
+   <property name="name" value="XML Pull Parser"/>
+@@ -165,7 +166,7 @@
+ 
+   <target name="intf" depends="prepare">
+     <mkdir dir="${build_intf}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_intf}" destdir="${build_intf}"/>
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_intf}" destdir="${build_intf}"/>
+     <touch file="${build_intf}/PullParser${version}_VERSION"/>
+   </target>
+ 
+@@ -175,7 +176,7 @@
+ 
+   <target name="impl_tag" depends="intf">
+     <mkdir dir="${build_impl_tag}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_tag}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_tag}"
+       destdir="${build_impl_tag}"
+       classpath="${build_intf}">
+ 
+@@ -185,7 +186,7 @@
+ 
+   <target name="impl_node" depends="intf">
+     <mkdir dir="${build_impl_node}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_node}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_node}"
+       destdir="${build_impl_node}"
+       classpath="${build_intf}:${build_impl_tag}">
+ 
+@@ -195,7 +196,7 @@
+ 
+   <target name="impl_format" depends="intf">
+     <mkdir dir="${build_impl_format}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_format}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_format}"
+       destdir="${build_impl_format}"
+       classpath="${build_intf}">
+ 
+@@ -205,7 +206,7 @@
+ 
+   <target name="impl_pp" depends="impl_tag,intf">
+     <mkdir dir="${build_impl_pp}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_pp}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_pp}"
+       destdir="${build_impl_pp}"
+       classpath="${build_intf}:${build_impl_tag}">
+ 
+@@ -215,7 +216,7 @@
+ 
+   <target name="impl" depends="intf,impl_tag,impl_pp,impl_node,impl_format,drivers">
+     <mkdir dir="${build_impl_factory}/META-INF/services"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_factory}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_factory}"
+       destdir="${build_impl_factory}"
+       classpath="${build_intf}:${build_impl_tag}:${build_impl_pp}:${build_impl_node}:${build_impl_format}">
+         <patternset refid="all.source.files"/>
+@@ -247,7 +248,7 @@
+ 
+   <target name="impl_small" depends="intf,impl_tag,impl_pp">
+     <mkdir dir="${build_impl_small}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_small}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_small}"
+       destdir="${build_impl_small}"
+       classpath="${build_intf}:${build_impl_tag}:${build_impl_pp}">
+       <patternset refid="all.source.files"/>
+@@ -271,7 +272,7 @@
+ 
+   <target name="x2impl_pp" if="x2_present" depends="intf,check_x2">
+     <mkdir dir="${build_x2impl_pp}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_x2impl_pp}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_x2impl_pp}"
+       destdir="${build_x2impl_pp}"
+       classpath="${build_intf}">
+     </javac>
+@@ -279,7 +280,7 @@
+ 
+   <target name="x2impl" if="x2_present" depends="x2impl_pp,drivers">
+     <mkdir dir="${build_x2impl_factory}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_x2impl_factory}"
+       destdir="${build_x2impl_factory}"
+       classpath="${build_intf}:${build_impl_tag}:${build_x2impl_pp}:${build_impl_node}:${build_impl_format}">
+@@ -304,7 +305,7 @@
+ 
+   <target name="samples" depends="intf">
+     <mkdir dir="${build_samples}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_samples}" destdir="${build_samples}"
+       classpath="${build_intf}"
+     >
+@@ -319,7 +320,7 @@
+ 
+   <target name="api_sax2" depends="prepare">
+     <mkdir dir="${build_api_sax2}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_api_sax2}" destdir="${build_api_sax2}"
+     >
+     </javac>
+@@ -327,7 +328,7 @@
+ 
+   <target name="driver_sax2" depends="api_sax2,intf">
+     <mkdir dir="${build_driver_sax2}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_driver_sax2}" destdir="${build_driver_sax2}"
+       classpath="${build_api_sax2}:${build_intf}"
+     >
+@@ -336,7 +337,7 @@
+ 
+   <target name="api_jaxp11" depends="api_sax2">
+     <mkdir dir="${build_api_jaxp11}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_api_jaxp11}" destdir="${build_api_jaxp11}"
+       classpath="${build_api_sax2}"
+     >
+@@ -350,7 +351,7 @@
+     <!--copy todir="${build_driver_jaxp11}/META-INF/services">
+       <fileset dir="${src_driver_jaxp11}/META-INF/services/"/>
+     </copy-->
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_driver_jaxp11}" destdir="${build_driver_jaxp11}"
+       classpath="${build_api_sax2}:${build_driver_sax2}:${build_api_jaxp11}:${build_intf}"
+     >
+@@ -385,7 +386,7 @@
+     <delete dir="${build_j2me}/count_midlet" />
+     <mkdir dir="${build_j2me}/count_midlet"/>
+ 
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_samples}" destdir="${build_j2me}/count_midlet"
+       bootclasspath="${j2mewtk.home}/lib/midpapi.zip"
+       classpath="${build_intf}"
+@@ -426,7 +427,7 @@
+   <!-- thi is special verion of XPP2 that is equivalent to impl_small but smaller -->
+   <target name="impl_tiny" depends="prepare">
+     <mkdir dir="${build_impl_tiny}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_impl_tiny}"
+       destdir="${build_impl_tiny}"
+       >
+@@ -443,7 +444,7 @@
+     <delete dir="${build_j2me}/count_midlet_tiny" />
+     <mkdir dir="${build_j2me}/count_midlet_tiny"/>
+ 
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_samples}" destdir="${build_j2me}/count_midlet_tiny"
+       bootclasspath="${j2mewtk.home}/lib/midpapi.zip"
+       classpath="${build_impl_tiny}"
+@@ -529,7 +530,7 @@
+ 
+   <target name="tests" if="junit.present" depends="intf,check_junit">
+     <mkdir dir="${build_tests}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+        srcdir="${src_tests}" destdir="${build_tests}">
+       <classpath refid="test_classpath" />
+     </javac>
+@@ -537,7 +538,7 @@
+ 
+   <target name="tiny_tests" if="junit.present" depends="impl_tiny,check_junit">
+     <mkdir dir="${build_tiny_tests}"/>
+-    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
++    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
+       srcdir="${src_tests}" destdir="${build_tiny_tests}" classpath="${build_impl_tiny}:${java.class.path}">
+       <patternset>
+          <exclude name="All**"/>
+@@ -580,6 +581,7 @@
+     <javadoc packagenames="${apidoc_packages}"
+              sourcepath="${src_intf}"
+              destdir="${build_apidoc}"
++             source="1.4"
+              author="true"
+              version="true"
+              use="true"
+@@ -596,6 +598,7 @@
+     <javadoc packagenames="${javadoc_packages}"
+              sourcepath="${src_intf}:${src_impl_factory}:${src_impl_small}:${src_impl_tag}:${src_impl_pp}:${src_impl_node}:${src_impl_format}:${src_x2impl}:${src_x2impl_factory}:${src_x2impl_pp}"
+              destdir="${build_javadoc}"
++             source="1.4"
+              author="true"
+              version="true"
+              use="true"
diff --git a/xpp2.spec b/xpp2.spec
new file mode 100644
index 0000000..b6ded52
--- /dev/null
+++ b/xpp2.spec
@@ -0,0 +1,202 @@
+# Copyright (c) 2000-2007, 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.
+#
+
+%define originalname PullParser
+
+Summary:        XML Pull Parser
+Name:           xpp2
+Version:        2.1.10
+Release:        8.3%{?dist}
+Epoch:          0
+License:        ASL 1.1
+URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
+Group:          Text Processing/Markup/XML
+Source0:        http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
+Patch0:         xpp2-build_xml.patch
+BuildRequires:  ant >= 0:1.6
+BuildRequires:  ant-junit >= 0:1.6
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  junit
+BuildRequires:  xml-commons-apis
+Requires:       xml-commons-apis
+Requires:       jpackage-utils
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser.
+NOTE: XPP2 is no longer developed and is on maintenance mode.
+All active development concentrates on its successor XPP3/MXP1.
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
+Requires:       jpackage-utils
+
+%description javadoc
+%{summary}.
+
+%package doc
+Summary:        Manual for %{name}
+Group:          Development/Documentation
+
+%description doc
+%{summary}.
+
+%package demo
+Summary:        Samples for %{name}
+Group:          Development/Documentation
+Requires:       %{name} = %{epoch}:%{version}
+
+%description demo
+%{summary}.
+
+%prep
+%setup -q -n %{originalname}%{version}
+# remove all binary libs
+find . -name "*.jar" -exec rm -f {} \;
+
+%patch0 -b .sav
+
+%build
+export OPT_JAR_LIST="ant/ant-junit junit"
+export CLASSPATH=$(build-classpath xml-commons-apis)
+ant all api api.impl
+CLASSPATH=$CLASSPATH:$(build-classpath junit):build/tests:build/lib/PullParser-2.1.10.jar
+java AllTests
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+
+cp -p build/lib/%{originalname}-intf-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-intf-%{version}.jar
+cp -p build/lib/%{originalname}-standard-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-standard-%{version}.jar
+cp -p build/lib/%{originalname}-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p build/lib/%{originalname}-x2-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-x2-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# javadoc
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
+cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
+cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+
+rm -rf doc/{build.txt,api,api_impl}
+
+# doc
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
+cp -pr doc/* $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+
+# demo
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(0644,root,root,0755)
+%doc README.html
+%doc LICENSE.txt
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}-intf.jar
+%{_javadir}/%{name}-intf-%{version}.jar
+%{_javadir}/%{name}-standard.jar
+%{_javadir}/%{name}-standard-%{version}.jar
+%{_javadir}/%{name}-x2.jar
+%{_javadir}/%{name}-x2-%{version}.jar
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
+
+%files doc
+%defattr(0644,root,root,0755)
+%doc %{_datadir}/doc/%{name}-%{version}
+%doc %{_datadir}/doc/%{name}
+
+%files demo
+%defattr(0644,root,root,0755)
+%{_datadir}/%{name}-%{version}
+%{_datadir}/%{name}
+
+%changelog
+* Wed Mar 10 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:2.1.10-8.3
+- Added missing requires - jpackage-utils
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-8.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-7.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:2.1.10-6.2
+- drop repotag
+- fix license tag
+
+* Tue Feb 13 2007 Permaine Cheung <pcheung@redhat.com> - 0:2.1.10-6jpp.1
+- Fix release, license, buildroot, typo, and other rpmlint issues.
+- Got rid of Vendor and Distribution.
+- Rename manual subpackage to doc.
+- Move README and LICENSE file back into main package, and mark all docs.
+
+* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-6jpp
+- First JPP-1.7 release
+
+* Wed Aug 10 2005 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-5jpp
+- Fix Bug 17 installed but unpackaged symlinks
+- Patch build.xml for source=1.4 and target=1.4
+
+* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-4jpp
+- Build with ant-1.6.2
+- Relax some versioned dependencies
+
+* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:2.1.10-3jpp
+- Upgrade to Ant 1.6.X
+
+* Mon Jan 19 2004 Ralph Apel <r.apel@r-apel.de> - 0:2.1.10-2jpp
+- Fix rpm var _originalname to originalname
+- Include versionless symlinks for javadoc, manual and demo
+- demo requires main package
+
+* Thu Jan 15 2004 Ralph Apel <r.apel@r-apel.de> - 0:2.1.10-1jpp
+- First JPackage build

From 9a7269b415142a183805997bbaf45f836f795d90 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 8 Feb 2011 00:49:48 -0600
Subject: [PATCH 06/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index b6ded52..6ad0ca2 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        8.3%{?dist}
+Release:        9.3%{?dist}
 Epoch:          0
 License:        ASL 1.1
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-9.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Wed Mar 10 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:2.1.10-8.3
 - Added missing requires - jpackage-utils
 

From fca0f08bafc3faf66b18070c72f4da9ebcd10036 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 14 Jan 2012 03:16:40 -0600
Subject: [PATCH 07/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index 6ad0ca2..2f93113 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        9.3%{?dist}
+Release:        10.3%{?dist}
 Epoch:          0
 License:        ASL 1.1
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-10.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-9.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From ed86a277c54af62fecc5d1c850a3316f71ba1af0 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 22 Jul 2012 02:09:40 -0500
Subject: [PATCH 08/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index 2f93113..67a6304 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        10.3%{?dist}
+Release:        11.3%{?dist}
 Epoch:          0
 License:        ASL 1.1
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-11.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-10.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From 090468fb232235746913205bfe56b71344fea455 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed, 15 Aug 2012 14:16:51 +0200
Subject: [PATCH 09/21] Fix license from ASL to xpp (new license type)

See http://osdir.com/ml/fedora-legal-list/2012-08/msg00013.html
---
 xpp2.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xpp2.spec b/xpp2.spec
index 67a6304..89f41c3 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,9 +33,9 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        11.3%{?dist}
+Release:        13%{?dist}
 Epoch:          0
-License:        ASL 1.1
+License:        xpp
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
 Group:          Text Processing/Markup/XML
 Source0:        http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Wed Aug 15 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1.10-13
+- Fix license from ASL to xpp (new license type)
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-11.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From d8532d6da575d05e8fb76868484264366989534e Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed, 15 Aug 2012 15:52:20 +0200
Subject: [PATCH 10/21] The license is actually a mixture of ASL 1.1, xpp and
 Public Domain

---
 xpp2.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xpp2.spec b/xpp2.spec
index 89f41c3..59db29c 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,9 +33,9 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        13%{?dist}
+Release:        14%{?dist}
 Epoch:          0
-License:        xpp
+License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
 Group:          Text Processing/Markup/XML
 Source0:        http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Wed Aug 15 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1.10-14
+- The license is actually a mixture of ASL 1.1, xpp and Public Domain
+
 * Wed Aug 15 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1.10-13
 - Fix license from ASL to xpp (new license type)
 

From 7327fffdda672fc1fc1de8848e09320c43a45f6a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 22:02:41 -0600
Subject: [PATCH 11/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index 59db29c..6c1832c 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        14%{?dist}
+Release:        15%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Wed Aug 15 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1.10-14
 - The license is actually a mixture of ASL 1.1, xpp and Public Domain
 

From 7e97374ee61e30fb0827bddc5457f1ec2b48f652 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 14 May 2013 16:31:25 +0200
Subject: [PATCH 12/21] Remove prebuilt classes

- Resolves: rhbz#959429
---
 xpp2.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/xpp2.spec b/xpp2.spec
index 6c1832c..91150b4 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        15%{?dist}
+Release:        16%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -80,8 +80,8 @@ Requires:       %{name} = %{epoch}:%{version}
 
 %prep
 %setup -q -n %{originalname}%{version}
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+# remove all binary libs and prebuilt classes
+find \( -name *.class -o -name *.jar \) -delete
 
 %patch0 -b .sav
 
@@ -160,6 +160,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-16
+- Remove prebuilt classes
+- Resolves: rhbz#959429
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 208a6659918b5167b8929b68209c38a5627e1a4e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 04:10:20 -0500
Subject: [PATCH 13/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index 91150b4..c5c719d 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        16%{?dist}
+Release:        17%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-16
 - Remove prebuilt classes
 - Resolves: rhbz#959429

From 261e8cc865c07386ff4931a5672581501f173e53 Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Mon, 26 Aug 2013 23:42:21 +0100
Subject: [PATCH 14/21] Update for newer guidelines, drop versioned jars,
 duplicate docs

- Fixes rhbz #993885, rhbz #1001270
---
 xpp2.spec | 91 ++++++++++++++++++++++---------------------------------
 1 file changed, 36 insertions(+), 55 deletions(-)

diff --git a/xpp2.spec b/xpp2.spec
index c5c719d..01edaad 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,11 +33,11 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        17%{?dist}
+Release:        18%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
-Group:          Text Processing/Markup/XML
+Group:          Development/Libraries
 Source0:        http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
 Patch0:         xpp2-build_xml.patch
 BuildRequires:  ant >= 0:1.6
@@ -48,7 +48,8 @@ BuildRequires:  xml-commons-apis
 Requires:       xml-commons-apis
 Requires:       jpackage-utils
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides:  xpp2-doc = 0:%{version}-%{release}
+Obsoletes: xpp2-doc < 0:2.1.10-18
 
 %description
 XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser.
@@ -57,22 +58,14 @@ All active development concentrates on its successor XPP3/MXP1.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires:       jpackage-utils
+Group:          Documentation
 
 %description javadoc
 %{summary}.
 
-%package doc
-Summary:        Manual for %{name}
-Group:          Development/Documentation
-
-%description doc
-%{summary}.
-
 %package demo
 Summary:        Samples for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{epoch}:%{version}
 
 %description demo
@@ -85,81 +78,69 @@ find \( -name *.class -o -name *.jar \) -delete
 
 %patch0 -b .sav
 
+# Fix encoding of licence file
+iconv -f ISO-8859-1 -t UTF-8 LICENSE.txt > LICENSE.txt.utf8
+mv LICENSE.txt.utf8 LICENSE.txt
+
 %build
-export OPT_JAR_LIST="ant/ant-junit junit"
 export CLASSPATH=$(build-classpath xml-commons-apis)
 ant all api api.impl
 CLASSPATH=$CLASSPATH:$(build-classpath junit):build/tests:build/lib/PullParser-2.1.10.jar
 java AllTests
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 
 cp -p build/lib/%{originalname}-intf-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-intf-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-intf.jar
 cp -p build/lib/%{originalname}-standard-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-standard-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-standard.jar
 cp -p build/lib/%{originalname}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 cp -p build/lib/%{originalname}-x2-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-x2-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-x2.jar
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
-cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api_impl
+cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api
+cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api_impl
 rm -rf doc/{build.txt,api,api_impl}
 
-# doc
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-cp -pr doc/* $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
-
 # demo
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pretrans javadoc
+# workaround for rpm bug, can be removed in F-23
+[ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
+%pretrans demo
+# workaround for rpm bug, can be removed in F-23
+[ -L %{_datadir}/%{name} ] && \
+rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || :
 
 %files
-%defattr(0644,root,root,0755)
-%doc README.html
-%doc LICENSE.txt
+%doc LICENSE.txt README.html doc
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}-intf.jar
-%{_javadir}/%{name}-intf-%{version}.jar
 %{_javadir}/%{name}-standard.jar
-%{_javadir}/%{name}-standard-%{version}.jar
 %{_javadir}/%{name}-x2.jar
-%{_javadir}/%{name}-x2-%{version}.jar
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
-
-%files doc
-%defattr(0644,root,root,0755)
-%doc %{_datadir}/doc/%{name}-%{version}
-%doc %{_datadir}/doc/%{name}
+%doc LICENSE.txt
+%{_javadocdir}/%{name}
 
 %files demo
-%defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Aug 26 2013 Mat Booth <fedora@matbooth.co.uk> - 0:2.1.10-18
+- Update for newer guidelines, drop versioned jars, duplicate docs
+- Fixes rhbz #993885, rhbz #1001270
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From b43c943f533637823bd510ab8632660ec2b7b578 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 8 Jun 2014 01:46:11 -0500
Subject: [PATCH 15/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index 01edaad..2617504 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        18%{?dist}
+Release:        19%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -137,6 +137,9 @@ rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || :
 %{_datadir}/%{name}
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Mon Aug 26 2013 Mat Booth <fedora@matbooth.co.uk> - 0:2.1.10-18
 - Update for newer guidelines, drop versioned jars, duplicate docs
 - Fixes rhbz #993885, rhbz #1001270

From f9ff3d8052138f2cffc28870d4f48bccef5c0de4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 25 Mar 2015 12:45:28 +0100
Subject: [PATCH 16/21] Remove workarounds for RPM bug #646523

---
 xpp2.spec | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/xpp2.spec b/xpp2.spec
index 2617504..8c35207 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        19%{?dist}
+Release:        20%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -112,16 +112,6 @@ rm -rf doc/{build.txt,api,api_impl}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%pretrans javadoc
-# workaround for rpm bug, can be removed in F-23
-[ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%pretrans demo
-# workaround for rpm bug, can be removed in F-23
-[ -L %{_datadir}/%{name} ] && \
-rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || :
-
 %files
 %doc LICENSE.txt README.html doc
 %{_javadir}/%{name}.jar
@@ -137,6 +127,9 @@ rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || :
 %{_datadir}/%{name}
 
 %changelog
+* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-20
+- Remove workarounds for RPM bug #646523
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 9701f980088ac15a4baf937a13cfe3847a5de2da Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 04:24:56 +0000
Subject: [PATCH 17/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index 8c35207..a855711 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        20%{?dist}
+Release:        21%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -127,6 +127,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-20
 - Remove workarounds for RPM bug #646523
 

From c76956dffa5ec324ff38acc0db471b572b48b1cd Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 14 Jul 2015 09:27:49 +0200
Subject: [PATCH 18/21] Add build-requires on javapackages-local

---
 xpp2.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xpp2.spec b/xpp2.spec
index a855711..bbcc728 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        21%{?dist}
+Release:        22%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -42,7 +42,7 @@ Source0:        http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParse
 Patch0:         xpp2-build_xml.patch
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
-BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  javapackages-local
 BuildRequires:  junit
 BuildRequires:  xml-commons-apis
 Requires:       xml-commons-apis
@@ -127,6 +127,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jul 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-22
+- Add build-requires on javapackages-local
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 1b4f63bda1108685fb3acbacd024f9fe5b2af250 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 03:48:26 +0000
Subject: [PATCH 19/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index bbcc728..23b01f5 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        22%{?dist}
+Release:        23%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -127,6 +127,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.10-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Tue Jul 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-22
 - Add build-requires on javapackages-local
 

From 4cc21ec17551d87b3bc8d67911712e67c3b837ef Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 18:08:10 +0000
Subject: [PATCH 20/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 xpp2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpp2.spec b/xpp2.spec
index 23b01f5..85ebbcb 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        23%{?dist}
+Release:        24%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -127,6 +127,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.10-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.10-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From ac59237cf6044a4b546e092ee3c6fe489f2d85f7 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 4 Apr 2017 17:30:19 +0200
Subject: [PATCH 21/21] xpp2 has been superseded by xpp3 and is not being
 developed since 2003

---
 .gitignore           |   1 -
 dead.package         |   1 +
 sources              |   1 -
 xpp2-build_xml.patch | 199 ---------------------------------------
 xpp2.spec            | 216 -------------------------------------------
 5 files changed, 1 insertion(+), 417 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 dead.package
 delete mode 100644 sources
 delete mode 100644 xpp2-build_xml.patch
 delete mode 100644 xpp2.spec

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 47cb828..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-PullParser2.1.10.tgz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..50ca0c0
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+xpp2 has been superseded by xpp3 and is not being developed since 2003
diff --git a/sources b/sources
deleted file mode 100644
index d129abc..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-865ca4e2496c215d301b57450137626f  PullParser2.1.10.tgz
diff --git a/xpp2-build_xml.patch b/xpp2-build_xml.patch
deleted file mode 100644
index 9df42aa..0000000
--- a/xpp2-build_xml.patch
+++ /dev/null
@@ -1,199 +0,0 @@
---- build.xml.sav	2003-11-15 06:42:11.000000000 +0100
-+++ build.xml	2005-08-10 11:58:48.000000000 +0200
-@@ -9,7 +9,8 @@
-   <property name="midp4palm.home" value="c:/util/midp4palm1.0" />
- 
- 
--  <property name="target" value="1.1" />
-+  <property name="target" value="1.4" />
-+  <property name="source" value="1.4" />
-   <!-- set global properties for this build -->
- 
-   <property name="name" value="XML Pull Parser"/>
-@@ -165,7 +166,7 @@
- 
-   <target name="intf" depends="prepare">
-     <mkdir dir="${build_intf}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_intf}" destdir="${build_intf}"/>
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_intf}" destdir="${build_intf}"/>
-     <touch file="${build_intf}/PullParser${version}_VERSION"/>
-   </target>
- 
-@@ -175,7 +176,7 @@
- 
-   <target name="impl_tag" depends="intf">
-     <mkdir dir="${build_impl_tag}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_tag}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_tag}"
-       destdir="${build_impl_tag}"
-       classpath="${build_intf}">
- 
-@@ -185,7 +186,7 @@
- 
-   <target name="impl_node" depends="intf">
-     <mkdir dir="${build_impl_node}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_node}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_node}"
-       destdir="${build_impl_node}"
-       classpath="${build_intf}:${build_impl_tag}">
- 
-@@ -195,7 +196,7 @@
- 
-   <target name="impl_format" depends="intf">
-     <mkdir dir="${build_impl_format}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_format}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_format}"
-       destdir="${build_impl_format}"
-       classpath="${build_intf}">
- 
-@@ -205,7 +206,7 @@
- 
-   <target name="impl_pp" depends="impl_tag,intf">
-     <mkdir dir="${build_impl_pp}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_pp}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_pp}"
-       destdir="${build_impl_pp}"
-       classpath="${build_intf}:${build_impl_tag}">
- 
-@@ -215,7 +216,7 @@
- 
-   <target name="impl" depends="intf,impl_tag,impl_pp,impl_node,impl_format,drivers">
-     <mkdir dir="${build_impl_factory}/META-INF/services"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_factory}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_factory}"
-       destdir="${build_impl_factory}"
-       classpath="${build_intf}:${build_impl_tag}:${build_impl_pp}:${build_impl_node}:${build_impl_format}">
-         <patternset refid="all.source.files"/>
-@@ -247,7 +248,7 @@
- 
-   <target name="impl_small" depends="intf,impl_tag,impl_pp">
-     <mkdir dir="${build_impl_small}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_small}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_impl_small}"
-       destdir="${build_impl_small}"
-       classpath="${build_intf}:${build_impl_tag}:${build_impl_pp}">
-       <patternset refid="all.source.files"/>
-@@ -271,7 +272,7 @@
- 
-   <target name="x2impl_pp" if="x2_present" depends="intf,check_x2">
-     <mkdir dir="${build_x2impl_pp}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_x2impl_pp}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}" srcdir="${src_x2impl_pp}"
-       destdir="${build_x2impl_pp}"
-       classpath="${build_intf}">
-     </javac>
-@@ -279,7 +280,7 @@
- 
-   <target name="x2impl" if="x2_present" depends="x2impl_pp,drivers">
-     <mkdir dir="${build_x2impl_factory}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_x2impl_factory}"
-       destdir="${build_x2impl_factory}"
-       classpath="${build_intf}:${build_impl_tag}:${build_x2impl_pp}:${build_impl_node}:${build_impl_format}">
-@@ -304,7 +305,7 @@
- 
-   <target name="samples" depends="intf">
-     <mkdir dir="${build_samples}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_samples}" destdir="${build_samples}"
-       classpath="${build_intf}"
-     >
-@@ -319,7 +320,7 @@
- 
-   <target name="api_sax2" depends="prepare">
-     <mkdir dir="${build_api_sax2}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_api_sax2}" destdir="${build_api_sax2}"
-     >
-     </javac>
-@@ -327,7 +328,7 @@
- 
-   <target name="driver_sax2" depends="api_sax2,intf">
-     <mkdir dir="${build_driver_sax2}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_driver_sax2}" destdir="${build_driver_sax2}"
-       classpath="${build_api_sax2}:${build_intf}"
-     >
-@@ -336,7 +337,7 @@
- 
-   <target name="api_jaxp11" depends="api_sax2">
-     <mkdir dir="${build_api_jaxp11}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_api_jaxp11}" destdir="${build_api_jaxp11}"
-       classpath="${build_api_sax2}"
-     >
-@@ -350,7 +351,7 @@
-     <!--copy todir="${build_driver_jaxp11}/META-INF/services">
-       <fileset dir="${src_driver_jaxp11}/META-INF/services/"/>
-     </copy-->
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_driver_jaxp11}" destdir="${build_driver_jaxp11}"
-       classpath="${build_api_sax2}:${build_driver_sax2}:${build_api_jaxp11}:${build_intf}"
-     >
-@@ -385,7 +386,7 @@
-     <delete dir="${build_j2me}/count_midlet" />
-     <mkdir dir="${build_j2me}/count_midlet"/>
- 
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_samples}" destdir="${build_j2me}/count_midlet"
-       bootclasspath="${j2mewtk.home}/lib/midpapi.zip"
-       classpath="${build_intf}"
-@@ -426,7 +427,7 @@
-   <!-- thi is special verion of XPP2 that is equivalent to impl_small but smaller -->
-   <target name="impl_tiny" depends="prepare">
-     <mkdir dir="${build_impl_tiny}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_impl_tiny}"
-       destdir="${build_impl_tiny}"
-       >
-@@ -443,7 +444,7 @@
-     <delete dir="${build_j2me}/count_midlet_tiny" />
-     <mkdir dir="${build_j2me}/count_midlet_tiny"/>
- 
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_samples}" destdir="${build_j2me}/count_midlet_tiny"
-       bootclasspath="${j2mewtk.home}/lib/midpapi.zip"
-       classpath="${build_impl_tiny}"
-@@ -529,7 +530,7 @@
- 
-   <target name="tests" if="junit.present" depends="intf,check_junit">
-     <mkdir dir="${build_tests}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-        srcdir="${src_tests}" destdir="${build_tests}">
-       <classpath refid="test_classpath" />
-     </javac>
-@@ -537,7 +538,7 @@
- 
-   <target name="tiny_tests" if="junit.present" depends="impl_tiny,check_junit">
-     <mkdir dir="${build_tiny_tests}"/>
--    <javac target="${target}" debug="${debug}" deprecation="${deprecation}"
-+    <javac source="${source}" target="${target}" debug="${debug}" deprecation="${deprecation}"
-       srcdir="${src_tests}" destdir="${build_tiny_tests}" classpath="${build_impl_tiny}:${java.class.path}">
-       <patternset>
-          <exclude name="All**"/>
-@@ -580,6 +581,7 @@
-     <javadoc packagenames="${apidoc_packages}"
-              sourcepath="${src_intf}"
-              destdir="${build_apidoc}"
-+             source="1.4"
-              author="true"
-              version="true"
-              use="true"
-@@ -596,6 +598,7 @@
-     <javadoc packagenames="${javadoc_packages}"
-              sourcepath="${src_intf}:${src_impl_factory}:${src_impl_small}:${src_impl_tag}:${src_impl_pp}:${src_impl_node}:${src_impl_format}:${src_x2impl}:${src_x2impl_factory}:${src_x2impl_pp}"
-              destdir="${build_javadoc}"
-+             source="1.4"
-              author="true"
-              version="true"
-              use="true"
diff --git a/xpp2.spec b/xpp2.spec
deleted file mode 100644
index 85ebbcb..0000000
--- a/xpp2.spec
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright (c) 2000-2007, 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.
-#
-
-%define originalname PullParser
-
-Summary:        XML Pull Parser
-Name:           xpp2
-Version:        2.1.10
-Release:        24%{?dist}
-Epoch:          0
-License:        xpp and ASL 1.1 and Public Domain
-URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
-Group:          Development/Libraries
-Source0:        http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-Patch0:         xpp2-build_xml.patch
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-junit >= 0:1.6
-BuildRequires:  javapackages-local
-BuildRequires:  junit
-BuildRequires:  xml-commons-apis
-Requires:       xml-commons-apis
-Requires:       jpackage-utils
-BuildArch:      noarch
-Provides:  xpp2-doc = 0:%{version}-%{release}
-Obsoletes: xpp2-doc < 0:2.1.10-18
-
-%description
-XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser.
-NOTE: XPP2 is no longer developed and is on maintenance mode.
-All active development concentrates on its successor XPP3/MXP1.
-
-%package javadoc
-Summary:        Javadoc for %{name}
-Group:          Documentation
-
-%description javadoc
-%{summary}.
-
-%package demo
-Summary:        Samples for %{name}
-Group:          Documentation
-Requires:       %{name} = %{epoch}:%{version}
-
-%description demo
-%{summary}.
-
-%prep
-%setup -q -n %{originalname}%{version}
-# remove all binary libs and prebuilt classes
-find \( -name *.class -o -name *.jar \) -delete
-
-%patch0 -b .sav
-
-# Fix encoding of licence file
-iconv -f ISO-8859-1 -t UTF-8 LICENSE.txt > LICENSE.txt.utf8
-mv LICENSE.txt.utf8 LICENSE.txt
-
-%build
-export CLASSPATH=$(build-classpath xml-commons-apis)
-ant all api api.impl
-CLASSPATH=$CLASSPATH:$(build-classpath junit):build/tests:build/lib/PullParser-2.1.10.jar
-java AllTests
-
-%install
-# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-
-cp -p build/lib/%{originalname}-intf-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-intf.jar
-cp -p build/lib/%{originalname}-standard-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-standard.jar
-cp -p build/lib/%{originalname}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-cp -p build/lib/%{originalname}-x2-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-x2.jar
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api_impl
-cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api
-cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api_impl
-rm -rf doc/{build.txt,api,api_impl}
-
-# demo
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-%files
-%doc LICENSE.txt README.html doc
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-intf.jar
-%{_javadir}/%{name}-standard.jar
-%{_javadir}/%{name}-x2.jar
-
-%files javadoc
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
-
-%files demo
-%{_datadir}/%{name}
-
-%changelog
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.10-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.10-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jul 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-22
-- Add build-requires on javapackages-local
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-20
-- Remove workarounds for RPM bug #646523
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Aug 26 2013 Mat Booth <fedora@matbooth.co.uk> - 0:2.1.10-18
-- Update for newer guidelines, drop versioned jars, duplicate docs
-- Fixes rhbz #993885, rhbz #1001270
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1.10-16
-- Remove prebuilt classes
-- Resolves: rhbz#959429
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Aug 15 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1.10-14
-- The license is actually a mixture of ASL 1.1, xpp and Public Domain
-
-* Wed Aug 15 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1.10-13
-- Fix license from ASL to xpp (new license type)
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-11.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-10.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-9.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Mar 10 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:2.1.10-8.3
-- Added missing requires - jpackage-utils
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-8.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1.10-7.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:2.1.10-6.2
-- drop repotag
-- fix license tag
-
-* Tue Feb 13 2007 Permaine Cheung <pcheung@redhat.com> - 0:2.1.10-6jpp.1
-- Fix release, license, buildroot, typo, and other rpmlint issues.
-- Got rid of Vendor and Distribution.
-- Rename manual subpackage to doc.
-- Move README and LICENSE file back into main package, and mark all docs.
-
-* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-6jpp
-- First JPP-1.7 release
-
-* Wed Aug 10 2005 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-5jpp
-- Fix Bug 17 installed but unpackaged symlinks
-- Patch build.xml for source=1.4 and target=1.4
-
-* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.10-4jpp
-- Build with ant-1.6.2
-- Relax some versioned dependencies
-
-* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:2.1.10-3jpp
-- Upgrade to Ant 1.6.X
-
-* Mon Jan 19 2004 Ralph Apel <r.apel@r-apel.de> - 0:2.1.10-2jpp
-- Fix rpm var _originalname to originalname
-- Include versionless symlinks for javadoc, manual and demo
-- demo requires main package
-
-* Thu Jan 15 2004 Ralph Apel <r.apel@r-apel.de> - 0:2.1.10-1jpp
-- First JPackage build