Expand conditionals
This commit is contained in:
parent
8525f342ef
commit
39d8fb7818
13
cdi-api.spec
13
cdi-api.spec
@ -1,4 +1,3 @@
|
|||||||
%bcond_without asciidoc
|
|
||||||
|
|
||||||
%global namedreltag .NOTHING
|
%global namedreltag .NOTHING
|
||||||
%global namedversion %{version}%{?namedreltag}
|
%global namedversion %{version}%{?namedreltag}
|
||||||
@ -23,10 +22,6 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
|||||||
BuildRequires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
|
BuildRequires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
|
||||||
BuildRequires: mvn(org.jboss.weld:weld-parent:pom:)
|
BuildRequires: mvn(org.jboss.weld:weld-parent:pom:)
|
||||||
BuildRequires: mvn(org.testng:testng::jdk15:)
|
BuildRequires: mvn(org.testng:testng::jdk15:)
|
||||||
%if %{with asciidoc}
|
|
||||||
BuildRequires: asciidoc
|
|
||||||
BuildRequires: /usr/bin/pygmentize
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
APIs for JSR-299: Contexts and Dependency Injection for Java EE
|
APIs for JSR-299: Contexts and Dependency Injection for Java EE
|
||||||
@ -54,15 +49,7 @@ cd api
|
|||||||
%mvn_build -- -Denforcer.skip
|
%mvn_build -- -Denforcer.skip
|
||||||
)
|
)
|
||||||
|
|
||||||
%if %{with asciidoc}
|
|
||||||
cd spec/src/main/doc
|
|
||||||
asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o cdi-spec.html cdi-spec.asciidoc
|
|
||||||
asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o license-asl2.html license-asl2.asciidoc
|
|
||||||
asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o license-jcp.html license-jcp.asciidoc
|
|
||||||
%global adoc html
|
|
||||||
%else
|
|
||||||
%global adoc asciidoc
|
%global adoc asciidoc
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
cd api
|
cd api
|
||||||
|
Loading…
Reference in New Issue
Block a user