From cb0f0a566210544a97e73ca7ab85d869290e4011 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:25:38 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for xpp3 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From fb5ebb8bc4a3140da38e796d13c0e247b125bd04 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:48 +0000 Subject: [PATCH 2/4] 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 1eabaf3..ed32b75 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xpp3 -# $Id$ +# $Id: Makefile,v 1.1 2007/02/21 22:21:15 wtogami Exp $ NAME := xpp3 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 252bee221db589939ea7f66439784f4b0896ab69 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 10 Mar 2010 11:25:06 +0000 Subject: [PATCH 3/4] Missing requires added --- import.log | 1 + xpp3.spec | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 import.log diff --git a/import.log b/import.log new file mode 100644 index 0000000..2399fc1 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xpp3-1_1_3_8-3_3_fc12:F-12:xpp3-1.1.3.8-3.3.fc12.src.rpm:1268220246 diff --git a/xpp3.spec b/xpp3.spec index 8bbee74..b3ab364 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -33,9 +33,9 @@ Summary: XML Pull Parser Name: xpp3 Version: 1.1.3.8 -Release: 3.2%{?dist} +Release: 3.3%{?dist} Epoch: 0 -License: ASL 1.1 +License: ASL 1.1 URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Group: Text Processing/Markup/XML Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz @@ -55,9 +55,9 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Xml Pull Parser 3rd Edition (XPP3) MXP1 is a new XmlPull -parsing engine that is based on ideas from XPP and in -particular XPP2 but completely revised and rewritten to +Xml Pull Parser 3rd Edition (XPP3) MXP1 is a new XmlPull +parsing engine that is based on ideas from XPP and in +particular XPP2 but completely revised and rewritten to take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4. %package minimal @@ -74,6 +74,7 @@ Minimal XML pull parser implementation. %package javadoc Summary: Javadoc for %{name} Group: Documentation +Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -131,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_javadocdir}/* %changelog +* Wed Mar 10 2010 Peter Lemenkov - 0:1.1.3.8-3.3 +- *-javadoc must also require jpackage-utils (for %%{_javadocdir}) + * Mon Jul 27 2009 Fedora Release Engineering - 0:1.1.3.8-3.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 1cb8781c181570c29801e3e7931e216b7f1e116d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:10:38 +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 ed32b75..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xpp3 -# $Id: Makefile,v 1.1 2007/02/21 22:21:15 wtogami Exp $ -NAME := xpp3 -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 2399fc1..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xpp3-1_1_3_8-3_3_fc12:F-12:xpp3-1.1.3.8-3.3.fc12.src.rpm:1268220246