msrb pushed to jenkins (f22). "Switch to unpacked executable-war"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Mar 26 11:31:10 UTC 2015


>From 2939fc1fc5b40f8230a598c4f8f6ab8eb4072a8b Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Thu, 12 Mar 2015 10:02:47 +0100
Subject: Switch to unpacked executable-war


diff --git a/jenkins.spec b/jenkins.spec
index e90788f..03739e2 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -11,7 +11,7 @@
 
 Name:           jenkins
 Version:        1.598
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An extendable open source continuous integration server
 
 # The project's primary license is MIT
@@ -261,7 +261,7 @@ Requires:       jenkins-ant-plugin
 Requires:       jenkins-commons-jelly
 Requires:       jenkins-credentials-plugin
 Requires:       jenkins-crypto-util
-Requires:       jenkins-executable-war
+Requires:       jenkins-executable-war-webroot
 Requires:       jenkins-external-monitor-job-plugin
 Requires:       jenkins-extras-memory-monitor
 Requires:       jenkins-icon-shim
@@ -633,7 +633,6 @@ pushd %{buildroot}/%{webroot}/WEB-INF/lib
     ln -sf `build-classpath objectweb-asm/asm-util` asm-util.jar
     ln -sf `build-classpath jenkins/cli` cli-%{version}.jar
     ln -sf `build-classpath jenkins-winstone/winstone` ../../winstone.jar
-    ln -sf `build-classpath jenkins-executable-war/executable-war` ../../executable-war.jar
     # spring
     ln -sf `build-classpath springframework/spring-aop` spring-aop.jar
     ln -sf `build-classpath springframework/spring-beans` spring-beans.jar
@@ -712,6 +711,9 @@ exit 0
 %doc LICENSE.txt
 
 %changelog
+* Thu Mar 12 2015 Michal Srb <msrb at redhat.com> - 1.598-6
+- Switch to unpacked executable-war
+
 * Wed Mar 11 2015 Michal Srb <msrb at redhat.com> - 1.598-5
 - Sanitize R
 
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list