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

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f57e6ea..e8d6cff 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ 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 55290d9e6cace9a7fda9ff736fa2c0ea62e3266c Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 17 Feb 2010 03:33:40 +0000
Subject: [PATCH 2/4] Initialize branch F-13 for xpp2

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..baa94ef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-13

From 4279862bee1c5bc5e29128b1b17d0938295bc5c8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <peter@fedoraproject.org>
Date: Wed, 10 Mar 2010 11:37:50 +0000
Subject: [PATCH 3/4] 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..ffda0f7
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+xpp2-2_1_10-8_3_fc12:F-13:xpp2-2.1.10-8.3.fc12.src.rpm:1268221007
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 f328a85148c88ca671bbba86797bf708718d620b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 16:10:30 +0000
Subject: [PATCH 4/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 import.log               |  1 -
 4 files changed, 23 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch
 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 e8d6cff..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xpp2
-# $Id$
-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/branch b/branch
deleted file mode 100644
index baa94ef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-13
diff --git a/import.log b/import.log
deleted file mode 100644
index ffda0f7..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-xpp2-2_1_10-8_3_fc12:F-13:xpp2-2.1.10-8.3.fc12.src.rpm:1268221007