Conditionally allow building without asciidoc
This commit is contained in:
parent
d86fb56371
commit
83bc70028f
33
cdi-api.spec
33
cdi-api.spec
@ -1,16 +1,18 @@
|
|||||||
|
%bcond_without asciidoc
|
||||||
|
|
||||||
%global namedreltag .NOTHING
|
%global namedreltag .NOTHING
|
||||||
%global namedversion %{version}%{?namedreltag}
|
%global namedversion %{version}%{?namedreltag}
|
||||||
|
|
||||||
Name: cdi-api
|
Name: cdi-api
|
||||||
Version: 1.2
|
Version: 1.2
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: CDI API
|
Summary: CDI API
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://seamframework.org/Weld
|
URL: http://seamframework.org/Weld
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
|
Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
|
||||||
|
|
||||||
BuildArch: noarch
|
|
||||||
BuildRequires: asciidoc
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: mvn(javax.el:javax.el-api)
|
BuildRequires: mvn(javax.el:javax.el-api)
|
||||||
BuildRequires: mvn(javax.inject:javax.inject)
|
BuildRequires: mvn(javax.inject:javax.inject)
|
||||||
@ -21,7 +23,10 @@ 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
|
BuildRequires: /usr/bin/pygmentize
|
||||||
|
%endif
|
||||||
|
|
||||||
Provides: javax.enterprise.inject
|
Provides: javax.enterprise.inject
|
||||||
|
|
||||||
@ -51,10 +56,15 @@ cd api
|
|||||||
%mvn_build -- -Denforcer.skip
|
%mvn_build -- -Denforcer.skip
|
||||||
)
|
)
|
||||||
|
|
||||||
|
%if %{with asciidoc}
|
||||||
cd spec/src/main/doc
|
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 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-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
|
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
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
cd api
|
cd api
|
||||||
@ -65,13 +75,18 @@ build-jar-repository %{buildroot}%{_javadir}/javax.enterprise.inject/ \
|
|||||||
|
|
||||||
%files -f api/.mfiles
|
%files -f api/.mfiles
|
||||||
%{_javadir}/javax.enterprise.inject/
|
%{_javadir}/javax.enterprise.inject/
|
||||||
%doc cdi-spec.html
|
%doc spec/src/main/doc/cdi-spec.%{adoc}
|
||||||
%license license-asl2.html license-jcp.html
|
%license spec/src/main/doc/license-asl2.%{adoc}
|
||||||
|
%license spec/src/main/doc/license-jcp.%{adoc}
|
||||||
|
|
||||||
%files javadoc -f api/.mfiles-javadoc
|
%files javadoc -f api/.mfiles-javadoc
|
||||||
%license license-asl2.html license-jcp.html
|
%license spec/src/main/doc/license-asl2.%{adoc}
|
||||||
|
%license spec/src/main/doc/license-jcp.%{adoc}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Sep 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
|
||||||
|
- Conditionally allow building without asciidoc
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user