rpms/xml-commons-apis
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove bogus provides on xml-commons-jaxp-1.3-apis

Browse Source 
Resolves: rhbz#1977011
This commit is contained in:
Mikolaj Izdebski 2021-06-28 11:45:54 +02:00
parent 232f1943cf
commit 4b2189e3e2
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
bfce20df4df9b7cd97b1d6f626b84d88 xml-commons-external-1.4.01-src.tar.gz SHA512 (xml-commons-external-1.4.01-src.tar.gz) = de7eb480f42915a7875c4ac6046e05df0d34039818c81c0ce80970113d72e37b42162e535a676b0ab283016837fca124414431b0a633daa22bb4d55b3da87cef

29
xml-commons-apis.spec
View File

@ -1,6 +1,6 @@
Name: xml-commons-apis Name: xml-commons-apis
Version: 1.4.01 Version: 1.4.01
Release: 34%{?dist} Release: 35%{?dist}
Summary: APIs for DOM, SAX, and JAXP Summary: APIs for DOM, SAX, and JAXP
License: ASL 2.0 and W3C and Public Domain License: ASL 2.0 and W3C and Public Domain
URL: http://xml.apache.org/commons/ URL: http://xml.apache.org/commons/
@ -21,9 +21,6 @@ BuildRequires: apache-parent
Provides: xml-commons = %{version}-%{release} Provides: xml-commons = %{version}-%{release}
# TODO: Ugh, this next line should be dropped since it actually provides JAXP 1.4 now...
Provides: xml-commons-jaxp-1.3-apis = %{version}-%{release}
%description %description
xml-commons-apis is designed to organize and have common packaging for xml-commons-apis is designed to organize and have common packaging for
the various externally-defined standard interfaces for XML. This the various externally-defined standard interfaces for XML. This
@ -53,14 +50,6 @@ iconv -f iso8859-1 -t utf-8 LICENSE.dom-documentation.txt > \
iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \ iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \
LICENSE.dom-sof.temp && mv -f LICENSE.dom-sof.temp LICENSE.dom-software.txt LICENSE.dom-sof.temp && mv -f LICENSE.dom-sof.temp LICENSE.dom-software.txt
# disable javadoc linting
sed -i -e '/javadoc packagenames/aadditionalparam="-Xdoclint:none"' build.xml
# in Java 9+ a single underscore is no longer a valid identifier
sed -i -e 's/\(Throwable\|Exception\) _/\1 ex/' \
src/javax/xml/validation/SchemaFactoryFinder.java \
src/javax/xml/xpath/XPathFactoryFinder.java
# remove bogus section from poms # remove bogus section from poms
cp %{SOURCE3} %{SOURCE4} . cp %{SOURCE3} %{SOURCE4} .
sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
@ -70,7 +59,7 @@ sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
%mvn_alias :xml-apis-ext xerces:dom3-xml-apis %mvn_alias :xml-apis-ext xerces:dom3-xml-apis
%build %build
ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar javadoc ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar javadoc
# inject OSGi manifests # inject OSGi manifests
jar ufm build/xml-apis.jar %{SOURCE1} jar ufm build/xml-apis.jar %{SOURCE1}
@ -90,15 +79,17 @@ rm -rf build/docs/javadoc
%doc LICENSE.dom-documentation.txt README.dom.txt %doc LICENSE.dom-documentation.txt README.dom.txt
%doc LICENSE.dom-software.txt LICENSE.sac.html %doc LICENSE.dom-software.txt LICENSE.sac.html
%doc LICENSE.sax.txt README-sax README.sax.txt %doc LICENSE.sax.txt README-sax README.sax.txt
%{_javadir}/*
%files manual %files manual
%doc build/docs/* %doc build/docs/*
%files javadoc %files javadoc -f .mfiles-javadoc
%{_javadocdir}/*
%changelog %changelog
* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.01-35
- Remove bogus provides on xml-commons-jaxp-1.3-apis
- Resolves: rhbz#1977011
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.01-34 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.01-34
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
@ -117,9 +108,15 @@ rm -rf build/docs/javadoc
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-29 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.01-27
- Mass rebuild for javapackages-tools 201902
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-28 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.01-26
- Mass rebuild for javapackages-tools 201901
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-27 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.01-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild