Update to upstream version 1.1.0
This commit is contained in:
Mikolaj Izdebski
parent
0f036edc1c
commit
3cd63ca3f6
@ -19,7 +19,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: javapackages-bootstrap
|
Name: javapackages-bootstrap
|
||||||
Version: 1.0.0
|
Version: 1.1.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A means of bootstrapping Java Packages Tools
|
Summary: A means of bootstrapping Java Packages Tools
|
||||||
# For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING
|
# For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING
|
||||||
@ -32,12 +32,6 @@ Source0: https://github.com/fedora-java/javapackages-bootstrap/releases/d
|
|||||||
# License breakdown
|
# License breakdown
|
||||||
Source1: javapackages-bootstrap-PACKAGE-LICENSING
|
Source1: javapackages-bootstrap-PACKAGE-LICENSING
|
||||||
|
|
||||||
# Extracted custom license files
|
|
||||||
Source2: plexus-compiler-LICENSE-MIT
|
|
||||||
Source3: plexus-containers-LICENSE-MIT
|
|
||||||
Source4: plexus-interpolation-LICENSE-MIT
|
|
||||||
Source5: plexus-resources-LICENSE-MIT
|
|
||||||
|
|
||||||
# To obtain the following sources:
|
# To obtain the following sources:
|
||||||
# git clone https://github.com/fedora-java/javapackages-bootstrap.git
|
# git clone https://github.com/fedora-java/javapackages-bootstrap.git
|
||||||
# pushd javapackages-bootstrap-${version}
|
# pushd javapackages-bootstrap-${version}
|
||||||
@ -300,12 +294,9 @@ XMvn, allowing JPT to be used before one builds XMvn package.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
mkdir licenses
|
|
||||||
cp -p %(echo %{sources} | cut -d' ' -f2-6) licenses
|
|
||||||
|
|
||||||
# leave out the first source as it has already been extracted
|
# leave out the first source as it has already been extracted
|
||||||
# leave out license files
|
# leave out licensing breakdown file
|
||||||
other_sources=$(echo %{sources} | cut -d' ' -f7-)
|
other_sources=$(echo %{sources} | cut -d' ' -f3-)
|
||||||
|
|
||||||
for source in ${other_sources}
|
for source in ${other_sources}
|
||||||
do
|
do
|
||||||
@ -322,9 +313,6 @@ do
|
|||||||
popd
|
popd
|
||||||
done
|
done
|
||||||
|
|
||||||
# This file would otherwise be installed along with the executables
|
|
||||||
rm downstream/maven/apache-maven/src/bin/.gitattributes
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export LC_ALL=C.utf8
|
export LC_ALL=C.utf8
|
||||||
./mbi.j build -parallel
|
./mbi.j build -parallel
|
||||||
@ -337,6 +325,7 @@ export LC_ALL=C.utf8
|
|||||||
-metadataPath=%{metadataPath} \
|
-metadataPath=%{metadataPath} \
|
||||||
-artifactsPath=%{artifactsPath} \
|
-artifactsPath=%{artifactsPath} \
|
||||||
-launchersPath=%{launchersPath} \
|
-launchersPath=%{launchersPath} \
|
||||||
|
-licensesPath=%{_licensedir}/%{name} \
|
||||||
|
|
||||||
# fix permissions
|
# fix permissions
|
||||||
for f in mvn mvnDebug mvnyjp
|
for f in mvn mvnDebug mvnyjp
|
||||||
@ -344,82 +333,6 @@ do
|
|||||||
chmod +x "%{buildroot}%{mavenHomePath}/bin/${f}"
|
chmod +x "%{buildroot}%{mavenHomePath}/bin/${f}"
|
||||||
done
|
done
|
||||||
|
|
||||||
for f in ant cup jflex xmvn-install xmvn-resolve xmvn-subst
|
|
||||||
do
|
|
||||||
chmod g-w "%{buildroot}%{launchersPath}/${f}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# remove zero-size files
|
|
||||||
find %{buildroot}%{artifactsPath} -type f -size 0 -delete
|
|
||||||
|
|
||||||
# install license files
|
|
||||||
license_directory="%{buildroot}%{_licensedir}/%{name}"
|
|
||||||
|
|
||||||
install -d -m 755 "${license_directory}"
|
|
||||||
|
|
||||||
## install license breakdown and extracted custom licenses
|
|
||||||
for license_file in licenses/*
|
|
||||||
do
|
|
||||||
install -p -m 644 "${license_file}" "${license_directory}/$(basename ${license_file})"
|
|
||||||
done
|
|
||||||
|
|
||||||
## install downstream licenses
|
|
||||||
install -p -m 644 LICENSE "${license_directory}/LICENSE"
|
|
||||||
install -p -m 644 NOTICE "${license_directory}/NOTICE"
|
|
||||||
|
|
||||||
function install_license()
|
|
||||||
{
|
|
||||||
install -p -m 644 "downstream/${1}/${2}" "${license_directory}/${1}-${2}"
|
|
||||||
}
|
|
||||||
|
|
||||||
install_license ant NOTICE
|
|
||||||
install_license bnd LICENSE
|
|
||||||
install_license build-helper-maven-plugin LICENSE.txt
|
|
||||||
install_license byte-buddy NOTICE
|
|
||||||
install_license cglib NOTICE
|
|
||||||
install_license common-annotations-api LICENSE.md
|
|
||||||
install_license common-annotations-api NOTICE.md
|
|
||||||
install_license commons-beanutils NOTICE.txt
|
|
||||||
install_license commons-cli NOTICE.txt
|
|
||||||
install_license commons-codec NOTICE.txt
|
|
||||||
install_license commons-collections NOTICE.txt
|
|
||||||
install_license commons-compress NOTICE.txt
|
|
||||||
install_license commons-io NOTICE.txt
|
|
||||||
install_license commons-jxpath NOTICE.txt
|
|
||||||
install_license commons-lang NOTICE.txt
|
|
||||||
install_license commons-logging NOTICE.txt
|
|
||||||
install_license commons-parent-pom NOTICE.txt
|
|
||||||
install_license cup licence.txt
|
|
||||||
install_license felix-parent-pom NOTICE
|
|
||||||
install_license felix-utils NOTICE
|
|
||||||
install_license fusesource-pom notice.txt
|
|
||||||
install_license httpcomponents-client NOTICE.txt
|
|
||||||
install_license httpcomponents-core NOTICE.txt
|
|
||||||
install_license httpcomponents-parent-pom NOTICE.txt
|
|
||||||
install_license injection-api NOTICE.md
|
|
||||||
install_license jcommander notice.md
|
|
||||||
install_license jsoup LICENSE
|
|
||||||
install_license junit4 LICENSE-junit.txt
|
|
||||||
install_license junit5 LICENSE.md
|
|
||||||
install_license maven-bundle-plugin NOTICE
|
|
||||||
install_license maven-enforcer NOTICE
|
|
||||||
install_license maven NOTICE
|
|
||||||
install_license mockito LICENSE
|
|
||||||
install_license modello LICENSE.txt
|
|
||||||
install_license munge-maven-plugin LICENSE
|
|
||||||
install_license plexus-cipher NOTICE.txt
|
|
||||||
install_license plexus-io NOTICE.txt
|
|
||||||
install_license plexus-utils NOTICE.txt
|
|
||||||
install_license servlet-api LICENSE.md
|
|
||||||
install_license servlet-api NOTICE.md
|
|
||||||
install_license sisu-inject LICENSE.txt
|
|
||||||
install_license sisu-mojos LICENSE.txt
|
|
||||||
install_license sisu-plexus LICENSE.txt
|
|
||||||
install_license slf4j LICENSE.txt
|
|
||||||
install_license velocity-engine NOTICE
|
|
||||||
install_license xbean NOTICE
|
|
||||||
install_license xmvn NOTICE
|
|
||||||
|
|
||||||
# Use toolchains.xml provided by javapackages-tools
|
# Use toolchains.xml provided by javapackages-tools
|
||||||
%if 0%{?_module_build}
|
%if 0%{?_module_build}
|
||||||
rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
|
rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
|
||||||
@ -436,5 +349,8 @@ rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
|
|||||||
%doc AUTHORS
|
%doc AUTHORS
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 3 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.0-1
|
||||||
|
- Update to upstream version 1.1.0
|
||||||
|
|
||||||
* Wed Nov 25 2020 Marian Koncek <mkoncek@redhat.com> - 1.0.0-1
|
* Wed Nov 25 2020 Marian Koncek <mkoncek@redhat.com> - 1.0.0-1
|
||||||
- Initial commit
|
- Initial commit
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
/**
|
|
||||||
* The MIT License
|
|
||||||
*
|
|
||||||
* Copyright (c) 2004, The Codehaus
|
|
||||||
* Copyright (c) 2005, The Codehaus
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
||||||
* this software and associated documentation files (the "Software"), to deal in
|
|
||||||
* the Software without restriction, including without limitation the rights to
|
|
||||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is furnished to do
|
|
||||||
* so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
|
||||||
* copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
/*
|
|
||||||
* The MIT License
|
|
||||||
*
|
|
||||||
* Copyright (c) 2004, The Codehaus
|
|
||||||
* Copyright (c) 2006, The Codehaus
|
|
||||||
* Copyright (c) 2007, The Codehaus
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
||||||
* this software and associated documentation files (the "Software"), to deal in
|
|
||||||
* the Software without restriction, including without limitation the rights to
|
|
||||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is furnished to do
|
|
||||||
* so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
|
||||||
* copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
/*
|
|
||||||
* The MIT License
|
|
||||||
*
|
|
||||||
* Copyright (c) 2004, The Codehaus
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
||||||
* this software and associated documentation files (the "Software"), to deal in
|
|
||||||
* the Software without restriction, including without limitation the rights to
|
|
||||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is furnished to do
|
|
||||||
* so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
|
||||||
* copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
/*
|
|
||||||
* The MIT License
|
|
||||||
*
|
|
||||||
* Copyright (c) 2004, The Codehaus
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
||||||
* this software and associated documentation files (the "Software"), to deal in
|
|
||||||
* the Software without restriction, including without limitation the rights to
|
|
||||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is furnished to do
|
|
||||||
* so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
|
||||||
* copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
Loading…
Reference in New Issue
Block a user