From ac459c137798d7583ac629f96377f8c755491635 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sep 29 2014 04:56:45 +0000 Subject: Non-bootstrap build This reverts commit 91211f088c90dd09a111a8f5be16e2a8513be7a9. --- diff --git a/.gitignore b/.gitignore index 4629a72..5762fd8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ 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-io-2.1.1.jar diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 1d5699e..aee7f0f 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,8 +1,6 @@ -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^mvn\\(org\\.codehaus\\.plexus:plexus-io:2.1.1\\)$ - Name: plexus-archiver Version: 2.6.1 -Release: 0.1%{?dist} +Release: 1%{?dist} Epoch: 0 Summary: Plexus Archiver Component License: ASL 2.0 @@ -10,7 +8,6 @@ URL: http://plexus.codehaus.org/plexus-components/plexus-archiver/ BuildArch: noarch Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz -Source1: plexus-io-2.1.1.jar BuildRequires: maven-local BuildRequires: plexus-containers-container-default @@ -38,10 +35,6 @@ Javadoc for %{name}. %setup -q -n %{name}-%{name}-%{version} %mvn_file :%{name} plexus/archiver -dir=.m2/org/codehaus/plexus/plexus-io/2.1.1/ -mkdir -p $dir -cp %{SOURCE1} $dir/ - %build %mvn_build -f @@ -55,9 +48,6 @@ cp %{SOURCE1} $dir/ %doc LICENSE %changelog -* Mon Sep 29 2014 Mikolaj Izdebski - 0:2.6.1-0.1 -- Bootstrap build - * Mon Sep 29 2014 Mikolaj Izdebski - 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 eaab266..ae0e628 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ ba80e54387f88346de770735056ef182 plexus-archiver-2.6.1.tar.gz -c7e8032e291c2fe86e6e98876fedfb4e plexus-io-2.1.1.jar