Accepting request 894352 from Java:packages

syncing changelog with older sle versions

OBS-URL: https://build.opensuse.org/request/show/894352
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snakeyaml?expand=0&rev=4

snakeyaml.changes

@@ -2,7 +2,7 @@
 Sat May 15 17:33:53 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
 - Upgrade to upstream release 1.28
-  * Fixes bsc#1186088, CVE-2017-18640
+  * Fixes bsc#1159488, bsc#1186088, CVE-2017-18640
 - Removed patch:
   * 0003-fix-broken-test.patch
     + not needed since integrated upstream
@@ -29,5 +29,36 @@ Sun Nov 10 05:55:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 -------------------------------------------------------------------
 Fri Mar  1 06:32:02 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
-- Initial packaging of snakeyaml 1.17 based on Fedora package
+- Packaging of snakeyaml 1.17 based on Fedora package
 - Generated and customized ant build file
+- Removed patch:
+  * snakeyaml-1.10-jdk9.patch
+    + not needed any more
+
+-------------------------------------------------------------------
+Thu Nov 02 13:12:11 UTC 2017 - jgonzalez@suse.com
+
+- Fix build with java9
+- Add:
+  * snakeyaml-1.10-jdk9.patch
+
+-------------------------------------------------------------------
+Tue Jul  1 13:06:37 UTC 2014 - mseidl@suse.de
+
+- modified for sle12
+
+-------------------------------------------------------------------
+Fri Nov 18 01:48:56 CET 2011 - ro@suse.de
+
+- explicitly add java-devel to buildrequires
+
+-------------------------------------------------------------------
+Fri Aug 26 14:55:26 UTC 2011 - bmaryniuk@suse.com
+
+- Removed bootstrap binaries.
+
+-------------------------------------------------------------------
+Fri Aug 26 14:32:27 UTC 2011 - bmaryniuk@suse.com
+
+- Initial build with a bootstrap binaries.
+

snakeyaml.spec

@@ -38,10 +38,9 @@ Patch0:         0001-replace-bundled-base64coder-with-java.util.Base64.patch
 Patch1:         0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-codec
-BuildRequires:  base64coder
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-Requires:       mvn(biz.source_code:base64coder)
 Requires:       mvn(commons-codec:commons-codec)
 BuildArch:      noarch
 %if %{with tests}
@@ -93,8 +92,6 @@ rm -f src/test/java/examples/SpringTest.java
 
 # Replacement for bundled gdata-java-client
 %pom_add_dep commons-codec:commons-codec
-# Re-add bundled base64coder
-%pom_add_dep biz.source_code:base64coder
 
 # fails in rpmbuild only due to different locale
 rm src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
@@ -106,7 +103,7 @@ sed -i 's/\r//g' LICENSE.txt
 
 %build
 mkdir -p lib
-build-jar-repository -s lib base64coder commons-codec
+build-jar-repository -s lib commons-codec
 %if %{with tests}
 build-jar-repository -s lib junit hamcrest/core velocity commons-collections commons-lang oro joda-time
 %endif
@@ -122,8 +119,8 @@ install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap %{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/