[jenkins-mailer-plugin] Update to upstream version 1.11
Michal Srb
msrb at fedoraproject.org
Sat Sep 27 18:54:05 UTC 2014
commit 274b9b31f7796b94414d99e6e696049cbc9f7a19
Author: Michal Srb <msrb at redhat.com>
Date: Tue Sep 23 15:32:47 2014 +0200
Update to upstream version 1.11
- Install as Jenkins plugin
.gitignore | 1 +
jenkins-mailer-plugin.spec | 21 +++++++++++++++++----
sources | 2 +-
3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d8ef806..22a36fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/LICENSE.txt
/mailer-1.5.tar.gz
/mailer-1.8.tar.gz
+/mailer-1.11.tar.gz
diff --git a/jenkins-mailer-plugin.spec b/jenkins-mailer-plugin.spec
index 7bdecde..d07ee35 100644
--- a/jenkins-mailer-plugin.spec
+++ b/jenkins-mailer-plugin.spec
@@ -1,9 +1,10 @@
%global mod_name mailer-plugin
%global short_name mailer
+%global plugin_home %{_datadir}/jenkins/plugins/%{short_name}
Name: jenkins-mailer-plugin
-Version: 1.8
-Release: 2%{?dist}
+Version: 1.11
+Release: 1%{?dist}
Summary: Jenkins Mailer Plugin
# License is specified in pom.xml
@@ -17,6 +18,8 @@ BuildRequires: maven-local
BuildRequires: mvn(javax.mail:mail)
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
+BuildRequires: mvn(org.kohsuke:access-modifier-checker)
+BuildRequires: mvn(org.jenkins-ci.main:jenkins-core)
# test deps
#BuildRequires: mvn(junit:junit)
@@ -40,24 +43,34 @@ This package contains the API documentation for %{name}.
%setup -q -n %{mod_name}-%{short_name}-%{version}
cp %{SOURCE1} .
-
-# do not build HPI yet, JAR is enough for now
%mvn_package ::hpi: __noinstall
+%mvn_file ::jar:: %{name}/%{short_name} %{plugin_home}/WEB-INF/lib/%{short_name}
%build
# missing test dep org.jvnet.mock-javamail:mock-javamail
%mvn_build -f
%install
+# unpack hpi file into the correct location
+install -d -m 755 %{buildroot}/%{plugin_home}
+unzip -d %{buildroot}/%{plugin_home} target/%{short_name}.hpi
+rm %{buildroot}/%{plugin_home}/WEB-INF/lib/*
+
%mvn_install
+sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles
%files -f .mfiles
%dir %{_javadir}/%{name}
+%{plugin_home}
%doc LICENSE.txt
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Tue Sep 23 2014 Michal Srb <msrb at redhat.com> - 1.11-1
+- Update to upstream version 1.11
+- Install as Jenkins plugin
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 61221df..1decb7f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b28808853537299bae3b2025e2c38d89 LICENSE.txt
-025f7641a2a4b38deb63f81fe6a16c24 mailer-1.8.tar.gz
+a0f422ec46d7801c2baeaa48e28717c7 mailer-1.11.tar.gz
More information about the scm-commits
mailing list