diff --git a/.gitignore b/.gitignore index 93cce44..0b1e215 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ -/decentxml-1.3.tar.xz -/xmlts20031210.zip -decentxml-1.4-src.zip +/decentxml-*.tar.xz +/*.zip +/digulla-decentxml-*/ +/results_*/ +*.rpm diff --git a/decentxml.spec b/decentxml.spec index f71c090..cfa19d9 100644 --- a/decentxml.spec +++ b/decentxml.spec @@ -1,13 +1,25 @@ +%global revision 572a0baa91d1 + Name: decentxml Version: 1.4 -Release: 19%{?dist} +Release: 20%{?dist} Summary: XML parser optimized for round-tripping and code reuse License: BSD -URL: http://code.google.com/p/%{name} +# Google Code has shut down. +# URL: http://code.google.com/p/decentxml +URL: https://bitbucket.org/digulla/%{name} BuildArch: noarch -Source0: https://decentxml.googlecode.com/files/decentxml-1.4-src.zip -# for running w3c conformance test suite +# Google Code has shut down. +# Source0: https://decentxml.googlecode.com/files/decentxml-1.4-src.zip +# +# This version is equivalent to the last Google Code release, other than +# folder structure due to how Bitbucket makes zip archives: +# +# decentxml-1.4 -> digulla-decentxml-572a0baa91d1 +Source0: https://bitbucket.org/digulla/%{name}/get/r%{version}.zip + +# For running w3c conformance test suite. Source1: http://www.w3.org/XML/Test/xmlts20031210.zip BuildRequires: maven-local @@ -19,7 +31,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) %description XML parser optimized for round-tripping and code reuse with main features being: - * Allows 100% round-tripping, even for weird whitespace between + * Allows 100% round-tripping, even for weird white-space between attributes in the start tag or in the end tag * Suitable for building editors and filters which want/need to preserve the original file layout as much as possible @@ -34,9 +46,10 @@ Summary: API documentation for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -# we are looking for xml conformance data one lever above so unzip -# here and symlink there +%setup -q -n digulla-%{name}-%{revision} + +# We are looking for xml conformance data one level above so unzip +# here and symlink there. unzip %{SOURCE1} ln -sf %{name}-%{version}/xmlconf ../xmlconf sed -i -e "s|junit-dep|junit|g" pom.xml @@ -58,12 +71,16 @@ sed -i '/not_wf_sa_16[89] /d' src/test/java/de/pdark/decentxml/XMLConformanceTes %mvn_install %files -f .mfiles -%doc LICENSE README +%license LICENSE +%doc README %files javadoc -f .mfiles-javadoc -%doc LICENSE +%license LICENSE %changelog +* Thu Dec 12 2019 Alexander Scheel - 1.4-20 +- Rebuilt and resurrected from orphaning for Eclipse + * Thu Jan 31 2019 Fedora Release Engineering - 1.4-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 88093fd..5e9ee64 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b09f340780c6ff995bf6ff81ad341585 xmlts20031210.zip -bdfa12918451f34d83b409148a17a599 decentxml-1.4-src.zip +SHA512 (r1.4.zip) = a3f048528dbb0a78b1f943900e52a597a8b0e145f231b85ad21e6fdab468475a5a95fe72c567bf217acf958aebd90d8d399af60c8e910f6432ed03c890fbfc30 +SHA512 (xmlts20031210.zip) = 128705b32e885c17323a337ec03508f684f1ae1b35860fd38a14a1a6ccb591afdb2f4d311a04202c6d60b2d7f96a4099b6adcf85e9879d545b1fe58d4951a1fc