Fridrich Strba 2022-03-11 15:44:32 +00:00 committed by Git OBS Bridge
parent e3f35d58fc
commit afdf4e6ed8
4 changed files with 12 additions and 20 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:daa7b09904a2e95deafaa2f0370679738da5f007b38e39627ddfbfd0eea6d061
size 96692

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c208cb22e0102c529c2851df6c94688fba3318c4954f12616645d6281d75c90
size 91627

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ca3f261c2ae42ff83deea281665bf5385848beb0976232645cda74b2c1c457de oid sha256:d1c62ddd3528f3226d2906174181b1064ef0e5a02189a2c65015858331721095
size 3528 size 3456

View File

@ -17,11 +17,9 @@
Name: plexus-compiler Name: plexus-compiler
Version: 2.8.8 Version: 2.11.1
Release: 0 Release: 0
Summary: Compiler call initiators for Plexus Summary: Compiler call initiators for Plexus
# extras subpackage has a bit different licensing
# parts of compiler-api are ASL2.0/MIT
License: Apache-2.0 AND MIT License: Apache-2.0 AND MIT
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: https://github.com/codehaus-plexus/plexus-compiler URL: https://github.com/codehaus-plexus/plexus-compiler
@ -48,10 +46,7 @@ additional compilers see %{name}-extras package.
%package extras %package extras
Summary: Extra compiler support for %{name} Summary: Extra compiler support for %{name}
# ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/ License: Apache-2.0
# ...codehaus/plexus/compiler/csharp/CSharpCompiler.java
# ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java
License: Apache-1.1 AND Apache-2.0 AND MIT
Group: Development/Libraries/Java Group: Development/Libraries/Java
Requires: mvn(org.codehaus.plexus:plexus-compiler-api) = %{version} Requires: mvn(org.codehaus.plexus:plexus-compiler-api) = %{version}
Requires: mvn(org.codehaus.plexus:plexus-utils) Requires: mvn(org.codehaus.plexus:plexus-utils)
@ -88,8 +83,7 @@ cp %{SOURCE2} LICENSE.MIT
for i in plexus-compiler-api plexus-compiler-manager plexus-compiler-test \ for i in plexus-compiler-api plexus-compiler-manager plexus-compiler-test \
plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \
plexus-compilers/plexus-compiler-jikes plexus-compilers/plexus-compiler-javac \ plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
plexus-compilers/plexus-compiler-j2objc; do
%pom_remove_parent ${i} %pom_remove_parent ${i}
%pom_xpath_inject "pom:project" "<version>%{version}</version><groupId>org.codehaus.plexus</groupId>" ${i} %pom_xpath_inject "pom:project" "<version>%{version}</version><groupId>org.codehaus.plexus</groupId>" ${i}
done done
@ -112,16 +106,15 @@ build-jar-repository -s lib plexus/utils plexus/classworlds \
install -dm 0755 %{buildroot}%{_javadir}/%{name} install -dm 0755 %{buildroot}%{_javadir}/%{name}
for i in plexus-compiler-api plexus-compiler-manager \ for i in plexus-compiler-api plexus-compiler-manager \
plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \
plexus-compilers/plexus-compiler-jikes plexus-compilers/plexus-compiler-javac \ plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
plexus-compilers/plexus-compiler-j2objc; do
install -pm 0644 ${i}/target/$(basename ${i})-%{version}.jar %{buildroot}%{_javadir}/%{name}/$(basename ${i}).jar install -pm 0644 ${i}/target/$(basename ${i})-%{version}.jar %{buildroot}%{_javadir}/%{name}/$(basename ${i}).jar
done done
# poms # poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
# These ones belong to the *-extras package # These ones belong to the *-extras package
for i in plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ for i in plexus-compilers/plexus-compiler-csharp \
plexus-compilers/plexus-compiler-jikes; do plexus-compilers/plexus-compiler-eclipse; do
bsnm=$(basename ${i}) bsnm=$(basename ${i})
install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom
%add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras
@ -137,8 +130,7 @@ done
# javadoc # javadoc
for i in plexus-compiler-api plexus-compiler-manager \ for i in plexus-compiler-api plexus-compiler-manager \
plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \
plexus-compilers/plexus-compiler-jikes plexus-compilers/plexus-compiler-javac \ plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
plexus-compilers/plexus-compiler-j2objc; do
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i}
cp -pr ${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ cp -pr ${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/
done done