diff --git a/1.2.tar.gz b/1.2.tar.gz
deleted file mode 100644
index 250f811..0000000
--- a/1.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:506d82e40f287678763cc20dc31b9548e8d687af08e589a78de24a269bb4b4c1
-size 134934
diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
new file mode 100644
index 0000000..81fbaf6
--- /dev/null
+++ b/LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/cdi-api-1.2.tar.xz b/cdi-api-1.2.tar.xz
new file mode 100644
index 0000000..f15e520
--- /dev/null
+++ b/cdi-api-1.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2a400ceeade6f10cfcd857b638b8466821a9e86ba4ee1fd6885b586b22afda3
+size 46600
diff --git a/cdi-api-build.xml b/cdi-api-build.xml
index 34b469c..cae7fdf 100644
--- a/cdi-api-build.xml
+++ b/cdi-api-build.xml
@@ -43,14 +43,14 @@
-
+
-
+
diff --git a/cdi-api.changes b/cdi-api.changes
index 0c951ed..9efed0f 100644
--- a/cdi-api.changes
+++ b/cdi-api.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 3 10:59:32 UTC 2019 - Fridrich Strba
+
+- Generate the tarball and pack only the api part, to avoid
+ distributing non-distribuable content
+
-------------------------------------------------------------------
Wed Mar 27 09:31:47 UTC 2019 - Jan Engelhardt
diff --git a/cdi-api.spec b/cdi-api.spec
index 5ed5708..ef88a1e 100644
--- a/cdi-api.spec
+++ b/cdi-api.spec
@@ -16,10 +16,7 @@
#
-%global namedreltag .NOTHING
-%global namedversion %{version}%{?namedreltag}
%bcond_with tests
-%bcond_without asciidoc
Name: cdi-api
Version: 1.2
Release: 0
@@ -27,8 +24,11 @@ Summary: Contexts and Dependency Injection for Java EE
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://seamframework.org/Weld
-Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
+# sh create-tarball.sh %%{version}
+Source0: %{name}-%{version}.tar.xz
Source1: %{name}-build.xml
+Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
+Source3: create-tarball.sh
BuildRequires: ant
BuildRequires: atinject
BuildRequires: fdupes
@@ -39,77 +39,57 @@ Requires: mvn(javax.el:javax.el-api)
Requires: mvn(javax.inject:javax.inject)
Requires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
BuildArch: noarch
-%if %{with asciidoc}
-BuildRequires: asciidoc
-BuildRequires: python3-Pygments
-%endif
%description
APIs for JSR-299: Contexts and Dependency Injection for Java EE
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Libraries/Java
+Group: Documentation/HTML
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n cdi-%{version}
-cp %{SOURCE1} api/build.xml
+%setup -q
+cp %{SOURCE1} build.xml
+cp %{SOURCE2} LICENSE
# 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" api
+%pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec"
-%pom_remove_parent api
+%pom_remove_parent
%build
mkdir -p lib
build-jar-repository -s lib glassfish-el-api jboss-interceptors-1.2-api javax.inject
-pushd api
- %{ant} \
- %if %{without tests}
- -Dtest.skip=true \
- %endif
- jar javadoc
-popd
-
-%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
+%{ant} \
+%if %{without tests}
+ -Dtest.skip=true \
%endif
+ jar javadoc
%install
-pushd api
- # jar
- install -dm 0755 %{buildroot}%{_javadir}/%{name}
- install -dm 0755 %{buildroot}%{_javadir}/javax.enterprise.inject
- install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
- ln -sf ../%{name}/%{name}.jar %{buildroot}%{_javadir}/javax.enterprise.inject/%{name}.jar
- # pom
- install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
- install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
- %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
- # javadoc
- install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
- cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
- %fdupes -s %{buildroot}%{_javadocdir}
-popd
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -dm 0755 %{buildroot}%{_javadir}/javax.enterprise.inject
+install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
+ln -sf ../%{name}/%{name}.jar %{buildroot}%{_javadir}/javax.enterprise.inject/%{name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}
-%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}
+%files -f .mfiles
+%license LICENSE
%{_javadir}/javax.enterprise.inject
%files javadoc
-%license spec/src/main/doc/license-asl2.%{adoc}
-%license spec/src/main/doc/license-jcp.%{adoc}
+%license LICENSE
%{_javadocdir}/%{name}
%changelog
diff --git a/create-tarball.sh b/create-tarball.sh
new file mode 100644
index 0000000..363f018
--- /dev/null
+++ b/create-tarball.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e -x
+test $# -eq 1
+test ! -d cdi
+git clone git://github.com/cdi-spec/cdi.git
+cd ./cdi
+git checkout -b tag-${1} ${1}
+git archive --format=tar --prefix=cdi-api-${1}/ HEAD:api \
+ | xz >../cdi-api-${1}.tar.xz