[jenkins-commons-jelly] Migrate to tomcat-taglibs-standard

Michal Srb msrb at fedoraproject.org
Thu Mar 12 12:47:46 UTC 2015


commit 41513a56cdf0899d5230d9ad36d41cec26e5e7b0
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Mar 12 13:47:42 2015 +0100

    Migrate to tomcat-taglibs-standard

 jenkins-commons-jelly.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/jenkins-commons-jelly.spec b/jenkins-commons-jelly.spec
index a457944..1690fc2 100644
--- a/jenkins-commons-jelly.spec
+++ b/jenkins-commons-jelly.spec
@@ -2,7 +2,7 @@
 
 Name:           jenkins-commons-jelly
 Version:        1.1.20120928
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Open and customizable XML processing engine
 
 License:        ASL 2.0
@@ -76,11 +76,9 @@ This package contains the API documentation for %{name}.
 %pom_add_dep "commons-lang:commons-lang"
 
 # Use standard commons-jexl library
-%pom_xpath_replace "pom:dependency[pom:artifactId[text()='commons-jexl']]" \
-"<dependency>
-   <groupId>org.apache.commons</groupId>
-   <artifactId>commons-jexl</artifactId>
- </dependency>"
+%pom_change_dep :commons-jexl org.apache.commons:commons-jexl
+
+%pom_change_dep javax.servlet:jstl org.apache.taglibs:taglibs-standard-spec
 
 # Fix line endings
 sed -i 's/\r//' LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt \
@@ -118,6 +116,9 @@ done
 %doc LICENSE.txt short-license.txt
 
 %changelog
+* Thu Mar 12 2015 Michal Srb <msrb at redhat.com> - 1.1.20120928-7
+- Migrate to tomcat-taglibs-standard
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.20120928-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list