msrb pushed to jenkins (f22). "Spec clean up, add R: jenkins-script-security-plugin (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat May 9 00:40:29 UTC 2015
From fbea81a7b9821541ccf740b75e9500c1c8d3a587 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Sat, 9 May 2015 01:00:23 +0200
Subject: Spec clean up, add R: jenkins-script-security-plugin
Conflicts:
jenkins.spec
diff --git a/jenkins.spec b/jenkins.spec
index e1e9a82..2ea96c9 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -1,17 +1,13 @@
-# TODO:
-# spec file needs cleanup
-
%global bootstrap 0
%global homedir %{_datadir}/%{name}
%global webroot %{homedir}/webroot
%global corepluginsdir %{webroot}/WEB-INF/plugins
%global workdir %{_sharedstatedir}/%{name}
-%global juid 175
Name: jenkins
Version: 1.609
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -34,7 +30,6 @@ Source8: dependencies.txt
# animal sniffer is not really useful in Fedora
Patch1: remove-animal-sniffer-annotations.patch
-#Patch2: remove-support-for-solaris.patch
# we don't need support for Solaris in SU
Patch3: remove-solaris-support-in-su.patch
# jna-posix library is not in Fedora, we use jnr-posix
@@ -210,7 +205,7 @@ This package contains Jenkins CLI.
%if !%{bootstrap}
%package webapp
Summary: Jenkins Web Application
-# we install exploded WAR with symlinks to system JARs
+# we install exploded WAR with symlinks to system JARs, thus we need all these deps
Requires: %{name} = %{version}-%{release}
Requires: %{name}-core = %{version}-%{release}
Requires: %{name}-cli = %{version}-%{release}
@@ -256,27 +251,18 @@ Requires: jBCrypt
Requires: jcifs
Requires: jcip-annotations
Requires: jcommon
-Requires: jenkins-ant-plugin
Requires: jenkins-commons-jelly
-Requires: jenkins-credentials-plugin
Requires: jenkins-crypto-util
Requires: jenkins-executable-war-webroot
-Requires: jenkins-external-monitor-job-plugin
Requires: jenkins-extras-memory-monitor
Requires: jenkins-icon-shim
Requires: jenkins-instance-identity
-Requires: jenkins-javadoc-plugin
Requires: jenkins-jexl
Requires: jenkins-json-lib
-Requires: jenkins-junit-plugin
-Requires: jenkins-mailer-plugin
-Requires: jenkins-matrix-project-plugin
Requires: jenkins-remoting
Requires: jenkins-remoting-webapp
Requires: jenkins-ssh-cli-auth
-Requires: jenkins-ssh-credentials-plugin
Requires: jenkins-sshd
-Requires: jenkins-ssh-slaves-plugin
Requires: jenkins-task-reactor
Requires: jenkins-version-number
Requires: jenkins-winstone
@@ -330,9 +316,23 @@ Requires: trilead-ssh2
Requires: txw2
Requires: woodstox-core
Requires: xpp3
+# core plugins
+Requires: jenkins-ant-plugin
+Requires: jenkins-credentials-plugin
+Requires: jenkins-external-monitor-job-plugin
+Requires: jenkins-javadoc-plugin
+Requires: jenkins-junit-plugin
+#Requires: jenkins-ldap-plugin
+Requires: jenkins-mailer-plugin
+#Requires: jenkins-matrix-auth-plugin
+Requires: jenkins-matrix-project-plugin
+Requires: jenkins-pam-auth-plugin
+Requires: jenkins-script-security-plugin
+Requires: jenkins-ssh-credentials-plugin
+Requires: jenkins-ssh-slaves-plugin
%description webapp
-This package contains Jenkins Web Application.
+This package contains Jenkins web application.
%endif # bootstrap
%package javadoc
@@ -355,6 +355,9 @@ This package contains API documentation for %{name}.
%patch14 -p1
%patch15 -p1
+cp %{SOURCE1} LICENSE-ASL-2.0.txt
+cp %{SOURCE2} LICENSE-CDDL.txt
+
# Remove bundled JARs and classes
find . -name "*.jar" -delete
find . -name "*.class" -delete
@@ -371,14 +374,12 @@ rm core/src/main/java/hudson/util/jna/SHELLEXECUTEINFO.java
rm core/src/main/java/hudson/util/jna/Shell32.java
rm core/src/main/java/hudson/util/jna/WINBASE.java
+# TODO: prepare shaded asm5 and use it here
sed -i 's|org.kohsuke.asm5|org.objectweb.asm|g' core/src/main/java/hudson/util/SubClassGenerator.java
# Don't add classpath entry to the manifest
%pom_xpath_remove pom:manifest/pom:addClasspath core
-cp %{SOURCE1} LICENSE-ASL-2.0.txt
-cp %{SOURCE2} LICENSE-CDDL.txt
-
# packaging layout
%mvn_package :jenkins-core core
%mvn_package :plugin plugins-pom
@@ -400,14 +401,14 @@ cp %{SOURCE2} LICENSE-CDDL.txt
# Requires cannot be generated on jenkins-war (when building in bootstrap mode)
%pom_remove_dep org.jenkins-ci.main:jenkins-war plugins
-# parent pom has not been packaged yet (licensing issues)
+# parent pom has not been packaged yet (unknown license)
%pom_remove_parent
%pom_remove_parent plugins
# a lot of missing deps for tests
%pom_disable_module test
-%pom_add_dep net.jcip:jcip-annotations core
+#%%pom_add_dep net.jcip:jcip-annotations core
# remove unneeded/unavailable stuff
%pom_xpath_remove "pom:extensions[pom:extension[pom:artifactId[text()='wagon-gitsite']]]"
@@ -454,7 +455,7 @@ cp %{SOURCE2} LICENSE-CDDL.txt
%pom_remove_plugin :maven-dependency-plugin war
#%%pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-dependency-plugin']]/pom:executions" war
%pom_remove_dep :cli war
-%pom_add_dep org.bouncycastle:bcprov-jdk16 war
+%pom_add_dep org.bouncycastle:bcprov-jdk15on war
%pom_add_dep org.bouncycastle:bcpkix-jdk15on war
%pom_add_dep org.apache.sshd:sshd-core war
@@ -482,13 +483,10 @@ cp %{SOURCE2} LICENSE-CDDL.txt
%install
%mvn_install
-
# wrapper script for CLI
%jpackage_script hudson.cli.CLI "" "" trilead-ssh2:commons-codec:jenkins-remoting/remoting:localizer/localizer:jenkins/cli %{name}-cli true
-
%if !%{bootstrap}
-
install -d -m 755 %{buildroot}/%{homedir}
install -d -m 755 %{buildroot}/%{webroot}
install -d -m 755 %{buildroot}/%{homedir}/plugins
@@ -658,14 +656,10 @@ cp -p %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%pre
# Add jenkins user and group
-getent group %{name} >/dev/null || groupadd -f -g %{juid} -r %{name}
-if ! getent passwd %{name} >/dev/null ; then
- if ! getent passwd %{juid} >/dev/null ; then
- useradd -r -u %{juid} -g %{name} -d %{workdir} -s /sbin/nologin -c "Jenkins Continuous Build server" %{name}
- else
- useradd -r -g %{name} -d %{workdir} -s /sbin/nologin -c "Jenkins Continuous Build server" %{name}
- fi
-fi
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+ useradd -r -g %{name} -d %{workdir} -s /sbin/nologin \
+ -c "Jenkins Continuous Build server" %{name}
exit 0
%post
@@ -709,7 +703,10 @@ exit 0
%doc LICENSE.txt
%changelog
-* Thu May 07 2015 Michal Srb <msrb at redhat.com> - 1.606-3
+* Fri May 08 2015 Michal Srb <msrb at redhat.com> - 1.609-4
+- Spec clean up, add R: jenkins-script-security-plugin, jenkins-pam-auth-plugin
+
+* Thu May 07 2015 Michal Srb <msrb at redhat.com> - 1.609-3
- Clean up dangling symlinks in JENKINS_HOME
* Wed May 06 2015 Michal Srb <msrb at redhat.com> - 1.609-2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/jenkins.git/commit/?h=f22&id=fbea81a7b9821541ccf740b75e9500c1c8d3a587
More information about the scm-commits
mailing list