commit df4c0a2ed42874ef5292a04c01562821be50ad65 Author: gil puntogil@libero.it Date: Sun Nov 30 23:04:17 2014 +0100

fix for rhbz#1169160

apache-commons-javaflow.spec | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) --- diff --git a/apache-commons-javaflow.spec b/apache-commons-javaflow.spec index bef1e26..9864def 100644 --- a/apache-commons-javaflow.spec +++ b/apache-commons-javaflow.spec @@ -4,7 +4,7 @@ %global namedversion %{version}%{?namedreltag} Name: apache-commons-javaflow Version: 1.0 -Release: 0.7.20120509SNAPSHOT%{?dist} +Release: 0.8.20120509SNAPSHOT%{?dist} Summary: Commons Javaflow License: ASL 2.0 Url: http://commons.apache.org/sandbox/javaflow/ @@ -12,8 +12,6 @@ Url: http://commons.apache.org/sandbox/javaflow/ # tar czf commons-javaflow-1.0-SNAPSHOT-src-svn.tar.gz commons-javaflow-1.0-SNAPSHOT Source0: %{short_name}-%{namedversion}-src-svn.tar.gz

-BuildRequires: java-devel - BuildRequires: mvn(asm:asm) BuildRequires: mvn(asm:asm-analysis) BuildRequires: mvn(asm:asm-commons) @@ -78,6 +76,8 @@ find . -name "*.jar" -delete #sed -i "s|commons-sandbox-parent|commons-parent|" pom.xml %pom_xpath_inject "pom:project" "<groupId>org.apache.commons</groupId>"

+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId = 'ant' ]" "<scope>provided</scope>" + %build

%mvn_file :%{short_name} %{name} @@ -101,6 +101,9 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name} %config(noreplace) %{_sysconfdir}/ant.d/%{short_name}

%changelog +* Sun Nov 30 2014 gil cattaneo puntogil@libero.it 1.0-0.8.20120509SNAPSHOT +- fix for rhbz#1169160 + * Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.0-0.7.20120509SNAPSHOT - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

@@ -122,4 +125,4 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name} - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

* Wed May 09 2012 gil cattaneo puntogil@libero.it 1.0-0.1.20120509SNAPSHOT -- initial rpm \ No newline at end of file +- initial rpm