From 95499b27a1468fe114bbac45241fa276fa04e9d7 Mon Sep 17 00:00:00 2001 From: jackie_wu123 Date: Thu, 5 Dec 2019 11:46:55 +0800 Subject: [PATCH] modify spec --- cdi-api.spec | 154 +++++++-------------------------------------------- 1 file changed, 19 insertions(+), 135 deletions(-) diff --git a/cdi-api.spec b/cdi-api.spec index ea03a51..7cfcb93 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,51 +1,41 @@ -%bcond_without asciidoc - -%global namedreltag .NOTHING -%global namedversion %{version}%{?namedreltag} - Name: cdi-api Version: 1.2 -Release: 9%{?dist} -Summary: CDI API +Release: 9 +Summary: API for CDI License: ASL 2.0 URL: http://seamframework.org/Weld BuildArch: noarch Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz -BuildRequires: maven-local -BuildRequires: mvn(javax.el:javax.el-api) -BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: maven-local asciidoc python3-pygments mvn(org.testng:testng::jdk15:) +BuildRequires: mvn(javax.el:javax.el-api) mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.surefire:surefire-testng) 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.weld:weld-parent:pom:) -BuildRequires: mvn(org.testng:testng::jdk15:) -%if %{with asciidoc} -BuildRequires: asciidoc -BuildRequires: /usr/bin/pygmentize -%endif %description -APIs for JSR-299: Contexts and Dependency Injection for Java EE +Contexts and Dependency Injection for Java EE which is called APIs for JSR-299. -%package javadoc -Summary: Javadoc for %{name} +%package help +Summary: Help document for cdi-api package +Provides: %{name}-javadoc = %{version}-%{release} +Obsoletes: %{name}-javadoc < %{version}-%{release} -%description javadoc -This package contains the API documentation for %{name}. +%description help +Help document for cdi-api package. %prep -%setup -q -n cdi-%{version} +%autosetup -n cdi-%{version} -p1 cd api -# J2EE API directory %mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1 -# Use newer version of interceptors API -%pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec" +%pom_change_dep "javax.interceptor:javax.interceptor-api" "org.\ +jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec" %build @@ -54,127 +44,21 @@ cd api %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 -%endif %install cd api %mvn_install %files -f api/.mfiles -%doc spec/src/main/doc/cdi-spec.%{adoc} -%license spec/src/main/doc/license-asl2.%{adoc} -%license spec/src/main/doc/license-jcp.%{adoc} +%doc spec/src/main/doc/cdi-spec.html +%license spec/src/main/doc/{license-asl2.html,license-jcp.html} -%files javadoc -f api/.mfiles-javadoc -%license spec/src/main/doc/license-asl2.%{adoc} -%license spec/src/main/doc/license-jcp.%{adoc} +%files help -f api/.mfiles-javadoc %changelog -* Thu Jul 12 2018 Fedora Release Engineering - 1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Apr 18 2018 Mikolaj Izdebski - 1.2-8 -- Remove javax.enterprise.inject directory and provides - -* Wed Feb 07 2018 Fedora Release Engineering - 1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Sep 23 2017 Mikolaj Izdebski - 1.2-6 -- Conditionally allow building without asciidoc - -* Wed Jul 26 2017 Fedora Release Engineering - 1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jun 16 2016 gil cattaneo 1.2-3 -- add missing build requires: pygmentize - -* Thu Jun 16 2016 gil cattaneo 1.2-2 -- add missing build requires - -* Mon Jun 06 2016 gil cattaneo 1.2-1 -- Upstream release 1.2 - -* Wed Feb 03 2016 Fedora Release Engineering - 1.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 28 2015 Mat Booth - 1.1-12 -- Fix FTBFS due to enforcer plugin failure - -* Wed Jun 17 2015 Fedora Release Engineering - 1.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 20 2015 gil cattaneo 1.1-10 -- rebuilt for upgrade el apis gid:aid (rhbz#1223468) -- adapt to current guideline -- use mvn()-like BRs -- fix rpmlint problem in changelog entries - -* Tue Mar 24 2015 Mikolaj Izdebski - 1.1-9 -- Fix interceptors symlink - -* Mon Mar 23 2015 Marek Goldmann - 1.1-8 -- Switch to interceptors 1.2 - -* Mon Nov 17 2014 Alexander Kurtakov 1.1-7 -- Rebuild to fix broken symlink to jboss-interceptors. - -* Sat Jun 07 2014 Fedora Release Engineering - 1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 1.1-5 -- Use Requires: java-headless rebuild (#1067528) - -* Tue Aug 13 2013 Stanislav Ochotnicky - 1.1-4 -- Add javax.enterprise.inject provides and directory - -* Sat Aug 03 2013 Fedora Release Engineering - 1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 23 2013 Mikolaj Izdebski - 1.1-2 -- Generate OSGi metadata -- Resolves: rhbz#987111 - -* Thu Jul 04 2013 Marek Goldmann - 1.1-1 -- Upstream release 1.1 -- New guidelines - -* Sat Mar 02 2013 Mat Booth - 1.0-9.SP4 -- Add missing BR, fixes FTBFS rhbz #913916 - -* Wed Feb 13 2013 Fedora Release Engineering - 1.0-8.SP4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.0-7.SP4 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Dec 04 2012 Marek Goldmann - 1.0-6.SP4 -- Added missing BR - -* Tue Dec 04 2012 Marek Goldmann - 1.0-5.SP4 -- Added missing BR/R -- Simplified the spec file -- Removed unnecessary patch - -* Wed Jul 18 2012 Fedora Release Engineering - 1.0-4.SP4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Mar 25 2012 Asaf Shakarchi 1.0-3.SP4 -- Fixed changelog versions. - -* Fri Mar 16 2012 Asaf Shakarchi 1.0-2.SP4 -- Added required dependencies, modified patches and cleaned spec. - -* Mon Feb 20 2012 Marek Goldmann 1.0-1.SP4 -- Initial packaging +* Tue Dec 3 2019 wutao - 1.2-9 +- Package init