[cpptasks] Use default compiler config and fix bad deps on ant.
mbooth
mbooth at fedoraproject.org
Mon Aug 12 09:16:23 UTC 2013
commit a027b6caca43274869e20c5171f253a3b1ab0782
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Mon Aug 12 10:15:58 2013 +0100
Use default compiler config and fix bad deps on ant.
cpptasks.spec | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/cpptasks.spec b/cpptasks.spec
index a313dd1..2fbf3f4 100644
--- a/cpptasks.spec
+++ b/cpptasks.spec
@@ -1,6 +1,6 @@
Name: cpptasks
Version: 1.0b5
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Compile and link task for ant
Group: Development/Libraries
@@ -38,7 +38,13 @@ sed -i 's/\r//' NOTICE
cp -p %{SOURCE1} ./README.fedora
+# Use default compiler configuration
+%pom_remove_plugin :maven-compiler-plugin
+
+# Fix dependency on ant
%pom_remove_dep 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}
@@ -61,6 +67,9 @@ echo "ant/%{name}" > $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/%{name}
%doc LICENSE NOTICE
%changelog
+* Mon Aug 12 2013 Mat Booth <fedora at matbooth.co.uk> - 1.0b5-12
+- Use default compiler config and fix bad deps on ant.
+
* Sun Aug 11 2013 Mat Booth <fedora at matbooth.co.uk> - 1.0b5-11
- Build with maven 3, update for newer guidelines
More information about the scm-commits
mailing list