[takari-archiver] Non-bootstrap build

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Mar 12 19:11:23 UTC 2015


commit 940be38bd93182670d21d2efcb03745f93879c09
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Mar 12 19:27:47 2015 +0100

    Non-bootstrap build

 takari-archiver.spec | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
---
diff --git a/takari-archiver.spec b/takari-archiver.spec
index 99c09d1..1e84207 100644
--- a/takari-archiver.spec
+++ b/takari-archiver.spec
@@ -1,5 +1,3 @@
-%bcond_without bootstrap
-
 Name:           takari-archiver
 Version:        0.1.8
 Release:        3%{?dist}
@@ -19,16 +17,12 @@ Source1:        create-tarball.sh
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.github.jnr:jnr-posix)
 BuildRequires:  mvn(com.google.guava:guava)
+BuildRequires:  mvn(io.takari:takari:pom:)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-compress)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 
-%if ! %{with bootstrap}
-BuildRequires:  mvn(io.takari:takari:pom:)
-%endif
-
-
 %description
 Takari Archiver is replacement for Maven Archiver for use with Takari
 Lifecycle Plugin.
@@ -43,17 +37,6 @@ This package provides %{summary}.
 %prep
 %setup -q
 
-%if %{with bootstrap}
-%pom_remove_parent
-%pom_xpath_set pom:project/pom:packaging jar
-%pom_xpath_inject pom:project '<groupId>io.takari</groupId>'
-%pom_add_plugin :maven-compiler-plugin '
-<configuration>
-<source>1.7</source>
-<target>1.7</target>
-</configuration>'
-%endif
-
 %build
 %mvn_build -f
 


More information about the scm-commits mailing list