[packages/java-xml-commons] Up to 1.4.01
arekm
arekm at pld-linux.org
Wed Mar 11 17:04:20 CET 2026
commit 6b9b4e681734e4e2e47fccd364d24e1b7abc259e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Mar 11 17:03:38 2026 +0100
Up to 1.4.01
java-xml-commons.spec | 85 ++++++++++++++----------------------------
xml-commons.enum-keyword.patch | 36 ------------------
2 files changed, 29 insertions(+), 92 deletions(-)
---
diff --git a/java-xml-commons.spec b/java-xml-commons.spec
index ef5c070..c019b41 100644
--- a/java-xml-commons.spec
+++ b/java-xml-commons.spec
@@ -1,26 +1,20 @@
-%define subver b2
-%define rel 14
-%define srcname xml-commons
-Summary: Common code for Apache XML projects
-Summary(pl.UTF-8): Wspólny kod dla projektów Apache XML
-Name: java-%{srcname}
-Version: 1.0
-Release: 0.%{subver}.%{rel}
+Summary: Common XML APIs for Java (DOM, SAX, JAXP)
+Summary(pl.UTF-8): Wspólne API XML dla Javy (DOM, SAX, JAXP)
+Name: java-xml-commons
+Version: 1.4.01
+Release: 1
License: Apache v2.0
Group: Libraries/Java
-Source0: http://www.apache.org/dist/xml/commons/%{srcname}-%{version}.%{subver}.tar.gz
-# Source0-md5: 6c6551ece56948ee535d5f5014489b8d
-Patch0: %{srcname}.build.patch
-Patch1: %{srcname}.manifest.patch
-Patch2: %{srcname}.enum-keyword.patch
+# Use OBS repacked source because the Apache external tarball lacks the
+# full Ant-oriented external/ layout (build.xml + docs) expected by distro builds.
+# Original upstream release URL (source-only layout):
+# https://archive.apache.org/dist/xml/commons/source/xml-commons-external-%{version}-src.tar.gz
+Source0: https://build.opensuse.org/public/source/openSUSE:Factory/xml-commons-apis/xml-commons-external-%{version}-src.tar.xz
URL: https://xerces.apache.org/xml-commons/
BuildRequires: ant
BuildRequires: jdk
BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: sed >= 4.0
Requires: jpackage-utils
Provides: java(xml-commons-apis) = %{version}
Obsoletes: xml-commons < 1.0-1
@@ -28,77 +22,56 @@ BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-xml-commons is focused on common code and guidelines for xml projects.
-Its first focus will be to organize and have common packaging for the
-various externally-defined standards code relating to XML - things
-like the DOM, SAX, and JAXP interfaces.
+xml-commons-external provides Java XML standards APIs shared by many
+projects, including DOM, SAX, and JAXP interfaces.
%description -l pl.UTF-8
-Projekt xml-commons koncentruje się na wspólnym kodzie i wytycznych
-dla projektów XML. Pierwszym celem będzie zorganizowanie i
-spakietowanie kodu wspólnego dla różnych zewnętrznych standardów
-związanych z XML-em - rzeczy takich jak DOM, SAX oraz interfejsy JAXP.
+Pakiet xml-commons-external dostarcza wspólne standardowe API XML dla
+wielu projektów Java, w tym interfejsy DOM, SAX oraz JAXP.
%package javadoc
-Summary: Online manual for xml-commons
-Summary(pl.UTF-8): Dokumentacja online dla xml-commons
+Summary: API documentation for xml-commons
+Summary(pl.UTF-8): Dokumentacja API dla xml-commons
Group: Documentation
Requires: jpackage-utils
Obsoletes: xml-commons-javadoc < 1.0-1
%description javadoc
-Documentation for xml-commons.
+API documentation for xml-commons.
%description javadoc -l pl.UTF-8
-Dokumentacja dla xml-commons.
+Dokumentacja API dla xml-commons.
%prep
-%setup -q -n %{srcname}-%{version}.%{subver}
-
-%{__sed} -i -e 's,\r$,,' build.xml
-%{__sed} -i -e 's,\r$,,' java/which.xml
-%{__sed} -i -e 's,\r$,,' java/external/build.xml
-%{__sed} -i -e 's,\r$,,' java/src/org/apache/env/Which.java
-
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
+%setup -q -n external
%build
-%ant clean
-
-%ant jars
+%ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadoc
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-
-install java/external/build/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-apis-%{version}.jar
-install java/build/which.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-which-%{version}.jar
-
-ln -s %{srcname}-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-apis.jar
-ln -s %{srcname}-which-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-which.jar
+install -pm 644 build/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/xml-commons-apis-%{version}.jar
+ln -s xml-commons-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-commons-apis.jar
# javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -a java/external/build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+install -d $RPM_BUILD_ROOT%{_javadocdir}/xml-commons-%{version}
+cp -a build/docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/xml-commons-%{version}
+ln -s xml-commons-%{version} $RPM_BUILD_ROOT%{_javadocdir}/xml-commons # ghost symlink
%clean
rm -rf $RPM_BUILD_ROOT
%post javadoc
-ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
+ln -nfs xml-commons-%{version} %{_javadocdir}/xml-commons
%files
%defattr(644,root,root,755)
-%doc KEYS README.html
+%doc LICENSE NOTICE README.dom.txt README.sax.txt LICENSE.sax.txt LICENSE.sac.html LICENSE.dom-software.txt LICENSE.dom-documentation.txt
%{_javadir}/xml-commons-apis-%{version}.jar
%{_javadir}/xml-commons-apis.jar
-%{_javadir}/xml-commons-which-%{version}.jar
-%{_javadir}/xml-commons-which.jar
%files javadoc
%defattr(644,root,root,755)
-%{_javadocdir}/%{srcname}-%{version}
-%ghost %{_javadocdir}/%{srcname}
+%{_javadocdir}/xml-commons-%{version}
+%ghost %{_javadocdir}/xml-commons
diff --git a/xml-commons.enum-keyword.patch b/xml-commons.enum-keyword.patch
deleted file mode 100644
index 3948d88..0000000
--- a/xml-commons.enum-keyword.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru xml-commons-1.0.b2.orig/java/src/org/apache/env/Which.java xml-commons-1.0.b2/java/src/org/apache/env/Which.java
---- xml-commons-1.0.b2.orig/java/src/org/apache/env/Which.java
-+++ xml-commons-1.0.b2/java/src/org/apache/env/Which.java
-@@ -289,12 +289,12 @@
- if (null == hash)
- return;
-
-- Enumeration enum = hash.keys();
-+ Enumeration keys = hash.keys();
- Vector v = new Vector();
-
-- while (enum.hasMoreElements())
-+ while (keys.hasMoreElements())
- {
-- Object key = enum.nextElement();
-+ Object key = keys.nextElement();
- String keyStr = key.toString();
- Object item = hash.get(key);
-
-@@ -311,12 +311,12 @@
- }
- }
-
-- enum = v.elements();
-+ Enumeration elems = v.elements();
-
-- while (enum.hasMoreElements())
-+ while (elems.hasMoreElements())
- {
-- String n = (String) enum.nextElement();
-- Hashtable h = (Hashtable) enum.nextElement();
-+ String n = (String) elems.nextElement();
-+ Hashtable h = (Hashtable) elems.nextElement();
-
- reportHashtable(h, n, out);
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-xml-commons.git/commitdiff/6b9b4e681734e4e2e47fccd364d24e1b7abc259e
More information about the pld-cvs-commit
mailing list