[dev] Add additional provides to specs (#395)
This commit is contained in:
Joe Schmitt
GitHub
parent
a76a850170
commit
1248fab3a6
|
|
@ -1,23 +1,70 @@
|
|||
Summary: Apache Ant
|
||||
Name: ant
|
||||
Version: 1.10.9
|
||||
Release: 1%{?dist}
|
||||
License: ASL 2.0 and BSD and W3C
|
||||
URL: https://ant.apache.org
|
||||
Group: Applications/System
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
BuildArch: noarch
|
||||
Source0: https://archive.apache.org/dist/ant/source/apache-%{name}-%{version}-src.tar.gz
|
||||
Source1: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hamcrest/hamcrest-1.3.tgz
|
||||
Source2: https://dl.bintray.com/vmware/photon_sources/1.0/maven-ant-tasks-2.1.3.tar.gz
|
||||
|
||||
Requires: openjre8
|
||||
BuildRequires: openjre8
|
||||
BuildRequires: openjdk8
|
||||
%define _prefix /var/opt/apache-%{name}
|
||||
%define _bindir %{_prefix}/bin
|
||||
%define _libdir %{_prefix}/lib
|
||||
Summary: Apache Ant
|
||||
Name: ant
|
||||
Version: 1.10.9
|
||||
Release: 2%{?dist}
|
||||
License: ASL 2.0 AND BSD AND W3C
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: Applications/System
|
||||
URL: https://ant.apache.org
|
||||
Source0: https://archive.apache.org/dist/ant/source/apache-%{name}-%{version}-src.tar.gz
|
||||
Source1: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hamcrest/hamcrest-1.3.tgz
|
||||
Source2: https://dl.bintray.com/vmware/photon_sources/1.0/maven-ant-tasks-2.1.3.tar.gz
|
||||
BuildRequires: openjdk8
|
||||
BuildRequires: openjre8
|
||||
Requires: openjre8
|
||||
Provides: %{name}-lib = %{version}-%{release}
|
||||
Provides: mvn(ant:ant) = %{version}-%{release}
|
||||
Provides: mvn(ant:ant-launcher) = %{version}-%{release}
|
||||
Provides: mvn(apache:ant) = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant) = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-bootstrap) = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-launcher) = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-nodeps) = %{version}-%{release}
|
||||
Provides: %{name}-antlr = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-antlr) = %{version}-%{release}
|
||||
Provides: %{name}-jmf = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-jmf) = %{version}-%{release}
|
||||
Provides: %{name}-swing = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-swing) = %{version}-%{release}
|
||||
Provides: %{name}-apache-bsf = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-apache-bsf) = %{version}-%{release}
|
||||
Provides: %{name}-apache-resolver = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-apache-resolver) = %{version}-%{release}
|
||||
Provides: %{name}-commons-logging = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-commons-logging) = %{version}-%{release}
|
||||
Provides: %{name}-commons-net = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-commons-net) = %{version}-%{release}
|
||||
Provides: %{name}-jai = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-jai) = %{version}-%{release}
|
||||
Provides: %{name}-apache-bcel = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-apache-bcel) = %{version}-%{release}
|
||||
Provides: %{name}-apache-log4j = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-apache-log4j) = %{version}-%{release}
|
||||
Provides: %{name}-apache-oro = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-apache-oro) = %{version}-%{release}
|
||||
Provides: %{name}-apache-regexp = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-apache-regexp) = %{version}-%{release}
|
||||
Provides: %{name}-apache-xalan2 = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-apache-xalan2) = %{version}-%{release}
|
||||
Provides: %{name}-imageio = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-imageio) = %{version}-%{release}
|
||||
Provides: %{name}-javamail = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-javamail) = %{version}-%{release}
|
||||
Provides: %{name}-jdepend = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-jdepend) = %{version}-%{release}
|
||||
Provides: %{name}-jsch = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-jsch) = %{version}-%{release}
|
||||
Provides: %{name}-junit = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-junit) = %{version}-%{release}
|
||||
Provides: %{name}-testutil = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-testutil) = %{version}-%{release}
|
||||
Provides: %{name}-xz = %{version}-%{release}
|
||||
Provides: mvn(org.apache.ant:ant-xz) = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
The Ant package contains binaries for a build system
|
||||
|
|
@ -26,6 +73,7 @@ The Ant package contains binaries for a build system
|
|||
Summary: Additional scripts for ant
|
||||
Requires: %{name} = %{version}
|
||||
Requires: python2
|
||||
|
||||
%description -n ant-scripts
|
||||
Apache Ant is a Java-based build tool.
|
||||
|
||||
|
|
@ -40,10 +88,11 @@ tar xf %{SOURCE2} --no-same-owner
|
|||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%build
|
||||
ANT_DIST_DIR=%{buildroot}%{_prefix}
|
||||
cp -v ./hamcrest-1.3/hamcrest-core-1.3.jar ./lib/optional
|
||||
export JAVA_HOME=$(find /usr/lib/jvm -name "OpenJDK*")
|
||||
export JAVA_HOME=$(find %{_lib}/jvm -name "OpenJDK*")
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(find $JAVA_HOME/lib -name "jli")
|
||||
mkdir -p -m 700 $ANT_DIST_DIR
|
||||
./bootstrap.sh && ./build.sh -Ddist.dir=$ANT_DIST_DIR
|
||||
|
|
@ -81,12 +130,12 @@ chmod 644 $MAVEN_ANT_TASKS_DIR/*
|
|||
# - org.apache.tools.ant.types.selectors.OwnedBySelectorTest
|
||||
# - org.apache.tools.ant.types.selectors.PosixGroupSelectorTest
|
||||
# - org.apache.tools.mail.MailMessageTest
|
||||
if [ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ]; then
|
||||
if [ "$(stat -c %{d}:%i /)" != "$(stat -c %{d}:%i /proc/1/root/.)" ]; then
|
||||
rm -f src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java \
|
||||
src/tests/junit/org/apache/tools/ant/types/selectors/PosixGroupSelectorTest.java \
|
||||
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
|
||||
fi
|
||||
export JAVA_HOME=`echo /usr/lib/jvm/OpenJDK-*`
|
||||
export JAVA_HOME=`echo %{_lib}/jvm/OpenJDK-*`
|
||||
bootstrap/bin/ant -v run-tests
|
||||
|
||||
%files
|
||||
|
|
@ -118,59 +167,87 @@ bootstrap/bin/ant -v run-tests
|
|||
%{_bindir}/runant.pl
|
||||
|
||||
%changelog
|
||||
* Tue Nov 17 2020 Joe Schmitt <joschmit@microsoft.com> - 1.10.9-1
|
||||
- Add additional provides.
|
||||
|
||||
* Wed Oct 21 2020 Henry Li <lihl@microsoft.com> - 1.10.9-1
|
||||
- Updated to version 1.10.9 to resolve CVE-2020-11979
|
||||
|
||||
* Thu May 21 2020 Ruying Chen <v-ruyche@microsoft.com> - 1.10.8-1
|
||||
- Updated to version 1.10.8 to resolve CVE-2020-1945
|
||||
|
||||
* Sat May 09 00:21:39 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.10.5-8
|
||||
- Added %%license line automatically
|
||||
|
||||
* Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 1.10.5-7
|
||||
- Renaming apache-ant to ant
|
||||
|
||||
* Wed Apr 29 2020 Nicolas Guibourge <nicolasg@microsoft.com> 1.10.5-6
|
||||
- Add path to libjli.so in LD_LIBRARY_PATH
|
||||
|
||||
* Thu Apr 09 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 1.10.5-5
|
||||
- Fixed "Source0"-"Source2" and "URL" tags.
|
||||
- License verified and "License" tag updated.
|
||||
- Removed "%%define sha1".
|
||||
- Replaced tabs with spaces.
|
||||
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.10.5-4
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
|
||||
* Tue Dec 04 2018 Dweep Advani <dadvani@vmware.com> 1.10.5-3
|
||||
- Adding MakeCheck tests
|
||||
|
||||
* Mon Nov 05 2018 Alexey Makhalov <amakhalov@vmware.com> 1.10.5-2
|
||||
- Removed dependency on JAVA8_VERSION macro
|
||||
|
||||
* Mon Sep 17 2018 Ankit Jain <ankitja@vmware.com> 1.10.5-1
|
||||
- Updated Apache Ant to 1.10.5
|
||||
|
||||
* Wed Jun 28 2017 Kumar Kaushik <kaushikk@vmware.com> 1.10.1-5
|
||||
- Base package does not require python2.
|
||||
|
||||
* Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 1.10.1-4
|
||||
- Removed dependency on ANT_HOME
|
||||
- Moved perl and python scripts to ant-scripts package
|
||||
|
||||
* Mon Jun 05 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.10.1-3
|
||||
- Fixed the profile.d/apache-ant.sh script to include ant in $PATH
|
||||
|
||||
* Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.10.1-2
|
||||
- Renamed openjdk to openjdk8
|
||||
|
||||
* Mon Apr 17 2017 Chang Lee <changlee@vmware.com> 1.10.1-1
|
||||
- Updated Apache Ant to 1.10.1
|
||||
|
||||
* Fri Mar 31 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-6
|
||||
- use java rpm macros to determine versions
|
||||
|
||||
* Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-5
|
||||
- Updated JAVA_HOME path to point to latest JDK.
|
||||
|
||||
* Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-4
|
||||
- Updated JAVA_HOME path to point to latest JDK.
|
||||
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-3
|
||||
- GA - Bump release of all rpms
|
||||
|
||||
* Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 1.9.6-2
|
||||
- Updated JAVA_HOME path to point to latest JDK.
|
||||
|
||||
* Mon Feb 29 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.6-1
|
||||
- Updated to version 1.9.6
|
||||
|
||||
* Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.9.4-4
|
||||
- Updated JAVA_HOME path to point to latest JDK.
|
||||
|
||||
* Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 1.9.4-3
|
||||
- Changed path to /var/opt.
|
||||
|
||||
* Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.4-2
|
||||
- Updated dependencies after repackaging openjdk.
|
||||
|
||||
* Wed Aug 12 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4
|
||||
- Added maven ant tasks
|
||||
|
||||
* Fri May 22 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4
|
||||
- Initial build. First version
|
||||
|
|
|
|||
|
|
@ -1,27 +1,30 @@
|
|||
Summary: A system tool for maintaining the /etc/rc*.d hierarchy
|
||||
Name: chkconfig
|
||||
Version: 1.11
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
URL: https://github.com/fedora-sysv/chkconfig
|
||||
Summary: A system tool for maintaining the %{_sysconfdir}/rc*.d hierarchy
|
||||
Name: chkconfig
|
||||
Version: 1.11
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: System Environment/Base
|
||||
URL: https://github.com/fedora-sysv/chkconfig
|
||||
#Source0: https://github.com/fedora-sysv/%{name}/archive/%{version}.tar.gz
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0:chkconfig-shortopt.patch
|
||||
Patch1:ignore-priorities.patch
|
||||
Patch2:chkconfig-runlevel.patch
|
||||
Patch3:print-service-on-off.patch
|
||||
%define sha1 chkconfig=8489eeacacd0979180caba4919cb721824ca3735
|
||||
Requires: libselinux
|
||||
Requires: libsepol
|
||||
Requires: newt
|
||||
Requires: popt
|
||||
Requires: slang
|
||||
BuildRequires: newt-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: popt-devel
|
||||
BuildRequires: libselinux-devel
|
||||
Conflicts: initscripts <= 5.30-1
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0: chkconfig-shortopt.patch
|
||||
Patch1: ignore-priorities.patch
|
||||
Patch2: chkconfig-runlevel.patch
|
||||
Patch3: print-service-on-off.patch
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: newt-devel
|
||||
BuildRequires: popt-devel
|
||||
Requires: libselinux
|
||||
Requires: libsepol
|
||||
Requires: newt
|
||||
Requires: popt
|
||||
Requires: slang
|
||||
Conflicts: initscripts <= 5.30-1
|
||||
Provides: alternatives = %{version}-%{release}
|
||||
Provides: update-alternatives = %{version}-%{release}
|
||||
|
||||
%description
|
||||
Chkconfig is a basic system utility. It updates and queries runlevel
|
||||
|
|
@ -30,9 +33,9 @@ symbolic links in /etc/rc.d, to relieve system administrators of some
|
|||
of the drudgery of manually editing the symbolic links.
|
||||
|
||||
%package -n ntsysv
|
||||
Summary: A tool to set the stop/start of system services in a runlevel
|
||||
Group: System Environment/Base
|
||||
Requires: chkconfig
|
||||
Summary: A tool to set the stop/start of system services in a runlevel
|
||||
Group: System Environment/Base
|
||||
Requires: chkconfig
|
||||
|
||||
%description -n ntsysv
|
||||
Ntsysv provides a simple interface for setting which system services
|
||||
|
|
@ -47,12 +50,12 @@ page), ntsysv configures the current runlevel (5 if you're using X).
|
|||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
|
||||
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags}
|
||||
make RPM_OPT_FLAGS="%{optflags}" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make DESTDIR=%{buildroot} MANDIR=%{_mandir} SBINDIR=%{_sbindir} install
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
|
||||
|
|
@ -68,6 +71,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/chkconfig.d
|
|||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
|
|
@ -82,11 +86,11 @@ rm -rf %{buildroot}
|
|||
%{_sysconfdir}/rc.d/init.d
|
||||
%{_sysconfdir}/rc[0-6].d
|
||||
%{_sysconfdir}/rc.d/rc[0-6].d
|
||||
%dir /var/lib/alternatives
|
||||
%dir %{_sharedstatedir}/alternatives
|
||||
%{_mandir}/*/chkconfig*
|
||||
%{_mandir}/*/update-alternatives*
|
||||
%{_mandir}/*/alternatives*
|
||||
%{_prefix}/lib/systemd/systemd-sysv-install
|
||||
%{_lib}/systemd/systemd-sysv-install
|
||||
|
||||
%files -n ntsysv
|
||||
%defattr(-,root,root)
|
||||
|
|
@ -94,17 +98,26 @@ rm -rf %{buildroot}
|
|||
%{_mandir}/*/ntsysv.8*
|
||||
|
||||
%changelog
|
||||
* Tue Nov 17 2020 Joe Schmitt <joschmit@microsoft.com> - 1.11-2
|
||||
- Provide alternatives and update-alternatives.
|
||||
- Remove sha1 define.
|
||||
|
||||
* Wed Mar 18 2020 Emre Girgin <mrgirgin@microsoft.com> 1.11-1
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
- Upgrade to 1.11. License verified.
|
||||
|
||||
* Fri Apr 07 2017 Anish Swaminathan <anishs@vmware.com> 1.9-1
|
||||
- Upgrade to 1.9
|
||||
|
||||
* Mon Oct 31 2016 Anish Swaminathan <anishs@vmware.com> 1.5-7
|
||||
- Chkconfig patch to fix interaction with systemd
|
||||
|
||||
* Tue Sep 13 2016 Anish Swaminathan <anishs@vmware.com> 1.5-6
|
||||
- Chkconfig patch to return runlevel 3 on Photon OS
|
||||
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5-5
|
||||
- GA - Bump release of all rpms
|
||||
|
||||
* Mon Dec 07 2015 Mahmoud Bassiouny <mbassiouny@vmware.com>
|
||||
- Ability for chkconfig to ignore priorities.
|
||||
|
||||
|
|
@ -264,7 +277,7 @@ rm -rf %{buildroot}
|
|||
- translation updates: as, bg, bn_IN, bs, ca, de, fr, hi, hu, id, ja,
|
||||
ka, ml, ms, nb, or, sk, sl
|
||||
- add resetpriorities to the man page (#197399)
|
||||
|
||||
|
||||
* Tue Feb 6 2007 Bill Nottingham <notting@redhat.com> 1.3.33-1
|
||||
- various changes from review - support alternate %%{_sbindir}, fix
|
||||
summaries, add version to requires, assorted other bits
|
||||
|
|
|
|||
|
|
@ -1,28 +1,56 @@
|
|||
%define _prefix /var/opt/apache-%{name}
|
||||
%define _bindir %{_prefix}/bin
|
||||
%define _libdir %{_prefix}/lib
|
||||
Summary: Apache Maven
|
||||
Name: maven
|
||||
Version: 3.5.4
|
||||
Release: 13%{?dist}
|
||||
Release: 14%{?dist}
|
||||
License: ASL 2.0
|
||||
URL: https://maven.apache.org/
|
||||
Group: Applications/System
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: Applications/System
|
||||
URL: https://maven.apache.org/
|
||||
Source0: https://archive.apache.org/dist/maven/maven-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz
|
||||
Source1: https://archive.apache.org/dist/maven/maven-3/%{version}/binaries/apache-%{name}-%{version}-bin.tar.gz
|
||||
Source2: apache-%{name}-%{version}-m2.tar.gz
|
||||
Source3: apache-%{name}-%{version}-licenses.tar.gz
|
||||
# Note: this license tarball will need to be regenerated if this package is upgraded by running: apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
|
||||
|
||||
BuildRequires: ant
|
||||
BuildRequires: openjre8
|
||||
BuildRequires: openjdk8
|
||||
BuildRequires: openjre8
|
||||
BuildRequires: wget >= 1.15
|
||||
Requires: openjre8
|
||||
Requires: /usr/bin/which
|
||||
|
||||
%define _prefix /var/opt/apache-%{name}
|
||||
%define _bindir %{_prefix}/bin
|
||||
%define _libdir %{_prefix}/lib
|
||||
Requires: openjre8
|
||||
Provides: %{name}-lib = %{version}-%{release}
|
||||
Provides: bundled(slf4j) = %{version}-%{release}
|
||||
Provides: maven2 = %{version}-%{release}
|
||||
Obsoletes: maven2 < %{version}-%{release}
|
||||
Provides: %{name}-artifact = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-artifact) = %{version}-%{release}
|
||||
Provides: %{name}-builder-support = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-builder-support) = %{version}-%{release}
|
||||
Provides: %{name}-compat = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-compat) = %{version}-%{release}
|
||||
Provides: %{name}-core = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-core) = %{version}-%{release}
|
||||
Provides: %{name}-embedder = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-embedder) = %{version}-%{release}
|
||||
Provides: %{name}-model = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-model) = %{version}-%{release}
|
||||
Provides: %{name}-model-builder = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-model-builder) = %{version}-%{release}
|
||||
Provides: %{name}-plugin-api = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-plugin-api) = %{version}-%{release}
|
||||
Provides: %{name}-repository-metadata = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-repository-metadata) = %{version}-%{release}
|
||||
Provides: %{name}-resolver-provider = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-resolver-provider) = %{version}-%{release}
|
||||
Provides: %{name}-settings = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-settings) = %{version}-%{release}
|
||||
Provides: %{name}-settings-builder = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-settings-builder) = %{version}-%{release}
|
||||
Provides: %{name}-slf4j-provider = %{version}-%{release}
|
||||
Provides: mvn(org.apache.maven:maven-slf4j-provider) = %{version}-%{release}
|
||||
|
||||
%description
|
||||
The Maven package contains binaries for a build system
|
||||
|
|
@ -50,10 +78,11 @@ popd
|
|||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%build
|
||||
MAVEN_DIST_DIR=%{buildroot}%{_prefix}
|
||||
|
||||
export JAVA_HOME=$(find /usr/lib/jvm -name "OpenJDK*")
|
||||
export JAVA_HOME=$(find %{_lib}/jvm -name "OpenJDK*")
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(find $JAVA_HOME/lib -name "jli")
|
||||
|
||||
sed -i 's/www.opensource/opensource/g' DEPENDENCIES
|
||||
|
|
@ -97,70 +126,104 @@ done
|
|||
%exclude %{_libdir}/jansi-native
|
||||
|
||||
%changelog
|
||||
* Sat May 09 00:21:30 PST 2020 Nick Samson <nisamson@microsoft.com> - 3.5.4-13
|
||||
* Tue Nov 17 2020 Joe Schmitt <joschmit@microsoft.com> - 3.5.4-14
|
||||
- Add additional provides.
|
||||
- Provide and obsolete maven2.
|
||||
|
||||
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 3.5.4-13
|
||||
- Added %%license line automatically
|
||||
|
||||
* Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 3.5.4-12
|
||||
- Renaming apache-ant to ant
|
||||
|
||||
* Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 3.5.4-11
|
||||
- Renaming apache-maven to maven
|
||||
|
||||
* Wed Apr 29 2020 Nicolas Guibourge <nicolasg@microsoft.com> 3.5.4-10
|
||||
- Add path to libjli.so in LD_LIBRARY_PATH and skip test while building
|
||||
|
||||
* Thu Apr 23 2020 Andrew Phelps <anphel@microsoft.com> 3.5.4-9
|
||||
- Replace downloaded license files with new source tarball.
|
||||
|
||||
* Thu Apr 16 2020 Nick Samson <nisamson@microsoft.com> 3.5.4-8
|
||||
- Updated Source0, License info to use Fedora guidelines. Signature verified.
|
||||
|
||||
* Fri Apr 10 2020 Andrew Phelps <anphel@microsoft.com> 3.5.4-7
|
||||
- Support building offline for CDPX.
|
||||
|
||||
* Wed Apr 01 2020 Andrew Phelps <anphel@microsoft.com> 3.5.4-6
|
||||
- Support building standalone by adding mvn binary. License verified.
|
||||
|
||||
* Wed Feb 12 2020 Andrew Phelps <anphel@microsoft.com> 3.5.4-5
|
||||
- Remove ExtraBuildRequires
|
||||
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.5.4-4
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
|
||||
* Mon Nov 05 2018 Alexey Makhalov <amakhalov@vmware.com> 3.5.4-3
|
||||
- Removed dependency on JAVA8_VERSION macro
|
||||
|
||||
* Mon Oct 29 2018 Alexey Makhalov <amakhalov@vmware.com> 3.5.4-2
|
||||
- Use ExtraBuildRequires
|
||||
|
||||
* Tue Sep 18 2018 Ankit Jain <ankitja@vmware.com> 3.5.4-1
|
||||
- Updated apache-maven to version 3.5.4
|
||||
|
||||
* Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 3.5.0-5
|
||||
- Remove BuildArch
|
||||
|
||||
* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.5.0-4
|
||||
- Requires /usr/bin/which
|
||||
|
||||
* Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 3.5.0-3
|
||||
- Removed dependency on ANT_HOME
|
||||
- Removed apache-maven profile file
|
||||
- Removed version from directory path
|
||||
|
||||
* Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.0-2
|
||||
- Renamed openjdk to openjdk8
|
||||
|
||||
* Mon Apr 24 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.0-1
|
||||
- Updated apache-maven to version 3.5.0
|
||||
|
||||
* Fri Mar 31 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.9-8
|
||||
- use java rpm macros to determine versions
|
||||
|
||||
* Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.9-7
|
||||
- Updated JAVA_HOME path to point to latest JDK.
|
||||
|
||||
* Thu Oct 27 2016 Alexey Makhalov <amakhalov@vmware.com> 3.3.9-6
|
||||
- Fix build issue - unable to fetch opensource.org/.../mit-license.php
|
||||
|
||||
* Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.9-5
|
||||
- Updated JAVA_HOME path to point to latest JDK.
|
||||
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.9-4
|
||||
- GA - Bump release of all rpms
|
||||
|
||||
* Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 3.3.9-3
|
||||
- Updated JAVA_HOME path to point to latest JDK.
|
||||
|
||||
* Tue Mar 01 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.3.9-2
|
||||
- Updated the apache-ant version to 1.9.6
|
||||
|
||||
* Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 3.3.9-2
|
||||
- Updated JAVA_HOME path to point to latest JDK.
|
||||
|
||||
* Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 3.3.9-1
|
||||
- Updated to version 3.3.9
|
||||
|
||||
* Tue Jan 5 2016 Xiaolin Li <xiaolinl@vmware.com> 3.3.3-4
|
||||
- Increase build timeout from 600000 to 1200000
|
||||
|
||||
* Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 3.3.3-3
|
||||
- Change path to /var/opt.
|
||||
|
||||
* Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.3.3-2
|
||||
- Updated dependencies after repackaging openjdk.
|
||||
|
||||
* Thu Jul 9 2015 Sarah Choi<sarahc@vmware.com> 3.3.3-1
|
||||
- Add a script to set environment variables for MAVEN
|
||||
|
||||
* Fri May 22 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4
|
||||
- Initial build. First version
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
Summary: OpenJDK
|
||||
Name: openjdk8
|
||||
Version: 1.8.0.212
|
||||
Release: 13%{?dist}
|
||||
Release: 14%{?dist}
|
||||
License: ASL 1.1 AND ASL 2.0 AND BSD AND BSD WITH advertising AND GPL+ AND GPLv2 AND GPLv2 WITH exceptions AND IJG AND LGPLv2+ AND MIT AND MPLv2.0 AND Public Domain AND W3C AND zlib
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -43,6 +43,8 @@ Requires: chkconfig
|
|||
Requires: libstdc++
|
||||
AutoReqProv: no
|
||||
Obsoletes: openjre <= %{version}
|
||||
Provides: java = %{version}-%{release}
|
||||
Provides: java-headless = %{version}-%{release}
|
||||
|
||||
%description -n openjre8
|
||||
It contains the libraries files for Java runtime environment
|
||||
|
|
@ -185,6 +187,7 @@ rm -rf %{_libdir}/jvm/OpenJDK-%{version}
|
|||
rm -rf %{buildroot}/*
|
||||
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license %{_libdir}/jvm/OpenJDK-%{version}/LICENSE
|
||||
|
|
@ -256,6 +259,9 @@ rm -rf %{buildroot}/*
|
|||
%{_libdir}/jvm/OpenJDK-%{version}/src.zip
|
||||
|
||||
%changelog
|
||||
* Tue Nov 17 2020 Joe Schmitt <joschmit@microsoft.com> - 1.8.0.212-14
|
||||
- Provide java and java-headless.
|
||||
|
||||
* Mon Nov 02 2020 Joe Schmitt <joschmit@microsoft.com> - 1.8.0.212-13
|
||||
- Provide java-1.8.0-openjdk and java-devel.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
Summary: OpenJDK
|
||||
Name: openjdk8
|
||||
Version: 1.8.0.181
|
||||
Release: 11%{?dist}
|
||||
Release: 12%{?dist}
|
||||
License: ASL 1.1 AND ASL 2.0 AND BSD AND BSD WITH advertising AND GPL+ AND GPLv2 AND GPLv2 WITH exceptions AND IJG AND LGPLv2+ AND MIT AND MPLv2.0 AND Public Domain AND W3C AND zlib
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -44,6 +44,8 @@ Requires: chkconfig
|
|||
Requires: libstdc++
|
||||
AutoReqProv: no
|
||||
Obsoletes: openjre <= %{version}
|
||||
Provides: java = %{version}-%{release}
|
||||
Provides: java-headless = %{version}-%{release}
|
||||
|
||||
%description -n openjre8
|
||||
It contains the libraries files for Java runtime environment
|
||||
|
|
@ -184,6 +186,7 @@ alternatives --remove java %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/java
|
|||
rm -rf %{buildroot}/*
|
||||
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
|
|
@ -254,6 +257,9 @@ rm -rf %{buildroot}/*
|
|||
%{_libdir}/jvm/OpenJDK-%{version}/src.zip
|
||||
|
||||
%changelog
|
||||
* Tue Nov 17 2020 Joe Schmitt <joschmit@microsoft.com> - 1.8.0.181-12
|
||||
- Provide java and java-headless.
|
||||
|
||||
* Mon Nov 02 2020 Joe Schmitt <joschmit@microsoft.com> - 1.8.0.181-11
|
||||
- Provide java-1.8.0-openjdk and java-devel.
|
||||
|
||||
|
|
|
|||
|
|
@ -275,12 +275,12 @@ nss-3.44-3.cm1.aarch64.rpm
|
|||
nss-debuginfo-3.44-3.cm1.aarch64.rpm
|
||||
nss-devel-3.44-3.cm1.aarch64.rpm
|
||||
nss-libs-3.44-3.cm1.aarch64.rpm
|
||||
openjdk8-1.8.0.181-11.cm1.aarch64.rpm
|
||||
openjdk8-debuginfo-1.8.0.181-11.cm1.aarch64.rpm
|
||||
openjdk8-doc-1.8.0.181-11.cm1.aarch64.rpm
|
||||
openjdk8-sample-1.8.0.181-11.cm1.aarch64.rpm
|
||||
openjdk8-src-1.8.0.181-11.cm1.aarch64.rpm
|
||||
openjre8-1.8.0.181-11.cm1.aarch64.rpm
|
||||
openjdk8-1.8.0.181-12.cm1.aarch64.rpm
|
||||
openjdk8-debuginfo-1.8.0.181-12.cm1.aarch64.rpm
|
||||
openjdk8-doc-1.8.0.181-12.cm1.aarch64.rpm
|
||||
openjdk8-sample-1.8.0.181-12.cm1.aarch64.rpm
|
||||
openjdk8-src-1.8.0.181-12.cm1.aarch64.rpm
|
||||
openjre8-1.8.0.181-12.cm1.aarch64.rpm
|
||||
openssl-1.1.1g-7.cm1.aarch64.rpm
|
||||
openssl-debuginfo-1.1.1g-7.cm1.aarch64.rpm
|
||||
openssl-devel-1.1.1g-7.cm1.aarch64.rpm
|
||||
|
|
|
|||
|
|
@ -275,12 +275,12 @@ nss-3.44-3.cm1.x86_64.rpm
|
|||
nss-debuginfo-3.44-3.cm1.x86_64.rpm
|
||||
nss-devel-3.44-3.cm1.x86_64.rpm
|
||||
nss-libs-3.44-3.cm1.x86_64.rpm
|
||||
openjdk8-1.8.0.212-13.cm1.x86_64.rpm
|
||||
openjdk8-debuginfo-1.8.0.212-13.cm1.x86_64.rpm
|
||||
openjdk8-doc-1.8.0.212-13.cm1.x86_64.rpm
|
||||
openjdk8-sample-1.8.0.212-13.cm1.x86_64.rpm
|
||||
openjdk8-src-1.8.0.212-13.cm1.x86_64.rpm
|
||||
openjre8-1.8.0.212-13.cm1.x86_64.rpm
|
||||
openjdk8-1.8.0.212-14.cm1.x86_64.rpm
|
||||
openjdk8-debuginfo-1.8.0.212-14.cm1.x86_64.rpm
|
||||
openjdk8-doc-1.8.0.212-14.cm1.x86_64.rpm
|
||||
openjdk8-sample-1.8.0.212-14.cm1.x86_64.rpm
|
||||
openjdk8-src-1.8.0.212-14.cm1.x86_64.rpm
|
||||
openjre8-1.8.0.212-14.cm1.x86_64.rpm
|
||||
openssl-1.1.1g-7.cm1.x86_64.rpm
|
||||
openssl-debuginfo-1.1.1g-7.cm1.x86_64.rpm
|
||||
openssl-devel-1.1.1g-7.cm1.x86_64.rpm
|
||||
|
|
|
|||
Loading…
Reference in New Issue