#1 update to version 1.4
Merged 3 months ago by decathorpe. Opened 3 months ago by decathorpe.
Unknown source master  into  master

file modified
+4

@@ -1,1 +1,5 @@

+ /results_*

+ /*.src.rpm

+ 

  /glassfish-dtd-parser-1.2-SNAPSHOT-src-svn.tar.gz

+ /jaxb-dtd-parser-1.4.tar.gz

file modified
+27 -17

@@ -1,20 +1,21 @@

+ %global srcname jaxb-dtd-parser

+ 

  Name:          glassfish-dtd-parser

- Version:       1.2

- Release:       0.20.20120120svn%{?dist}

+ Version:       1.4

+ Release:       1%{?dist}

  Summary:       Library for parsing XML DTDs

  License:       CDDL-1.1 and GPLv2 with exceptions

- Url:           http://java.net/projects/dtd-parser

- # svn export https://svn.java.net/svn/dtd-parser~svn/trunk/dtd-parser glassfish-dtd-parser-1.2-SNAPSHOT

- # find glassfish-dtd-parser-1.2-SNAPSHOT/ -name '*.jar' -delete

- # tar czf glassfish-dtd-parser-1.2-SNAPSHOT-src-svn.tar.gz glassfish-dtd-parser-1.2-SNAPSHOT

- Source0:       %{name}-%{version}-SNAPSHOT-src-svn.tar.gz

- BuildRequires: bsf

- BuildRequires: maven-local

- BuildRequires: maven-enforcer-plugin

- BuildRequires: sonatype-oss-parent

+ 

+ # NOTE: The new upstream repository under the Eclipse EE4J umbrella is here:

+ # https://github.com/eclipse-ee4j/jaxb-dtd-parser

+ URL:           https://github.com/javaee/%{srcname}

+ Source0:       %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

  

  BuildArch:     noarch

  

+ BuildRequires: maven-local

+ BuildRequires: mvn(net.java:jvnet-parent:pom:)

+ 

  %description

  Library for parsing XML DTDs.

  

@@ -25,23 +26,32 @@

  This package contains javadoc for %{name}.

  

  %prep

- %setup -q -n %{name}-%{version}-SNAPSHOT

+ %setup -q -n %{srcname}-%{version}

  

- %build

+ # builds fail if this file is present

+ rm dtd-parser/src/module-info.java

  

+ %build

+ pushd dtd-parser

  %mvn_file :dtd-parser %{name}

  %mvn_build

+ popd

  

  %install

+ pushd dtd-parser

  %mvn_install

+ popd

  

- %files -f .mfiles

- %license LICENSE.txt

+ %files -f dtd-parser/.mfiles

+ %license LICENSE

  

- %files javadoc -f .mfiles-javadoc

- %license LICENSE.txt

+ %files javadoc -f dtd-parser/.mfiles-javadoc

+ %license LICENSE

  

  %changelog

+ * Fri Oct 18 2019 Fabio Valentini <decathorpe@gmail.com> - 1.4-1

+ - Update to version 1.4.

+ 

  * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-0.20.20120120svn

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

file modified
+1 -1

@@ -1,1 +1,1 @@

- 8f985b090cad26f473d54e22d610c344  glassfish-dtd-parser-1.2-SNAPSHOT-src-svn.tar.gz

+ SHA512 (jaxb-dtd-parser-1.4.tar.gz) = d123a1cceb71016a0725ac81f212148290dfaa69834cce4cf073ff9833a1c2f45ddb2814fa4b51a3411631b8fdf5bb501e18d296e6ad784d75ff90290ce4350d

  • update to latest version with same IDs (1.2-SNAPSHOT → 1.4)
  • adapt to different directory structure in SVN repo vs. new git repo
  • update BuildRequires
  • fix builds by removing module-info.java file :smirk:

Test rebuilds of recursively dependent packages were done in COPR:

https://copr.fedorainfracloud.org/coprs/decathorpe/glassfish-dtd-parser-1.4-pr/monitor/

These build failures are already present in rawhide and not caused by this update:

  • bval
  • jaxb2-maven-plugin

The one other dependency (glassfish-jaxb) built fine, though it does not run the test suite during its build ...

+1, ship it. We'll figure out if some portion of glassfish-jaxb works fine when we eventually run upstream CI for dogtag-pki on rawhide.

Pull-Request has been merged by decathorpe

3 months ago