[jenkins-icon-shim] Install unpacked (Resolves: rhbz#1147821)
by Michal Srb
commit 1032a0b233e2a7b2559e244a5474a8aa43c38ef8
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Oct 1 14:56:49 2014 +0200
Install unpacked (Resolves: rhbz#1147821)
jenkins-icon-shim.spec | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/jenkins-icon-shim.spec b/jenkins-icon-shim.spec
index afc8bce..27cd215 100644
--- a/jenkins-icon-shim.spec
+++ b/jenkins-icon-shim.spec
@@ -1,14 +1,16 @@
-%global shortname icon-shim
+%global mod_name icon-shim-plugin
+%global short_name icon-shim
+%global plugin_home %{_datadir}/jenkins/plugins/%{short_name}
Name: jenkins-icon-shim
Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Jenkins Icon Shim Plugin
# specified in POM file
License: MIT
URL: https://github.com/jenkinsci/icon-shim-plugin
-Source0: https://github.com/jenkinsci/%{shortname}-plugin/archive/%{shortname}-pom...
+Source0: https://github.com/jenkinsci/%{short_name}-plugin/archive/%{short_name}-p...
# taken from http://opensource.org/licenses/MIT
Source1: LICENSE
@@ -33,11 +35,13 @@ This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{shortname}-plugin-%{shortname}-pom-%{version}
+%setup -q -n %{mod_name}-%{short_name}-pom-%{version}
cp %{SOURCE1} .
%pom_remove_plugin :findbugs-maven-plugin plugin
+%mvn_package ::hpi: __noinstall
+%mvn_file :{*}:jar:: %{name}/@1 %{plugin_home}/WEB-INF/lib/@1
%build
# "package org.jvnet.hudson.test does not exist" - we don't have
@@ -45,15 +49,26 @@ cp %{SOURCE1} .
%mvn_build -f
%install
+
+install -d -m 755 %{buildroot}/%{plugin_home}
+unzip -d %{buildroot}/%{plugin_home} plugin/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}
+%dir %{_mavenpomdir}/%{name}
+%{plugin_home}
%doc LICENSE
%files javadoc -f .mfiles-javadoc
%doc LICENSE
%changelog
+* Wed Oct 01 2014 Michal Srb <msrb(a)redhat.com> - 1.0.3-2
+- Install unpacked (Resolves: rhbz#1147821)
+
* Mon Sep 08 2014 Michal Srb <msrb(a)redhat.com> - 1.0.3-1
- Initial packaging
9 years, 7 months
[plexus-archiver] Update to upstream version 2.6.2
by Mikolaj Izdebski
commit 519a08506f0a271c9ac4da5ffb1f0c8cec9b2f5f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Oct 1 12:52:51 2014 +0200
Update to upstream version 2.6.2
.gitignore | 1 +
plexus-archiver.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5762fd8..5693eba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz
/plexus-archiver-2.4.2.tar.gz
/plexus-archiver-2.4.4.tar.gz
/plexus-archiver-2.6.1.tar.gz
+/plexus-archiver-2.6.2.tar.gz
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index aee7f0f..db6cca2 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -1,5 +1,5 @@
Name: plexus-archiver
-Version: 2.6.1
+Version: 2.6.2
Release: 1%{?dist}
Epoch: 0
Summary: Plexus Archiver Component
@@ -48,6 +48,9 @@ Javadoc for %{name}.
%doc LICENSE
%changelog
+* Wed Oct 1 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.6.2-1
+- Update to upstream version 2.6.2
+
* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.6.1-1
- Update to upstream version 2.6.1
- Remove patch for PLXCOMP-64 and PLXCOMP-113
diff --git a/sources b/sources
index ae0e628..a27d535 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba80e54387f88346de770735056ef182 plexus-archiver-2.6.1.tar.gz
+7541c278b08e8ab6cc43e6ed0bec2fb1 plexus-archiver-2.6.2.tar.gz
9 years, 7 months
[plexus-io] Update to upstream version 2.1.2
by Mikolaj Izdebski
commit 295a431d871577401674bcf621c050ac8e6653e6
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Oct 1 12:50:12 2014 +0200
Update to upstream version 2.1.2
.gitignore | 1 +
...t-try-to-set-attributes-of-symbolic-links.patch | 30 --------------------
plexus-io.spec | 13 ++++----
sources | 2 +-
4 files changed, 8 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9a920d..852eb11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ sonatype-plexus-io-plexus-io-2.0.4-0-g2767dfe.tar.gz
/plexus-io-2.0.10.tar.gz
/plexus-io-2.0.12.tar.gz
/plexus-io-2.1.1.tar.gz
+/plexus-io-2.1.2.tar.gz
diff --git a/plexus-io.spec b/plexus-io.spec
index 51c483b..fd6b396 100644
--- a/plexus-io.spec
+++ b/plexus-io.spec
@@ -1,6 +1,6 @@
Name: plexus-io
-Version: 2.1.1
-Release: 2%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
Summary: Plexus IO Components
License: ASL 2.0
URL: http://plexus.codehaus.org/plexus-components/plexus-io
@@ -9,10 +9,6 @@ BuildArch: noarch
Source0: https://github.com/sonatype/plexus-io/archive/plexus-io-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-# Accepted upstream: http://jira.codehaus.org/browse/PLXCOMP-244
-# https://github.com/sonatype/plexus-io/pull/6
-Patch0: 0001-Don-t-try-to-set-attributes-of-symbolic-links.patch
-
BuildRequires: plexus-utils
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-components-pom
@@ -34,7 +30,6 @@ API documentation for %{name}.
%prep
%setup -q -n plexus-io-plexus-io-%{version}
cp %{SOURCE1} .
-%patch0 -p1
%build
export XMVN_COMPILER_SOURCE="1.5"
@@ -52,6 +47,10 @@ export XMVN_COMPILER_SOURCE="1.5"
%changelog
+* Wed Oct 1 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.1.2-1
+- Update to upstream version 2.1.2
+- Remove patch for PLXCOMP-244 (accepted upstream)
+
* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.1.1-2
- Don't try to set attributes of symbolic links
diff --git a/sources b/sources
index a93f6d6..ea283be 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-82809e074660238fbf2b1d744df5fcd3 plexus-io-2.1.1.tar.gz
+25374a5f85267d9635b8fb22831a6e87 plexus-io-2.1.2.tar.gz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
9 years, 7 months