Author: glen Date: Sat Feb 19 10:39:07 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- hudson renamed to jenkins. worked for me
---- Files affected:
packages/jenkins:
context.xml (1.2 -> 1.3) , jenkins.spec (1.35 -> 1.36) , webxml.patch (1.1
-> 1.2)
---- Diffs:
================================================================
Index: packages/jenkins/context.xml
diff -u packages/jenkins/context.xml:1.2 packages/jenkins/context.xml:1.3
--- packages/jenkins/context.xml:1.2 Mon Feb 2 00:26:40 2009
+++ packages/jenkins/context.xml Sat Feb 19 11:39:02 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-<Context path="/hudson" docBase="/usr/share/hudson"
+<Context path="/jenkins" docBase="/usr/share/jenkins"
privileged="false" allowLinking="true">
</Context>
================================================================
Index: packages/jenkins/jenkins.spec
diff -u packages/jenkins/jenkins.spec:1.35 packages/jenkins/jenkins.spec:1.36
--- packages/jenkins/jenkins.spec:1.35 Sat Feb 19 10:07:02 2011
+++ packages/jenkins/jenkins.spec Sat Feb 19 11:39:02 2011
@@ -1,25 +1,25 @@
# $Revision$, $Date$
# TODO
-# - consider renaming to jenkins
http://en.wikipedia.org/wiki/Jenkins_(software)
# - build it from sources
#
https://hudson.dev.java.net/files/documents/2402/125619/hudson-1.280-src.zip
# - use system jars
%include /usr/lib/rpm/macros.java
Summary: Hudson Continuous Build Server
-Name: hudson
-Version: 1.384
+Name: jenkins
+Version: 1.397
Release: 1
License: MIT License
Group: Networking/Daemons/Java/Servlets
-# Check for new releases and URLs here:
https://hudson.dev.java.net/servlets/ProjectRSS?type=news
-Source0:
http://hudson-ci.org/download/war/%{version}/%{name}.war#/%{name}-%{version}.war
-# Source0-md5: 65d1108eac802c284fdf4633bee3ef92
-Source1: %{name}-context.xml
-Patch0: %{name}-webxml.patch
-URL: https://hudson.dev.java.net/
+# Check for new releases and URLs here: http://mirrors.jenkins-ci.org/war/
+Source0:
http://mirrors.jenkins-ci.org/war/%{version}/%{name}.war#/%{name}-%{version}.war
+# Source0-md5: 72fb60153948f92c34c33d0166edd35c
+Source1: context.xml
+Patch0: webxml.patch
+URL: http://www.jenkins-ci.org/
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.546
+Obsoletes: hudson < 1.396
Requires: jpackage-utils
Requires: jre-X11
Requires: tomcat
@@ -27,12 +27,12 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Hudson monitors executions of repeated jobs, such as building a
+Jenkins monitors executions of repeated jobs, such as building a
software project or jobs run by cron.
-Among those things, current Hudson focuses on the following two jobs:
+Among those things, current Jenkins focuses on the following two jobs:
- Building/testing software projects continuously, just like
- CruiseControl or DamageControl. In a nutshell, Hudson provides an
+ CruiseControl or DamageControl. In a nutshell, Jenkins provides an
easy-to-use so-called continuous integration system, making it easier
for developers to integrate changes to the project, and making it
easier for users to obtain a fresh build. The automated, continoues
@@ -41,16 +41,17 @@
procmail jobs, even those that are run on a remote machine. For
example, with cron, all you receive is regular e-mails that capture
the output, and it is up to you to look at them diligently and notice
- when it broke. Hudson keeps those outputs and makes it easy for you to
+ when it broke. Jenkins keeps those outputs and makes it easy for you to
notice when something is wrong.
%prep
%setup -qc
rm *.class
rm winstone.jar
-
%patch0 -p1
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir}/%{name},%{_sharedstatedir}/%{name},%{_tomcatconfdir}}
@@ -60,6 +61,22 @@
cp -a . $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -sf %{_sysconfdir}/%{name}/web.xml
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/web.xml
+%post
+# If we have an old hudson install, rename it to jenkins
+if test -d /var/lib/hudson; then
+ echo >&2 "Moving /var/lib/hudson -> /var/lib/jenkins"
+ # leave a marker to indicate this came from Hudson.
+ # could be useful down the road
+ # This also ensures that the .??* wildcard matches something
+ touch /var/lib/hudson/.moving-hudson
+ mv -f /var/lib/hudson/* /var/lib/hudson/.??* /var/lib/jenkins
+ rmdir /var/lib/hudson
+fi
+if test -d /var/run/hudson; then
+ mv -f /var/run/hudson/* /var/run/jenkins
+ rmdir /var/run/hudson
+fi
+
%postun
%tomcat_clear_cache %{name}
@@ -80,6 +97,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2011/02/19 10:39:02 glen
+- hudson renamed to jenkins. worked for me
+
Revision 1.35 2011/02/19 09:07:02 glen
- oss project renamed to jenkins on January 11, 2011
================================================================
Index: packages/jenkins/webxml.patch
diff -u packages/jenkins/webxml.patch:1.1 packages/jenkins/webxml.patch:1.2
--- packages/jenkins/webxml.patch:1.1 Tue Sep 7 16:46:23 2010
+++ packages/jenkins/webxml.patch Sat Feb 19 11:39:02 2011
@@ -5,7 +5,7 @@
<env-entry-name>HUDSON_HOME</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value></env-entry-value>
-+ <env-entry-value>/var/lib/hudson</env-entry-value>
++ <env-entry-value>/var/lib/jenkins</env-entry-value>
</env-entry>
<!-- configure additional extension-content-type mappings -->
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jenkins/context.xml?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jenkins/jenkins.spec?r1=1.35&r2=1.36&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jenkins/webxml.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
