From 95454af09b90c1c335ca88192aae4ceb9b9c1896 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Oct 15 2012 04:10:51 +0000
Subject: Remove unneeded dependencies: base64coder, gdata-java


- Convert pom.xml patch to POM macro

---

diff --git a/snakeyaml-gdata+base64coder+cobertura-addition.patch b/snakeyaml-gdata+base64coder+cobertura-addition.patch
deleted file mode 100644
index 2150001..0000000
--- a/snakeyaml-gdata+base64coder+cobertura-addition.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur snakeyaml.orig/pom.xml snakeyaml/pom.xml
---- snakeyaml.orig/pom.xml	2011-02-15 12:02:01.000000000 +0100
-+++ snakeyaml/pom.xml	2011-05-30 18:21:05.915253296 +0200
-@@ -46,6 +46,16 @@
-     </developers>
-     <dependencies>
-         <dependency>
-+            <groupId>com.google.gdata</groupId>
-+            <artifactId>gdata-core</artifactId>
-+            <version>1.0</version>
-+        </dependency>
-+        <dependency>
-+            <groupId>biz.source_code</groupId>
-+            <artifactId>base64coder</artifactId>
-+            <version>2010-12-19</version>
-+        </dependency>
-+        <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-             <version>4.7</version>
-@@ -79,6 +79,12 @@
-             <version>1.6</version>
-             <scope>test</scope>
-         </dependency>
-+        <dependency>
-+            <groupId>org.codehaus.mojo</groupId>
-+            <artifactId>cobertura-maven-plugin</artifactId>
-+            <version>2.4</version>
-+            <scope>test</scope>
-+        </dependency>
-     </dependencies>
-     <build>
-         <plugins>
diff --git a/snakeyaml.depmap b/snakeyaml.depmap
deleted file mode 100644
index 2571680..0000000
--- a/snakeyaml.depmap
+++ /dev/null
@@ -1,12 +0,0 @@
-<dependencies>
-    <dependency>
-      <maven>
-        <groupId>com.google.gdata</groupId>
-        <artifactId>gdata-core</artifactId>
-      </maven>
-      <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>gdata/gdata-core</artifactId>
-      </jpp>
-    </dependency>
-</dependencies>
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@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@lists.fedoraproject.org> - 1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild