[jenkins] Unbundle yui

Michal Srb msrb at fedoraproject.org
Thu Mar 27 13:01:10 UTC 2014


commit 82061d6c9ccbb6a3f26fb9bd5e6065e22e29346f
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Mar 27 14:01:09 2014 +0100

    Unbundle yui
    
    - Install proper sysconfig

 jenkins.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index 17ee6f1..7358d99 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
 
 Name:           jenkins
 Version:        1.549
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An extendable open source continuous integration server
 
 # The project's primary license is MIT
@@ -169,6 +169,7 @@ BuildRequires:  mvn(org.jenkins-ci.modules:sshd)
 #BuildRequires:  mvn(org.jenkins-ci.plugins:mailer)
 #BuildRequires:  mvn(org.jenkins-ci.plugins:ssh-credentials)
 #BuildRequires:  mvn(org.jenkins-ci.plugins:token-macro)
+BuildRequires:  js-yui2
 %endif
 
 
@@ -352,6 +353,7 @@ Requires:       apache-commons-collections
 Requires:       jenkins-crypto-util
 Requires:       glassfish-jaxb
 Requires:       geronimo-validation
+Requires:       js-yui2
 
 
 %description webapp
@@ -534,6 +536,12 @@ pushd %{buildroot}/%{homedir}/webapp/WEB-INF/lib
     ln -sf `build-classpath jenkins/jenkins-core` jenkins-core-%{version}.jar
 popd
 
+# unbundle yui2
+pushd %{buildroot}/%{homedir}/webapp/scripts/
+rm -Rf  yui/
+ln -s /usr/share/javascript/js-yui2/ yui
+popd
+
 # symlink the webapp to /var/lib/tomcats/jenkins
 # so we can run it via "systemctl start tomcat at jenkins"
 pushd %{buildroot}/%{jenkins_catalina_base}
@@ -545,7 +553,7 @@ pushd %{buildroot}/%{jenkins_catalina_base}
 popd
 
 install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
-cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/tomcat@%{name}
+cp -p %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/tomcat@%{name}
 %endif # bootstrap
 
 
@@ -572,6 +580,10 @@ cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/tomcat@%{name}
 %doc LICENSE.txt
 
 %changelog
+* Thu Mar 27 2014 Michal Srb <msrb at redhat.com> - 1.549-6
+- Unbundle yui
+- Install proper sysconfig
+
 * Thu Mar 27 2014 Michal Srb <msrb at redhat.com> - 1.549-5
 - BR jenkins-core when building webapp
 


More information about the scm-commits mailing list