From ba933710054514f2fb02850b6580ac8ca05673b0d3e25f08ee6a4f30f87b3810 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 7 Apr 2019 06:39:25 +0000 Subject: [PATCH] Accepting request 692068 from home:jengelh:branches:Java:packages - Use _service instead of custom create-tarball.sh. - Avoid double-shipping license file. OBS-URL: https://build.opensuse.org/request/show/692068 OBS-URL: https://build.opensuse.org/package/show/Java:packages/cdi-api?expand=0&rev=9 --- LICENSE-2.0.txt | 202 --------------------------------------------- _service | 14 ++++ cdi-1.2.tar.xz | 3 + cdi-api-1.2.tar.xz | 3 - cdi-api-build.xml | 4 +- cdi-api.changes | 6 ++ cdi-api.spec | 16 ++-- create-tarball.sh | 9 -- 8 files changed, 35 insertions(+), 222 deletions(-) delete mode 100644 LICENSE-2.0.txt create mode 100644 _service create mode 100644 cdi-1.2.tar.xz delete mode 100644 cdi-api-1.2.tar.xz delete mode 100644 create-tarball.sh diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt deleted file mode 100644 index 81fbaf6..0000000 --- a/LICENSE-2.0.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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/_service b/_service new file mode 100644 index 0000000..14d0456 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + git://github.com/cdi-spec/cdi + 1.2 + 1.2 + api + + + *.tar + xz + + + diff --git a/cdi-1.2.tar.xz b/cdi-1.2.tar.xz new file mode 100644 index 0000000..4aeffec --- /dev/null +++ b/cdi-1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f38b66047deaf0f79004f41b68be1dbbe2061d8e94a42401b93f9c911484f14f +size 46560 diff --git a/cdi-api-1.2.tar.xz b/cdi-api-1.2.tar.xz deleted file mode 100644 index f15e520..0000000 --- a/cdi-api-1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 cae7fdf..34b469c 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 9efed0f..522566b 100644 --- a/cdi-api.changes +++ b/cdi-api.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 6 22:29:10 UTC 2019 - Jan Engelhardt + +- Use _service instead of custom create-tarball.sh. +- Avoid double-shipping license file. + ------------------------------------------------------------------- Wed Apr 3 10:59:32 UTC 2019 - Fridrich Strba diff --git a/cdi-api.spec b/cdi-api.spec index ef88a1e..b26676a 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -25,10 +25,9 @@ License: Apache-2.0 Group: Development/Libraries/Java URL: http://seamframework.org/Weld # sh create-tarball.sh %%{version} -Source0: %{name}-%{version}.tar.xz +Source0: cdi-%{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 @@ -51,7 +50,8 @@ Group: Documentation/HTML This package contains the API documentation for %{name}. %prep -%setup -q +%setup -qn cdi-%{version} +pushd api/ cp %{SOURCE1} build.xml cp %{SOURCE2} LICENSE @@ -59,8 +59,10 @@ cp %{SOURCE2} LICENSE %pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec" %pom_remove_parent +popd %build +pushd api/ mkdir -p lib build-jar-repository -s lib glassfish-el-api jboss-interceptors-1.2-api javax.inject %{ant} \ @@ -68,8 +70,10 @@ build-jar-repository -s lib glassfish-el-api jboss-interceptors-1.2-api javax.in -Dtest.skip=true \ %endif jar javadoc +popd %install +pushd api/ # jar install -dm 0755 %{buildroot}%{_javadir}/%{name} install -dm 0755 %{buildroot}%{_javadir}/javax.enterprise.inject @@ -82,14 +86,14 @@ install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +popd %fdupes -s %{buildroot}%{_javadocdir} -%files -f .mfiles -%license LICENSE +%files -f api/.mfiles +%license api/LICENSE %{_javadir}/javax.enterprise.inject %files javadoc -%license LICENSE %{_javadocdir}/%{name} %changelog diff --git a/create-tarball.sh b/create-tarball.sh deleted file mode 100644 index 363f018..0000000 --- a/create-tarball.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/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