From 97671f556e285716cd2f28c8c71ffe90a1db283b Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Feb 13 2017 13:02:04 +0000
Subject: Fix failure to build from source

Adopt license macro

---

diff --git a/cpptasks.spec b/cpptasks.spec
index fac2522..45e65a6 100644
--- a/cpptasks.spec
+++ b/cpptasks.spec
@@ -1,6 +1,6 @@
 Name:		cpptasks
 Version:	1.0b5
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	Compile and link task for ant
 
 License:	ASL 2.0
@@ -8,8 +8,10 @@ URL:		http://ant-contrib.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/ant-contrib/cpptasks-1.0b5.tar.gz
 Source1:	%{name}-README.fedora
 
-BuildRequires:	ant 
-BuildRequires:	maven-local
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(xerces:xercesImpl)
 
 BuildArch:	noarch
 
@@ -40,12 +42,15 @@ cp -p %{SOURCE1} ./README.fedora
 
 # Let xmvn generate javadocs
 %pom_remove_plugin :maven-javadoc-plugin
+%pom_remove_plugin :maven-source-plugin
+
+# No need to assemble distribution tarballs
+%pom_remove_plugin :maven-assembly-plugin
 
 # Fix dependency on ant
-%pom_remove_dep ant:ant
+%pom_change_dep ant:ant org.apache.ant:ant
 %pom_remove_dep ant:ant-nodeps
 %pom_remove_dep ant:ant-trax
-%pom_add_dep org.apache.ant:ant
 
 %mvn_file :%{name} ant/%{name}
 
@@ -60,13 +65,18 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/
 echo "ant/%{name}" > $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/%{name}
 
 %files -f .mfiles
-%doc LICENSE NOTICE README.fedora
+%license LICENSE NOTICE
+%doc README.fedora
 %{_sysconfdir}/ant.d/%{name}
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Mon Feb 13 2017 Mat Booth <mat.booth@redhat.com> - 1.0b5-18
+- Fix failure to build from source
+- Adopt license macro
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0b5-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild