From a4c9564159f242904f9b9dda17c1d90dde32ab95 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jul 29 2019 12:41:30 +0000 Subject: disable support for spring --- diff --git a/.gitignore b/.gitignore index 7b9c02c..c2e068d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results_* +/*.src.rpm + /SnakeYAML-all-1.8.zip /SnakeYAML-all-1.9.zip /snakeyaml-1.13.zip diff --git a/snakeyaml.spec b/snakeyaml.spec index 67c518e..9972f4e 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -1,14 +1,15 @@ %global vertag 70abb5efa4c0 -%bcond_without spring +%bcond_with spring -Name: snakeyaml -Version: 1.17 -Release: 8%{?dist} -Summary: YAML parser and emitter for the Java programming language -License: ASL 2.0 -URL: https://bitbucket.org/asomov/%{name}/ -Source0: https://bitbucket.org/asomov/snakeyaml/get/v%{version}.tar.bz2#/%{name}-%{version}.tar.bz2 +Name: snakeyaml +Summary: YAML parser and emitter for Java +Version: 1.17 +Release: 9%{?dist} +License: ASL 2.0 + +URL: https://bitbucket.org/asomov/%{name}/ +Source0: https://bitbucket.org/asomov/snakeyaml/get/v%{version}.tar.bz2#/%{name}-%{version}.tar.bz2 # Upstream has forked gdata-java and base64 and refuses [1] to # consider replacing them by external dependencies. Bundled libraries @@ -16,11 +17,11 @@ Source0: https://bitbucket.org/asomov/snakeyaml/get/v%{version}.tar.bz2 # See rhbz#875777 and http://code.google.com/p/snakeyaml/issues/detail?id=175 # # Remove use of bundled Base64 implementation -Patch0: 0001-Replace-bundled-base64-implementation.patch +Patch0: 0001-Replace-bundled-base64-implementation.patch # We don't have gdata-java in Fedora any longer, use commons-codec instead -Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch +Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch -BuildArch: noarch +BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(biz.source_code:base64coder) @@ -45,12 +46,13 @@ SnakeYAML features: * relatively sensible error messages. -%package javadoc -Summary: API documentation for %{name} +%package javadoc +Summary: API documentation for %{name} -%description javadoc +%description javadoc This package contains %{summary}. + %prep %setup -q -n asomov-%{name}-%{vertag} %patch0 -p1 @@ -88,19 +90,26 @@ sed -i 's/\r//g' LICENSE.txt rm -r src/test/java/org/yaml/snakeyaml/issues/issue9 %endif + %build %mvn_build + %install %mvn_install + %files -f .mfiles %doc LICENSE.txt %files javadoc -f .mfiles-javadoc %doc LICENSE.txt + %changelog +* Sun Jul 28 2019 Fabio Valentini - 1.17-9 +- Disable support for spring. + * Fri Jul 26 2019 Fedora Release Engineering - 1.17-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -218,3 +227,4 @@ rm -r src/test/java/org/yaml/snakeyaml/issues/issue9 * Mon May 16 2011 Jaromir Capik - 1.8-1 - Initial version of the package +