PR#24: avoid manually symlinking required libraries - rpms/maven

rpms / maven

#24 avoid manually symlinking required libraries

Closed 2 years ago by decathorpe. Opened 2 years ago by decathorpe.

Unknown source master into master

avoid manually symlinking required libraries

Fabio Valentini • 2 years ago

8222926

maven.spec

file modified

+4 -56

		`@@ -7,7 +7,7 @@`
		`Name: maven`
		`Epoch: 1`
		`Version: 3.6.3`
		`- Release: 5%{?dist}`
		`+ Release: 6%{?dist}`
		`Summary: Java project management and project comprehension tool`
		`# maven itself is ASL 2.0`
		`# bundled slf4j is MIT`
		`@@ -87,50 +87,6 @@`
		`# workflow requires full JDK, so we recommend it here.`
		`%{?fedora:Recommends}%{!?fedora:Requires}: java-devel`

		`- # XMvn does generate auto-requires, but explicit requires are still`
		`- # needed because some symlinked JARs are not present in Maven POMs or`
		`- # their dependency scope prevents them from being added automatically`
		`- # by XMvn. It would be possible to explicitly specify only`
		`- # dependencies which are not generated automatically, but adding`
		`- # everything seems to be easier.`
		`- Requires: aopalliance`
		`- Requires: apache-commons-cli`
		`- Requires: apache-commons-codec`
		`- Requires: apache-commons-io`
		`- Requires: apache-commons-lang3`
		`- Requires: apache-commons-logging`
		`- Requires: atinject`
		`- Requires: cdi-api`
		`- Requires: jakarta-annotations`
		`- Requires: google-guice`
		`- Requires: guava`
		`- Requires: hawtjni-runtime`
		`- Requires: httpcomponents-client`
		`- Requires: httpcomponents-core`
		`- Requires: jansi`
		`- Requires: jansi-native`
		`- Requires: jcl-over-slf4j`
		`- Requires: maven-resolver-api`
		`- Requires: maven-resolver-connector-basic`
		`- Requires: maven-resolver-impl`
		`- Requires: maven-resolver-spi`
		`- Requires: maven-resolver-transport-wagon`
		`- Requires: maven-resolver-util`
		`- Requires: maven-shared-utils`
		`- Requires: maven-wagon-file`
		`- Requires: maven-wagon-http`
		`- Requires: maven-wagon-http-shared`
		`- Requires: maven-wagon-provider-api`
		`- Requires: plexus-cipher`
		`- Requires: plexus-classworlds`
		`- Requires: plexus-containers-component-annotations`
		`- Requires: plexus-interpolation`
		`- Requires: plexus-sec-dispatcher`
		`- Requires: plexus-utils`
		`- Requires: sisu-inject`
		`- Requires: sisu-plexus`
		`- Requires: slf4j`
		`-`
		`%description`
		`Maven is a software project management and comprehension tool. Based on the`
		`concept of a project object model (POM), Maven can manage a project's build,`
		`@@ -234,17 +190,6 @@`
		`cp -a $M2_HOME/{bin,lib,boot} %{buildroot}%{homedir}/`
		`xmvn-subst -R %{buildroot} -s %{buildroot}%{homedir}`

		`- # Transitive deps of wagon-http, missing because of unshading`
		`- build-jar-repository -s -p %{buildroot}%{homedir}/lib \`
		`- commons-{codec,logging} httpcomponents/{httpclient,httpcore} maven-wagon/http-shared`
		`-`
		`- # Transitive deps of cdi-api that should have been excluded`
		`- rm %{buildroot}%{homedir}/lib/jakarta.interceptor-api*.jar`
		`- rm %{buildroot}%{homedir}/lib/javax.el-api*.jar`
		`-`
		`- # Native lib whose extraction we suppressed`
		`- ln -s %{_jnidir}/jansi-native/jansi-linux.jar %{buildroot}%{homedir}/lib/`
		`-`
		`install -p -m 644 %{SOURCE2} %{buildroot}%{homedir}/bin/`
		`gzip -9 %{buildroot}%{homedir}/bin/mvn.1`
		`install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/mvn%{?maven_version_suffix}`
		`@@ -294,6 +239,9 @@`


		`%changelog`
		`+ * Sun Oct 11 2020 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.3-6`
		`+ - Avoid manually symlinking required libraries.`
		`+`
		`* Tue Aug 25 2020 Fabio Valentini <decathorpe@gmail.com> - 1:3.6.3-5`
		`- Adapt to cdi-api switch from jboss-interceptor to jakarta-interceptor.`