From 0e814c5248931de3cb046533df9b18e5af822b26 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:50:29 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for adaptx --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 1caebca573874945cb4ca8a3ff23bed05c922db0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:57 +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 932c40d..5d1f14d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: adaptx -# $Id: Makefile,v 1.1 2004/09/09 02:53:33 cvsdist Exp $ +# $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 $$/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 3d05e87ef9400040454c25b6bac85ffdffeb5cfe Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 11 Mar 2010 08:46:48 +0000 Subject: [PATCH 3/4] Missing requires jpackage-utils added --- adaptx.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/adaptx.spec b/adaptx.spec index 27215fd..cf59f27 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -34,7 +34,7 @@ Name: adaptx Version: 0.9.13 -Release: 7%{?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,12 @@ 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 + * Mon Feb 23 2009 Fedora Release Engineering - 0.9.13-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From de3b8a31e8cb056343a2978969fcdff951b5f30b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:06:07 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11