PR#1: update to version 20140514 - rpms/xsom

rpms / xsom

#1 update to version 20140514

Merged 4 years ago by churchyard. Opened 4 years ago by decathorpe.

Unknown source master into master

update to version 20140514

Fabio Valentini • 4 years ago

6995327

.gitignore

file modified

		`@@ -1,1 +1,5 @@`
		`+ /results_*`
		`+ /*.src.rpm`
		`+`
		`/xsom-20110809svn.tar.gz`
		`+ /xsom-20140514.tar.gz`

00-pom-changes.patch

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ diff --git a/pom.xml b/pom.xml`
		`+ index f972462..a542ee5 100644`
		`+ --- a/pom.xml`
		`+ +++ b/pom.xml`
		`+ @@ -231,12 +231,6 @@`
		`+ <phase>generate-sources</phase>`
		`+ <configuration>`
		`+ <tasks>`
		`+ - <taskdef name="licence" classname="com.sun.tools.LicenceTask">`
		`+ - <classpath>`
		`+ - <pathelement path="lib/lic.jar" />`
		`+ - </classpath>`
		`+ - </taskdef>`
		`+ -`
		`+ <!--<mkdir dir="build/automata" />-->`
		`+`
		`+ <!-- delete old files to avoid corruption -->`
		`+ @@ -249,9 +243,6 @@`
		`+ <arg path="src/com/sun/xml/xsom/impl/parser/state" />`
		`+ <arg path="src/xmlschema.rng" />`
		`+ </java>`
		`+ - <licence licence="licenceheader.txt">`
		`+ - <fileset dir="src/" includes="com/sun/xml/xsom/impl/parser/state/*.java" />`
		`+ - </licence>`
		`+ </tasks>`
		`+ </configuration>`
		`+ <goals>`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- 6fc6b6c3b247adc124b7e7cbc96b8f77 xsom-20110809svn.tar.gz`
		`+ SHA512 (xsom-20140514.tar.gz) = b934eaabd6f39b0244d46eb9880874fac69ffc12e2e3c9595a0d5fb64619fdbb032f2722b07ea85e792ed9a4f02744c2f2672317b47fe359c9e67cd038b6cdf6`

xsom-20110809svn-pom.patch

file removed

-38

		`@@ -1,38 +0,0 @@`
		`- diff -Naur xsom-20110809/pom.xml xsom-20110809-work/pom.xml`
		`- --- xsom-20110809/pom.xml 2011-08-09 09:26:44.000000000 -0400`
		`- +++ xsom-20110809-work/pom.xml 2012-01-19 10:26:49.613983857 -0500`
		`- @@ -49,11 +49,6 @@`
		`- <url>http://xsom.java.net/</url>`
		`- <version>20110809</version>`
		`- <packaging>jar</packaging>`
		`- - <parent>`
		`- - <groupId>net.java</groupId>`
		`- - <artifactId>jvnet-parent</artifactId>`
		`- - <version>1</version>`
		`- - </parent>`
		`- <licenses>`
		`- <license>`
		`- <name>CDDL v1.1 / GPL v2 dual license</name>`
		`- @@ -146,12 +141,6 @@`
		`- <phase>generate-sources</phase>`
		`- <configuration>`
		`- <tasks>`
		`- - <taskdef name="licence" classname="com.sun.tools.LicenceTask">`
		`- - <classpath>`
		`- - <pathelement path="lib/lic.jar" />`
		`- - </classpath>`
		`- - </taskdef>`
		`- -`
		`- <mkdir dir="build/automata" />`
		`-`
		`- <!-- delete old files to avoid corruption -->`
		`- @@ -164,9 +153,6 @@`
		`- <arg path="build/src/com/sun/xml/xsom/impl/parser/state" />`
		`- <arg path="src/xmlschema.rng" />`
		`- </java>`
		`- - <licence licence="licenceheader.txt">`
		`- - <fileset dir="build/src/" includes="com/sun/xml/xsom/impl/parser/state/*.java" />`
		`- - </licence>`
		`- </tasks>`
		`- </configuration>`
		`- <goals>`

xsom.spec

file modified

+24 -25

		`@@ -1,32 +1,26 @@`
		`- %global checkout 20110809`
		`+ Name: xsom`
		`+ Summary: XML Schema Object Model (XSOM)`
		`+ Version: 20140514`
		`+ Release: 1%{?dist}`
		`+ License: CDDL-1.1 or GPLv2 with exceptions`

		`- Name: xsom`
		`- Version: 0`
		`- Release: 22.%{checkout}svn%{?dist}`
		`- Summary: XML Schema Object Model (XSOM)`
		`- License: CDDL-1.1 or GPLv2 with exceptions`
		`- URL: http://xsom.java.net`
		`-`
		`- # svn export https://svn.java.net/svn/xsom~sources/tags/xsom-20110809 xsom-20110809svn`
		`- # find xsom-20110809svn/ -name '*.class' -delete`
		`- # find xsom-20110809svn/ -name '*.class' -delete`
		`- # tar czf xsom-20110809svn.tar.gz xsom-20110809svn`
		`- Source0: %{name}-%{checkout}svn.tar.gz`
		`+ # java.net is dead; upstream sources have been imported to GitHub though`
		`+ URL: https://github.com/kohsuke/xsom`
		`+ Source0: %{url}/archive/%{name}-%{version}.tar.gz`

		`# We need this because one of the original tests tries to download`
		`# it from the website, but that doesn't work in Koji:`
		`Source1: http://docs.oasis-open.org/regrep/v3.0/schema/lcm.xsd`

		`- Patch0: %{name}-%{checkout}svn-pom.patch`
		`+ # patch POM to drop tasks that rely on bundled JARs`
		`+ Patch0: 00-pom-changes.patch`

		`BuildRequires: maven-local`
		`BuildRequires: mvn(junit:junit)`
		`- BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)`
		`BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)`
		`BuildRequires: mvn(relaxngDatatype:relaxngDatatype)`
		`- BuildRequires: relaxngcc`

		`- BuildArch: noarch`
		`+ BuildArch: noarch`

		`%description`
		`XML Schema Object Model (XSOM) is a Java library that allows applications to`
		`@@ -37,25 +31,27 @@`
		`object model works.`

		`%package javadoc`
		`- Summary: Javadoc for %{name}`
		`+ Summary: Javadoc for %{name}`

		`%description javadoc`
		`This package contains javadoc for %{name}.`

		`%prep`
		`- %setup -q -n %{name}-%{checkout}svn`
		`+ %setup -q -n %{name}-%{name}-%{version}`
		`%patch0 -p1`

		`+ find -name "*.class" -print -delete`
		`+ find -name "*.jar" -print -delete`
		`+`
		`+ # parent POM is not necessary`
		`+ %pom_remove_parent`
		`+`
		`# Replace the URL of the XSD file used by the tests with its`
		`# absolute filesystem location:`
		`sed -i \`
		`'s\|http://docs.oasis-open.org/regrep/v3.0/schema/lcm.xsd\|file://%{SOURCE1}\|' \`
		`test/XSOMParserTest.java`

		`- pushd lib`
		- ln -sf `build-classpath relaxngcc` relaxngcc.jar
		`- popd`
		`-`
		`%build`
		`%mvn_build -- -Dproject.build.sourceEncoding=UTF-8`

		`@@ -63,12 +59,15 @@`
		`%mvn_install`

		`%files -f .mfiles`
		`- %doc license.txt`
		`+ %license license.txt copyright.txt`

		`%files javadoc -f .mfiles-javadoc`
		`- %doc license.txt`
		`+ %license license.txt copyright.txt`

		`%changelog`
		`+ * Thu Oct 24 2019 Fabio Valentini <decathorpe@gmail.com> - 20140514-1`
		`+ - Update to version 20140514.`
		`+`
		`* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0-22.20110809svn`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

decathorpe commented 4 years ago

update to "latest" version (20110809 → 20140514)
move to "rescued" sources on GitHub, since java.net is dead
drop unnecessary deps and workarounds (maven-antrun-plugin, relaxngcc)

Test rebuilds of recursively dependent packages were done in COPR:

https://copr.fedorainfracloud.org/coprs/decathorpe/xsom-20140514-pr/monitor/

The only three build failures (bval, jaxb2-maven-plugin, and openjpa) are already present in rawhide without this change, and are mostly caused by missing dependencies.