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 f57e6ea..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 $$/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/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 - 0:2.1.10-8.3 +- Added missing requires - jpackage-utils + * Mon Jul 27 2009 Fedora Release Engineering - 0:2.1.10-8.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild