[snakeyaml/f18] Remove unneeded dependencies: base64coder, gdata-java

[Mikolaj Izdebski]

commit 95454af09b90c1c335ca88192aae4ceb9b9c1896
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Oct 15 06:10:51 2012 +0200

    Remove unneeded dependencies: base64coder, gdata-java
    
    - Convert pom.xml patch to POM macro

 ...yaml-gdata+base64coder+cobertura-addition.patch |   33 --------------------
 snakeyaml.depmap                                   |   12 -------
 snakeyaml.spec                                     |   20 ++++--------
 3 files changed, 7 insertions(+), 58 deletions(-)
---
diff --git a/snakeyaml.spec b/snakeyaml.spec
index d0cd374..5b74aba 100644
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@@ -3,7 +3,7 @@
 
 Name:             snakeyaml
 Version:          1.9
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          YAML parser and emitter for the Java programming language
 License:          ASL 2.0
 Group:            Development/Libraries
@@ -11,10 +11,8 @@ Group:            Development/Libraries
 URL:              http://code.google.com/p/%{name}
 # 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
 
 BuildArch:        noarch
 
@@ -25,15 +23,9 @@ BuildRequires:    maven-plugin-cobertura
 BuildRequires:    maven-surefire-provider-junit4
 BuildRequires:    joda-time
 BuildRequires:    gnu-getopt
-BuildRequires:    gdata-java
-BuildRequires:    base64coder
 
-Requires:         gdata-java
-Requires:         base64coder
 Requires:         java
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 SnakeYAML features:
@@ -58,7 +50,7 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}
 
 %patch0 -p1
-%patch1 -p1
+%pom_add_dep org.codehaus.mojo:cobertura-maven-plugin:any:test
 
 # remove bundled stuff
 rm -rf target
@@ -69,9 +61,7 @@ rm -rf src/main/java/biz
 sed -i 's/\r//g' LICENSE.txt
 
 %build
-# gdata-java has no maven support -> depmap file needed
-# http://code.google.com/p/gdata-java-client/issues/detail?id=328
-mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" install
+mvn-rpmbuild install
 
 %install
 # jars
@@ -98,6 +88,10 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.9-3
+- Remove unneeded dependencies: base64coder, gdata-java
+- Convert pom.xml patch to POM macro
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild