msrb pushed to jenkins (f22). "Migrate to tomcat-taglibs-standard"

[notifications at fedoraproject.org]

>From 537e6e55a8f49dd6a288458d0b22f16f80fb79b9 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Mon, 9 Mar 2015 07:01:48 +0100
Subject: Migrate to tomcat-taglibs-standard


diff --git a/jenkins.spec b/jenkins.spec
index ed03253..93e0696 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -11,7 +11,7 @@
 
 Name:           jenkins
 Version:        1.598
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An extendable open source continuous integration server
 
 # The project's primary license is MIT
@@ -269,7 +269,7 @@ Requires:       spring-ldap
 Requires:       jnr-posix
 Requires:       bridge-method-injector
 Requires:       google-guice
-Requires:       jakarta-taglibs-standard
+Requires:       tomcat-taglibs-standard
 Requires:       apache-commons-cli
 Requires:       apache-commons-digester
 Requires:       jnr-ffi
@@ -615,7 +615,7 @@ pushd %{buildroot}/%{webroot}/WEB-INF/lib
     ln -sf `build-classpath jnr-x86asm` jnr-x86asm.jar
     ln -sf `build-classpath jenkins-json-lib` json-lib.jar
     ln -sf `build-classpath jsr-305` jsr305.jar
-    ln -sf `build-classpath jakarta-taglibs-core` jstl.jar
+    ln -sf `build-classpath tomcat-taglibs-standard/taglibs-standard-impl` jstl.jar
     ln -sf `build-classpath jtidy` jtidy.jar
     ln -sf `build-classpath junit` junit.jar
     ln -sf `build-classpath jzlib` jzlib.jar
@@ -752,6 +752,9 @@ exit 0
 %doc LICENSE.txt
 
 %changelog
+* Fri Mar 06 2015 Michal Srb <msrb at redhat.com> - 1.598-3
+- Migrate to tomcat-taglibs-standard
+
 * Thu Feb 26 2015 Michal Srb <msrb at redhat.com> - 1.598-2
 - Add missing BR: mvn(org.slf4j:slf4j-jdk14)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jenkins.git/commit/?h=f22&id=537e6e55a8f49dd6a288458d0b22f16f80fb79b9