[plexus-archiver] Non-bootstrap build

Mikolaj Izdebski mizdebsk at fedoraproject.org
Fri Oct 24 06:38:36 UTC 2014


commit 65b1317dcfab4e83b14463b3a330cdbf4b881f55
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Oct 24 08:33:19 2014 +0200

    Non-bootstrap build
    
    This reverts commit 4f37f2cadfa181118e68dafb26136d5acbb4a145.

 .gitignore           |    1 -
 plexus-archiver.spec |   29 ++++-------------------------
 sources              |    1 -
 3 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0191087..c77d23c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,3 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz
 /plexus-archiver-2.7.tar.gz
 /plexus-archiver-2.7.1.tar.gz
 /plexus-archiver-2.8.tar.gz
-/plexus-io-2.3.tar.gz
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index c880ba0..9bb8435 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -1,9 +1,6 @@
-%global __requires_exclude_from .
-#global __provides_exclude_from .
-
 Name:           plexus-archiver
 Version:        2.8
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Plexus Archiver Component
 License:        ASL 2.0
@@ -11,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:        https://github.com/sonatype/plexus-io/archive/plexus-io-2.3.tar.gz
 
 BuildRequires:  maven-local
 BuildRequires:  plexus-containers-container-default
@@ -36,24 +32,7 @@ Javadoc for %{name}.
 
 
 %prep
-%setup -qcT
-tar xf %{SOURCE0}
-tar xf %{SOURCE1}
-cat <<EOF >pom.xml
-<project>
-<modelVersion>4.0.0</modelVersion>
-<groupId>plexus-archiver-boot</groupId>
-<artifactId>plexus-archiver-boot</artifactId>
-<version>1</version>
-<packaging>pom</packaging>
-<modules>
-<module>plexus-archiver-plexus-archiver-2.8</module>
-<module>plexus-io-plexus-io-2.3</module>
-</modules>
-</project>
-EOF
-%mvn_package :%{name}
-%mvn_package : __noinstall
+%setup -q -n %{name}-%{name}-%{version}
 %mvn_file :%{name} plexus/archiver
 
 %build
@@ -63,10 +42,10 @@ EOF
 %mvn_install
 
 %files -f .mfiles
-%doc plexus-archiver-plexus-archiver-2.8/LICENSE
+%doc LICENSE
 
 %files javadoc -f .mfiles-javadoc
-%doc plexus-archiver-plexus-archiver-2.8/LICENSE
+%doc LICENSE
 
 %changelog
 * Fri Oct 24 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:2.8-1
diff --git a/sources b/sources
index eb9f167..9e67621 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 e67ea63623716988a25cd383832f6b68  plexus-archiver-2.8.tar.gz
-49669b011096b5fc8a545a43131ecc22  plexus-io-2.3.tar.gz


More information about the scm-commits mailing list