commit db001c72c5b1754749d3bf52d06167c533aca923 Author: Mo Morsi <mmorsi(a)redhat.com&gt; Date: Mon Feb 13 15:52:25 2012 -0500 update to latest upstream release, various fixes .gitignore | 1 + snakeyaml-add-osgi-metadata.patch | 26 -- snakeyaml-issue121-file-handle-leaks.patch | 406 ---------------------------- snakeyaml.spec | 23 +- sources | 2 +- 5 files changed, 11 insertions(+), 447 deletions(-) --- diff --git a/.gitignore b/.gitignore index 4e3996b..2d5b540 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /SnakeYAML-all-1.8.zip +/SnakeYAML-all-1.9.zip diff --git a/snakeyaml.spec b/snakeyaml.spec index e8f0bc1..18bb39f 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -2,21 +2,19 @@ %global group_id org.yaml Name: snakeyaml -Version: 1.8 -Release: 6%{?dist} +Version: 1.9 +Release: 1%{?dist} Summary: YAML parser and emitter for the Java programming language License: ASL 2.0 Group: Development/Libraries # http://code.google.com/p/snakeyaml URL: http://code.google.com/p/%{name} -# http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.8.zip +# http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip Source0: http://%{name}.googlecode.com/files/SnakeYAML-all-%{version}.zip Source1: %{name}.depmap Patch0: %{name}-spring-removal-workaround.patch Patch1: %{name}-gdata+base64coder+cobertura-addition.patch -Patch2: %{name}-issue121-file-handle-leaks.patch -Patch3: %{name}-add-osgi-metadata.patch BuildArch: noarch @@ -61,8 +59,6 @@ This package contains the API documentation for %{name}. %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 # remove bundled stuff rm -rf target @@ -85,18 +81,12 @@ install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}. # pom install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap %{group_id} %{name} %{version} JPP %{name} +%add_maven_depmap JPP-%{name}.pom %{name}.jar # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name} -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %doc LICENSE.txt %{_javadir}/%{name}.jar @@ -108,6 +98,11 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Fri Jan 20 2012 Mo Morsi <mmorsi(a)redhat.com&gt; - 1.9-1 +- Update to latest upstream release +- patch2, patch3 no longer needed +- update to latest fedora java guidelines + * Mon Jun 20 2011 Jaromir Capik <jcapik(a)redhat.com&gt; - 1.8-6 - Patch for the issue67 test removed diff --git a/sources b/sources index 920342c..b8eb631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f02bc7f8207d95f235535678d2df70ce SnakeYAML-all-1.8.zip +78a82f2b24d6c4271c079756b5784f99 SnakeYAML-all-1.9.zip