From d0f2a354857f3a54fc30b84c181fdcec6c133444 Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Mar 03 2013 17:16:48 +0000
Subject: Fix FTBFS rhbz #914589.


- Drop pom patch (use macros instead.)
- Include licence file in javadoc package.

---

diff --git a/001-xmltool-fixbuild.patch b/001-xmltool-fixbuild.patch
deleted file mode 100644
index b6bae92..0000000
--- a/001-xmltool-fixbuild.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- A/pom.xml	2010-05-07 00:57:22.402693000 +0200
-+++ B/pom.xml	2010-05-08 11:52:57.050886935 +0200
-@@ -110,7 +110,7 @@
-     -->
- 
-     <prerequisites>
--        <maven>2.0.9</maven>
-+        <maven>2.0.8</maven>
-     </prerequisites>
- 
-     <build>
-@@ -243,31 +243,6 @@
-                     <locales>en</locales>
-                 </configuration>
-             </plugin>
--            <plugin>
--                <groupId>com.google.code.maven-license-plugin</groupId>
--                <artifactId>maven-license-plugin</artifactId>
--                <version>1.3.0</version>
--                <configuration>
--                    <header>${basedir}/src/main/etc/header.txt</header>
--                    <failIfMissing>true</failIfMissing>
--                    <properties>
--                        <owner>Mathieu Carbou</owner>
--                        <year>${project.inceptionYear}</year>
--                        <email>mathieu.carbou@gmail.com</email>
--                    </properties>
--                    <excludes>
--                        <exclude>LICENSE.txt</exclude>
--                        <exclude>src/test/resources/**</exclude>
--                    </excludes>
--                </configuration>
--                <executions>
--                    <execution>
--                        <goals>
--                            <goal>check</goal>
--                        </goals>
--                    </execution>
--                </executions>
--            </plugin>
-         </plugins>
-     </build>
- 
-@@ -366,21 +341,5 @@
-          LIBS
-     -->
- 
--    <dependencies>
--        <dependency>
--            <groupId>org.testng</groupId>
--            <artifactId>testng</artifactId>
--            <version>5.8</version>
--            <classifier>jdk15</classifier>
--            <scope>test</scope>
--            <exclusions>
--                <exclusion>
--                    <groupId>junit</groupId>
--                    <artifactId>junit</artifactId>
--                </exclusion>
--            </exclusions>
--        </dependency>
--    </dependencies>
--
- </project>
- 
diff --git a/xmltool.spec b/xmltool.spec
index 7acd1a2..d54de73 100644
--- a/xmltool.spec
+++ b/xmltool.spec
@@ -1,6 +1,6 @@
 Name:           xmltool
 Version:        3.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tool to manage XML documents through a Fluent Interface
 
 Group:          Development/Libraries
@@ -11,14 +11,13 @@ URL:            http://code.google.com/p/xmltool
 # svn export http://xmltool.googlecode.com/svn/tags/xmltool-3.3 xmltool
 # tar cfJ xmltool-3.3.tar.xz xmltool
 Source0:        %{name}-%{version}.tar.xz
-# remove dependency on maven-license-plugin and dependencies for tests
-Patch0:         001-xmltool-fixbuild.patch
 BuildArch:      noarch
 
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  maven-local
 BuildRequires:  maven-remote-resources-plugin
+BuildRequires:  maven-surefire-provider-testng
 BuildRequires:  apache-resource-bundles
 
 Requires:       java 
@@ -33,7 +32,6 @@ together, using the Fluent Interface pattern to facilitate XML manipulations.
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
 Requires:       jpackage-utils
 
 %description javadoc
@@ -41,14 +39,17 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 # Fix end-of-line encoding
 sed -i 's/\r//' LICENSE.txt
 
 
 %build
-# tests require surefire/testng, not currently available
+# Remove dep on maven-wagon and maven-license plugins
+%pom_xpath_remove "pom:build/pom:extensions"
+%pom_remove_plugin com.google.code.maven-license-plugin:maven-license-plugin
+
+# Disable tests because they require an internet connection to run!
 mvn-rpmbuild \
   -Dmaven.test.skip=true \
   install javadoc:javadoc
@@ -75,9 +76,15 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 
 %files javadoc
+%doc LICENSE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Sun Mar 03 2013 Mat Booth <fedora@matbooth.co.uk> - 3.3-8
+- Fix FTBFS rhbz #914589.
+- Drop pom patch (use macros instead.)
+- Include licence file in javadoc package.
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild