From 375d95b2ac222aa7a7ea9dbdcddd9a2be2b9dc26 Mon Sep 17 00:00:00 2001 From: gil Date: Jun 28 2013 15:41:32 +0000 Subject: used pom_xpath_set macro --- diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec index 313f7bc..fdffcbd 100644 --- a/apache-commons-vfs.spec +++ b/apache-commons-vfs.spec @@ -2,7 +2,7 @@ %global short_name commons-%{base_name} Name: apache-commons-vfs Version: 2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Commons Virtual File System License: ASL 2.0 Url: http://commons.apache.org/%{base_name}/ @@ -81,13 +81,11 @@ perl -pi -e 's/\r$//g;' *.txt %pom_xpath_inject "pom:project/pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration" " *.webdav.*" # Fix ant gId -%pom_xpath_remove "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" -%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']" " -org.apache.ant" +%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" " +org.apache.ant" -%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" core -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']" " -org.apache.ant" core +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='ant']/pom:groupId" " +org.apache.ant" core # Remove unwanted dependency %pom_remove_dep :jackrabbit-webdav core @@ -168,6 +166,9 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name} %config %{_sysconfdir}/ant.d/%{short_name} %changelog +* Fri Jun 28 2013 gil cattaneo 2.0-10 +- used pom_xpath_set macro + * Fri Jun 28 2013 gil cattaneo 2.0-9 - swith to pom macros - packaged in /usr/share/java instead of /usr/share/java/apache-commons-vfs