msrb pushed to jenkins-script-security-plugin (f22). "rebuilt"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Mar 31 16:39:50 UTC 2015


>From 880d2b029933880a069647822c9911d4d8b32250 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Tue, 31 Mar 2015 18:07:27 +0200
Subject: rebuilt


diff --git a/jenkins-script-security-plugin.spec b/jenkins-script-security-plugin.spec
index b0e46fc..59e3b35 100644
--- a/jenkins-script-security-plugin.spec
+++ b/jenkins-script-security-plugin.spec
@@ -1,14 +1,16 @@
+%global mod_name jenkins-script-security-plugin
 %global short_name script-security
+%global plugin_home %{_datadir}/jenkins/webroot/WEB-INF/plugins/%{short_name}.jpi
 
 Name:           jenkins-script-security-plugin
 Version:        1.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Jenkins Script Security Plugin
 
 # from POM
 License:        MIT
 URL:            https://github.com/jenkinsci/script-security-plugin
-Source0:        https://github.com/jenkinsci/%{short_name}-plugin/archive/%{short_name}-%{version}.tar.gz
+Source0:        https://github.com/jenkinsci/%{mod_name}/archive/%{short_name}-%{version}.tar.gz
 Source1:        LICENSE
 
 BuildRequires:  maven-local
@@ -37,22 +39,35 @@ This package contains the API documentation for %{name}.
 find . -name "*.jar" -delete
 cp %{SOURCE1} .
 
-# we only need JAR file
 %mvn_package '::hpi::' __noinstall
 
+%mvn_file ::jar:: %{name}/%{short_name} %{plugin_home}/WEB-INF/lib/%{short_name}
+
 %build
 # missing org.jenkins-ci:test-annotations
 %mvn_build -f
 
 %install
+install -d -m 755 %{buildroot}/%{plugin_home}
+unzip -d %{buildroot}/%{plugin_home} target/%{short_name}.hpi
+pushd %{buildroot}/%{plugin_home}/WEB-INF/lib/
+  rm %{short_name}.jar
+  xmvn-subst -s .
+popd
+
 %mvn_install
 
 %files -f .mfiles
+%dir %{_javadir}/%{name}
+%{plugin_home}
 %license LICENSE
 %files javadoc -f .mfiles-javadoc
 %license LICENSE
 
 %changelog
+* Tue Mar 31 2015 Michal Srb <msrb at redhat.com> - 1.13-2
+- Install as a plugin
+
 * Mon Mar 30 2015 Michal Srb <msrb at redhat.com> - 1.13-1
 - Initial packaging
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jenkins-script-security-plugin.git/commit/?h=f22&id=880d2b029933880a069647822c9911d4d8b32250


More information about the scm-commits mailing list