up to 2.7.3 (2016/08/31)

[packages/jenkins.git] / jenkins.spec

diff --git a/jenkins.spec b/jenkins.spec
index 04cc5a08812e156589ae648db3d24d181012a99c..4fec276bfbd99d3154bfbd4a41caa3175fcf656b 100644 (file)
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -6,13 +6,15 @@
 %include       /usr/lib/rpm/macros.java
 Summary:       Jenkins Continuous Build Server
 Name:          jenkins
-Version:       1.510
+# Stay at LTS line
+Version:       2.7.3
 Release:       1
 License:       MIT License
 Group:         Networking/Daemons/Java/Servlets
-# Check for new releases and URLs here: http://mirrors.jenkins-ci.org/war/?C=N;O=D
-Source0:       http://mirrors.jenkins-ci.org/war/%{version}/%{name}.war?/%{name}-%{version}.war
-# Source0-md5: d5fb16f82854dd55d4790d6b1ba9bbbe
+# Check for new releases and URLs here:
+# Source0Download: http://mirrors.jenkins-ci.org/war-stable/?C=N;O=D
+Source0:       http://mirrors.jenkins-ci.org/war-stable/%{version}/%{name}.war?/%{name}-%{version}.war
+# Source0-md5: cb01d0c713f75d02d214aabb27c15681
 Source1:       context.xml
 Patch0:                webxml.patch
 URL:           http://www.jenkins-ci.org/
@@ -20,7 +22,7 @@ BuildRequires:        jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.546
 Requires:      jpackage-utils
-Requires:      jre-X11
+Requires:      jre-X11 >= 1.7
 Requires:      tomcat
 Suggests:      %{name}-plugin-maven
 Obsoletes:     hudson < 1.396
@@ -66,28 +68,12 @@ 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}}
-mv WEB-INF/web.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/web.xml
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
 ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml
 cp -a . $RPM_BUILD_ROOT%{_datadir}/%{name}
+mv $RPM_BUILD_ROOT{%{_datadir}/%{name}/WEB-INF,%{_sysconfdir}/%{name}}/web.xml
 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}
 
@@ -115,28 +101,35 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/WEB-INF/remoting.jar
 %{_datadir}/%{name}/WEB-INF/slave.jar
 
-%dir %{_datadir}/%{name}/WEB-INF/plugins
-%{_datadir}/%{name}/WEB-INF/plugins/ant.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/credentials.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/cvs.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/external-monitor-job.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/javadoc.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/ldap.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/mailer.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/pam-auth.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/ssh-credentials.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/ssh-slaves.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/subversion.hpi
-%{_datadir}/%{name}/WEB-INF/plugins/translation.hpi
+%dir %{_datadir}/%{name}/WEB-INF/detached-plugins
+%{_datadir}/%{name}/WEB-INF/detached-plugins/ant.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/antisamy-markup-formatter.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/credentials.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/cvs.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/external-monitor-job.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/javadoc.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/junit.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/ldap.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/mailer.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/matrix-auth.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/matrix-project.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/pam-auth.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/script-security.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/ssh-credentials.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/ssh-slaves.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/subversion.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/translation.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/windows-slaves.hpi
 
 %{_datadir}/%{name}/css
 %{_datadir}/%{name}/executable
 %{_datadir}/%{name}/help
 %{_datadir}/%{name}/images
+%{_datadir}/%{name}/jsbundles
 %{_datadir}/%{name}/scripts
 %{_datadir}/%{name}/*.txt
 %{_datadir}/%{name}/favicon.ico
 
 %files plugin-maven
 %defattr(644,root,root,755)
-%{_datadir}/%{name}/WEB-INF/plugins/maven-plugin.hpi
+%{_datadir}/%{name}/WEB-INF/detached-plugins/maven-plugin.hpi