From 9892aadf68f5fb8a699407d834d0aa7ac978a154 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 17:37:58 +0000 Subject: [PATCH 01/11] - Autorebuild for GCC 4.3 --- adaptx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adaptx.spec b/adaptx.spec index f7d3621..19fcb79 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -34,7 +34,7 @@ Name: adaptx Version: 0.9.13 -Release: 4jpp.3%{?dist} +Release: 5jpp.3%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -170,6 +170,9 @@ fi %doc build/doc/* %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.9.13-5jpp.3 +- Autorebuild for GCC 4.3 + * Wed Oct 17 2007 Tom "spot" Callaway 0.9.13-4jpp.3 - enum is a reserved keyword now, fix javadoc by not naming variables "enum" From bbb062fca95d8fd6ab75558a795465f23c211f28 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 9 Jul 2008 16:55:19 +0000 Subject: [PATCH 02/11] drop repotag --- adaptx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adaptx.spec b/adaptx.spec index 19fcb79..2b45698 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -34,7 +34,7 @@ Name: adaptx Version: 0.9.13 -Release: 5jpp.3%{?dist} +Release: 6%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -170,6 +170,9 @@ fi %doc build/doc/* %changelog +* Wed Jul 9 2008 Tom "spot" Callaway 0.9.13-6 +- drop repotag + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.13-5jpp.3 - Autorebuild for GCC 4.3 From f3a9b55348cc6846d0771b3b321bd5d3e791d60d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:07:02 +0000 Subject: [PATCH 03/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- adaptx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adaptx.spec b/adaptx.spec index 2b45698..27215fd 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -34,7 +34,7 @@ Name: adaptx Version: 0.9.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -170,6 +170,9 @@ fi %doc build/doc/* %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 0.9.13-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Jul 9 2008 Tom "spot" Callaway 0.9.13-6 - drop repotag From d8a9e11c295c8bb6c278f73fe53bb18078399142 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:35:03 +0000 Subject: [PATCH 04/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- adaptx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adaptx.spec b/adaptx.spec index 27215fd..2f8a9b5 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -34,7 +34,7 @@ Name: adaptx Version: 0.9.13 -Release: 7%{?dist} +Release: 8%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -170,6 +170,9 @@ fi %doc build/doc/* %changelog +* 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 5780b6f772fe35cef50e713aea5ae8d0d9d95f38 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:26 +0000 Subject: [PATCH 05/11] 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 6072be2f7a7507393ca8551634b5d1ac6d406388 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 11 Mar 2010 08:46:49 +0000 Subject: [PATCH 06/11] Missing requires jpackage-utils added --- adaptx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 From dd19c60bff0d2f0a0cefeedb4fc1b961703f0905 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:06:04 +0000 Subject: [PATCH 07/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From 88d6bd8587e1fe3ef2d713a89385740ef21f4d36 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 21 Dec 2010 12:54:24 +0200 Subject: [PATCH 08/11] Fix FTBFS. - Drop gcj. - Adapt to current guidelines. --- adaptx.spec | 76 +++++++++++------------------------------------------ 1 file changed, 15 insertions(+), 61 deletions(-) diff --git a/adaptx.spec b/adaptx.spec index cf59f27..87ab372 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -28,13 +28,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define _with_gcj_support 1 - -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} - Name: adaptx Version: 0.9.13 -Release: 9%{?dist} +Release: 10%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -46,8 +42,9 @@ Patch0: %{name}-%{version}-xsl.patch Patch1: %{name}-%{version}-missingstubs.patch Patch2: %{name}-%{version}-build-xml.patch Patch3: adaptx-0.9.13-no-enum-as-identifier.patch -Url: http://castor.codehaus.org/ +URL: http://castor.codehaus.org/ BuildRequires: ant >= 0:1.6 +BuildRequires: ant-nodeps BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: log4j BuildRequires: xml-commons-apis @@ -58,16 +55,7 @@ Requires: xerces-j2 Requires: jpackage-utils Requires(pre): jpackage-utils Requires(postun): jpackage-utils -%if ! %{gcj_support} BuildArch: noarch -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif %description Adaptx is an XSLT processor and XPath engine. @@ -76,8 +64,6 @@ Adaptx is an XSLT processor and XPath engine. Group: Documentation Summary: Javadoc for %{name} Requires: jpackage-utils -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm %description javadoc Javadoc for %{name}. @@ -115,63 +101,31 @@ rm -rf $RPM_BUILD_ROOT # jar install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/%{name}_%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done) +install -m 644 dist/%{name}_%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf build/doc/javadoc -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - -%post -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%postun -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - %files -%defattr(0664,root,root,0755) +%defattr(-,root,root,-) %doc src/etc/{CHANGELOG,contributors.html,LICENSE} %{_javadir}/* -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name} -%endif - %files javadoc -%defattr(0664,root,root,0755) -%{_javadocdir}/%{name}-%{version} +%defattr(-,root,root,-) +%{_javadocdir}/%{name} %files doc -%defattr(0664,root,root,0755) +%defattr(-,root,root,-) %doc build/doc/* %changelog +* Tue Dec 21 2010 Alexander Kurtakov 0.9.13-10 +- Fix FTBFS. +- Drop gcj. +- Adapt to current guidelines. + * Thu Mar 11 2010 Peter Lemenkov - 0.9.13-9 - Added missing requires jpackage-utils From 1e817ef27ce8639cd3efa578e25035341a132c0e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:20:29 -0600 Subject: [PATCH 09/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- adaptx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adaptx.spec b/adaptx.spec index 87ab372..93d14da 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -30,7 +30,7 @@ Name: adaptx Version: 0.9.13 -Release: 10%{?dist} +Release: 11%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -121,6 +121,9 @@ rm -rf build/doc/javadoc %doc build/doc/* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.9.13-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Dec 21 2010 Alexander Kurtakov 0.9.13-10 - Fix FTBFS. - Drop gcj. From f840d7d7b213ab36af69ae8005f65a9de7a9ed3c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:00:35 -0600 Subject: [PATCH 10/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- adaptx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adaptx.spec b/adaptx.spec index 93d14da..4f6db44 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -30,7 +30,7 @@ Name: adaptx Version: 0.9.13 -Release: 11%{?dist} +Release: 12%{?dist} Summary: AdaptX XSLT processor and XPath engine License: BSD Group: Applications/Text @@ -121,6 +121,9 @@ rm -rf build/doc/javadoc %doc build/doc/* %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 0.9.13-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0.9.13-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 7198dd47905729ea9966e4409c09f16671c63fe2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Feb 2012 14:30:32 -0500 Subject: [PATCH 11/11] Retire adaptx due to lack of a maintainer. --- adaptx-0.9.13-build-xml.patch | 11 -- adaptx-0.9.13-missingstubs.patch | 16 -- adaptx-0.9.13-no-enum-as-identifier.patch | 142 ---------------- adaptx-0.9.13-xsl.patch | 45 ----- adaptx.spec | 191 ---------------------- dead.package | 1 + sources | 1 - 7 files changed, 1 insertion(+), 406 deletions(-) delete mode 100644 adaptx-0.9.13-build-xml.patch delete mode 100644 adaptx-0.9.13-missingstubs.patch delete mode 100644 adaptx-0.9.13-no-enum-as-identifier.patch delete mode 100644 adaptx-0.9.13-xsl.patch delete mode 100644 adaptx.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/adaptx-0.9.13-build-xml.patch b/adaptx-0.9.13-build-xml.patch deleted file mode 100644 index 58b316d..0000000 --- a/adaptx-0.9.13-build-xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/build.xml.orig 2007-04-18 17:10:00.000000000 -0400 -+++ src/build.xml 2007-04-18 17:37:22.000000000 -0400 -@@ -121,7 +121,7 @@ - - -+ packagenames="org.exolab.adaptx.*" source="1.4"/> - - - diff --git a/adaptx-0.9.13-missingstubs.patch b/adaptx-0.9.13-missingstubs.patch deleted file mode 100644 index 43218e2..0000000 --- a/adaptx-0.9.13-missingstubs.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java.sav 2006-07-19 14:06:26.000000000 -0400 -+++ ./src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java 2006-07-19 14:07:13.000000000 -0400 -@@ -193,6 +193,13 @@ - return false; - } //-- getFeature - -+ // DOM Level 3 stub -+ public void setFeature(String name, boolean value) -+ throws TransformerConfigurationException -+ { -+ throw new RuntimeException("not implemented"); -+ } -+ - /** - * Get the object that is used by default during the transformation - * to resolve URIs used in document(), xsl:import, or xsl:include. diff --git a/adaptx-0.9.13-no-enum-as-identifier.patch b/adaptx-0.9.13-no-enum-as-identifier.patch deleted file mode 100644 index 453e230..0000000 --- a/adaptx-0.9.13-no-enum-as-identifier.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java ---- adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java.BAD 2007-10-17 13:48:06.000000000 -0400 -+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java 2007-10-17 13:48:25.000000000 -0400 -@@ -424,9 +424,9 @@ public class IdentityTransformer - } - else { - _outputProperties = new Properties(); -- Enumeration enum = properties.keys(); -- while (enum.hasMoreElements()) { -- String name = (String)enum.nextElement(); -+ Enumeration MyEnum = properties.keys(); -+ while (MyEnum.hasMoreElements()) { -+ String name = (String)MyEnum.nextElement(); - String value = properties.getProperty(name); - _outputProperties.setProperty(name, value); - } -diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java ---- adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java.BAD 2007-10-17 13:48:46.000000000 -0400 -+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java 2007-10-17 13:49:15.000000000 -0400 -@@ -454,9 +454,9 @@ public class TransformerImpl - else { - _outputProperties = new Properties(); - XSLOutput output = new XSLOutput(); -- Enumeration enum = properties.keys(); -- while (enum.hasMoreElements()) { -- String name = (String)enum.nextElement(); -+ Enumeration MyEnum = properties.keys(); -+ while (MyEnum.hasMoreElements()) { -+ String name = (String)MyEnum.nextElement(); - String value = properties.getProperty(name); - _outputProperties.setProperty(name, value); - try { -diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java ---- adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java.BAD 2007-10-17 13:50:28.000000000 -0400 -+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java 2007-10-17 13:50:49.000000000 -0400 -@@ -1266,9 +1266,9 @@ public class XSLTProcessor - * @param ruleProcessor the RuleProcessor to copy parameters to - **/ - private void copyParams(RuleProcessor ruleProcessor) { -- Enumeration enum = params.keys(); -- while (enum.hasMoreElements()) { -- String name = (String)enum.nextElement(); -+ Enumeration MyEnum = params.keys(); -+ while (MyEnum.hasMoreElements()) { -+ String name = (String)MyEnum.nextElement(); - ruleProcessor.setParameter(name, params.getProperty(name)); - } - } //-- copyParams -diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java ---- adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java.BAD 2007-10-17 13:50:56.000000000 -0400 -+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java 2007-10-17 13:52:01.000000000 -0400 -@@ -569,10 +569,10 @@ public class XSLTStylesheet extends XSLO - if (namespace == null) return null; - String qns = (String) quotedns.get(namespace); - if (qns != null) { -- Enumeration enum = namespaces.keys(); -+ Enumeration MyEnum = namespaces.keys(); - String key; -- while (enum.hasMoreElements()) { -- key = (String)enum.nextElement(); -+ while (MyEnum.hasMoreElements()) { -+ key = (String)MyEnum.nextElement(); - if (qns.equals(namespaces.get(key))) - return key; - } -@@ -1094,16 +1094,16 @@ public class XSLTStylesheet extends XSLO - - // combine global variables and parameters - try { -- Enumeration enum = xsl.getVariables(); -- while (enum.hasMoreElements()) { -- Variable v = (Variable) enum.nextElement(); -+ Enumeration MyEnum = xsl.getVariables(); -+ while (MyEnum.hasMoreElements()) { -+ Variable v = (Variable) MyEnum.nextElement(); - Variable tmp = getVariable(v.getName()); - if (tmp != null) variables.remove(tmp); - addVariable(v, true); - } -- enum = xsl.getParameters(); -- while (enum.hasMoreElements()) { -- Param p = (Param) enum.nextElement(); -+ MyEnum = xsl.getParameters(); -+ while (MyEnum.hasMoreElements()) { -+ Param p = (Param) MyEnum.nextElement(); - Param tmp = getParameter(p.getName()); - if (tmp != null) parameters.remove(tmp); - addParam(p); -diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/RuleProcessor.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/RuleProcessor.java ---- adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/RuleProcessor.java.BAD 2007-10-17 13:49:26.000000000 -0400 -+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/RuleProcessor.java 2007-10-17 13:50:20.000000000 -0400 -@@ -262,7 +262,7 @@ public class RuleProcessor extends Error - - ResultFormatter rf = ps.getResultFormatter(); - -- Enumeration enum = null; -+ Enumeration MyEnum = null; - //-- copy top-level declared namespaces - /* - Hashtable namespaces = stylesheet.getNamespaces(); -@@ -304,9 +304,9 @@ public class RuleProcessor extends Error - - // Process top-level parameters - ScopedVariableSet vars = ps.getVariables(); -- enum = stylesheet.getParameters(); -- while (enum.hasMoreElements()) { -- Param param = (Param)enum.nextElement(); -+ MyEnum = stylesheet.getParameters(); -+ while (MyEnum.hasMoreElements()) { -+ Param param = (Param)MyEnum.nextElement(); - //-- first check passed in parameters - String value = getParameter(param.getName()); - if (value != null) { -@@ -322,9 +322,9 @@ public class RuleProcessor extends Error - } - - //-- Process top-level variables -- enum = stylesheet.getVariables(); -- while (enum.hasMoreElements()) { -- Variable variable = (Variable)enum.nextElement(); -+ MyEnum = stylesheet.getVariables(); -+ while (MyEnum.hasMoreElements()) { -+ Variable variable = (Variable)MyEnum.nextElement(); - XPathResult value = processVariable(variable, ps); - if (value != null) { - vars.setVariable(variable.getName(), value); -diff -up adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java.BAD adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java ---- adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java.BAD 2007-10-17 13:52:09.000000000 -0400 -+++ adaptx-0.9.14-src/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java 2007-10-17 13:52:24.000000000 -0400 -@@ -200,9 +200,9 @@ public class ResultHandlerAdapter2 imple - _handler.endElement(uri, name, name); - } - -- Enumeration enum = _namespaces.getLocalNamespacePrefixes(); -- while (enum.hasMoreElements()) { -- _handler.endPrefixMapping((String)enum.nextElement()); -+ Enumeration MyEnum = _namespaces.getLocalNamespacePrefixes(); -+ while (MyEnum.hasMoreElements()) { -+ _handler.endPrefixMapping((String)MyEnum.nextElement()); - } - _namespaces = _namespaces.getParent(); - diff --git a/adaptx-0.9.13-xsl.patch b/adaptx-0.9.13-xsl.patch deleted file mode 100644 index 60183dc..0000000 --- a/adaptx-0.9.13-xsl.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- src/doc/style/exolab.xsl.sav 2006-06-19 18:25:07.000000000 +0200 -+++ src/doc/style/exolab.xsl 2006-06-19 18:28:57.000000000 +0200 -@@ -1,5 +1,5 @@ - -- -+ - - - ---- src/doc/style/keywords.xsl.sav 2006-06-19 18:30:23.000000000 +0200 -+++ src/doc/style/keywords.xsl 2006-06-19 18:30:38.000000000 +0200 -@@ -1,5 +1,5 @@ - -- -+ - - - Keywords ---- src/doc/style/leftNav.xsl.sav 2006-06-19 18:31:37.000000000 +0200 -+++ src/doc/style/leftNav.xsl 2006-06-19 18:31:51.000000000 +0200 -@@ -1,5 +1,5 @@ - -- -+ - - - ---- src/doc/style/topNav.xsl.sav 2006-06-19 18:33:16.000000000 +0200 -+++ src/doc/style/topNav.xsl 2006-06-19 18:33:32.000000000 +0200 -@@ -1,5 +1,5 @@ - -- -+ - - - ---- src/doc/style/searchForm.xsl.sav 2006-06-19 18:32:38.000000000 +0200 -+++ src/doc/style/searchForm.xsl 2006-06-19 18:32:53.000000000 +0200 -@@ -1,5 +1,5 @@ - -- -+ - - - diff --git a/adaptx.spec b/adaptx.spec deleted file mode 100644 index 4f6db44..0000000 --- a/adaptx.spec +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright (c) 2000-2005, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -Name: adaptx -Version: 0.9.13 -Release: 12%{?dist} -Summary: AdaptX XSLT processor and XPath engine -License: BSD -Group: Applications/Text -# svn export http://svn.codehaus.org/castor/adaptx/tags/0.9.13/ adaptx-0.9.13-src -# tar cjf adaptx-0.9.13-src.tar.bz2 adaptx-0.9.13-src -Source0: %{name}-%{version}-src.tar.bz2 - -Patch0: %{name}-%{version}-xsl.patch -Patch1: %{name}-%{version}-missingstubs.patch -Patch2: %{name}-%{version}-build-xml.patch -Patch3: adaptx-0.9.13-no-enum-as-identifier.patch -URL: http://castor.codehaus.org/ -BuildRequires: ant >= 0:1.6 -BuildRequires: ant-nodeps -BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: log4j -BuildRequires: xml-commons-apis -BuildRequires: xerces-j2 -Requires: log4j -Requires: xml-commons-apis -Requires: xerces-j2 -Requires: jpackage-utils -Requires(pre): jpackage-utils -Requires(postun): jpackage-utils -BuildArch: noarch - -%description -Adaptx is an XSLT processor and XPath engine. - -%package javadoc -Group: Documentation -Summary: Javadoc for %{name} -Requires: jpackage-utils - -%description javadoc -Javadoc for %{name}. - -%package doc -Summary: Documentation for %{name} -Group: Documentation - -%description doc -Documentation for %{name}. - -%prep -%setup -q -n %{name}-%{version}-src -# remove CVS internal files -for dir in `find . -type d -name CVS`; do rm -rf $dir; done -# remove all binary libs -for j in $(find . -name "*.jar"); do - mv $j $j.no -done - -%patch0 -%patch1 -%patch2 -%patch3 -p1 - -%build -perl -p -i -e 's|classic|modern|' src/build.xml -export CLASSPATH=$(build-classpath xml-commons-apis log4j xerces-j2) -ant -buildfile src/build.xml jar javadoc -CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar -ant -buildfile src/build.xml doc - -%install -rm -rf $RPM_BUILD_ROOT - -# jar -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/%{name}_%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -rm -rf build/doc/javadoc - -%files -%defattr(-,root,root,-) -%doc src/etc/{CHANGELOG,contributors.html,LICENSE} -%{_javadir}/* - -%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name} - -%files doc -%defattr(-,root,root,-) -%doc build/doc/* - -%changelog -* Thu Jan 12 2012 Fedora Release Engineering - 0.9.13-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.9.13-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Dec 21 2010 Alexander Kurtakov 0.9.13-10 -- Fix FTBFS. -- Drop gcj. -- Adapt to current guidelines. - -* 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 - -* Wed Jul 9 2008 Tom "spot" Callaway 0.9.13-6 -- drop repotag - -* Tue Feb 19 2008 Fedora Release Engineering - 0.9.13-5jpp.3 -- Autorebuild for GCC 4.3 - -* Wed Oct 17 2007 Tom "spot" Callaway 0.9.13-4jpp.3 -- enum is a reserved keyword now, fix javadoc by not naming variables "enum" - -* Wed Apr 18 2007 Permaine Cheung 0.9.13-4jpp.2 -- Fixed the building of javadoc - -* Wed Jan 31 2007 Deepak Bhole 0.9.13-4jpp.1 -- Fixed issues raised by rpmlint - -* Thu Aug 03 2006 Deepak Bhole 0:0.9.13-3jpp.1 -- Added missing requirements. - -* Sun Jul 23 2006 Deepak Bhole 0:0.9.13-2jpp_3fc -- Adding missing dependency - -* Sat Jul 22 2006 Jakub Jelinek - 0:0.9.13-2jpp_2fc -- Rebuilt - -* Wed Jul 19 2006 Deepak Bhole 0:0.9.13-2jpp_1fc -- Add conditional native compiling. - -* Mon Jun 19 2006 Ralph Apel 0:0.9.13-1jpp -- Upgrade to 0.9.13 - -* Thu Aug 19 2004 Ralph Apel 0:0.9.6-2jpp -- Build with ant-1.6.2 -- Set xmlns in **/*.xsl - -* Tue Sep 09 2003 David Walluck 0:0.9.6-1jpp -- 0.9.6 -- Nicolas wrote the last changelog entry, not me -- adaptx requires itself to build, so I added '--without-external' in case you need or - wish to use the included jar, but it defaults to '--with-external' (e.g., it defaults - to using the external jpackage version of the jar). -- use the modern, not the classic, compiler -- BuildRequires: xml-commons-apis for doc target - -* Fri May 16 2003 Nicolas Mailhot 0:0.9.5-2jpp -- do not self-require for build :) - -* Sat May 10 2003 David Walluck 0:0.9.5-1jpp -- release diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..b8c7442 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired on 2012-02-06 due to lack of a maintainer. diff --git a/sources b/sources deleted file mode 100644 index de7cd43..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -a8990dd15db443266ffceb3646de26b6 adaptx-0.9.13-src.tar.bz2