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 5d1f14d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: adaptx -# $Id: Makefile,v 1.2 2007/10/15 18:35:26 notting Exp $ -NAME := adaptx -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),) -# attempt 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/adaptx.spec b/adaptx.spec index 2f8a9b5..cf59f27 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -34,7 +34,7 @@ Name: adaptx Version: 0.9.13 -Release: 8%{?dist} +Release: 9%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -55,6 +55,7 @@ BuildRequires: xerces-j2 Requires: log4j Requires: xml-commons-apis Requires: xerces-j2 +Requires: jpackage-utils Requires(pre): jpackage-utils Requires(postun): jpackage-utils %if ! %{gcj_support} @@ -74,6 +75,7 @@ Adaptx is an XSLT processor and XPath engine. %package javadoc Group: Documentation Summary: Javadoc for %{name} +Requires: jpackage-utils Requires(post): /bin/rm,/bin/ln Requires(postun): /bin/rm @@ -170,6 +172,9 @@ fi %doc build/doc/* %changelog +* Thu Mar 11 2010 Peter Lemenkov - 0.9.13-9 +- Added missing requires jpackage-utils + * Fri Jul 24 2009 Fedora Release Engineering - 0.9.13-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild