Use %{name} macro where appropriate

This commit is contained in:
Mikolaj Izdebski 2023-12-13 07:26:40 +01:00
parent f2abd5cf95
commit 57e61541d1

View File

@ -1,8 +1,8 @@
%bcond_with bootstrap %bcond_with bootstrap
%global bundled_slf4j_version 1.7.36 %global bundled_slf4j_version 1.7.36
%global homedir %{_datadir}/%{name}%{?maven_version_suffix} %global homedir %{_datadir}/maven%{?maven_version_suffix}
%global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix} %global confdir %{_sysconfdir}/maven%{?maven_version_suffix}
Name: maven Name: maven
Epoch: 1 Epoch: 1
@ -16,7 +16,7 @@ URL: https://maven.apache.org/
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch ExclusiveArch: %{java_arches} noarch
Source0: https://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz Source0: https://archive.apache.org/dist/maven/maven-3/%{version}/source/apache-maven-%{version}-src.tar.gz
Source1: maven-bash-completion Source1: maven-bash-completion
Source2: mvn.1 Source2: mvn.1
@ -114,11 +114,11 @@ Core part of Apache Maven that can be used as a library.
%package openjdk8 %package openjdk8
Summary: OpenJDK 8 binding for Maven Summary: OpenJDK 8 binding for Maven
RemovePathPostfixes: -openjdk8 RemovePathPostfixes: -openjdk8
Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Provides: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
Requires: maven = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: java-1.8.0-openjdk-headless Requires: java-1.8.0-openjdk-headless
Recommends: java-1.8.0-openjdk-devel Recommends: java-1.8.0-openjdk-devel
Conflicts: maven-jdk-binding Conflicts: %{name}-jdk-binding
%description openjdk8 %description openjdk8
Configures Maven to run with OpenJDK 8. Configures Maven to run with OpenJDK 8.
@ -126,11 +126,11 @@ Configures Maven to run with OpenJDK 8.
%package openjdk11 %package openjdk11
Summary: OpenJDK 11 binding for Maven Summary: OpenJDK 11 binding for Maven
RemovePathPostfixes: -openjdk11 RemovePathPostfixes: -openjdk11
Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Provides: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
Requires: maven = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: java-11-openjdk-headless Requires: java-11-openjdk-headless
Recommends: java-11-openjdk-devel Recommends: java-11-openjdk-devel
Conflicts: maven-jdk-binding Conflicts: %{name}-jdk-binding
%description openjdk11 %description openjdk11
Configures Maven to run with OpenJDK 11. Configures Maven to run with OpenJDK 11.
@ -138,11 +138,11 @@ Configures Maven to run with OpenJDK 11.
%package openjdk17 %package openjdk17
Summary: OpenJDK 17 binding for Maven Summary: OpenJDK 17 binding for Maven
RemovePathPostfixes: -openjdk17 RemovePathPostfixes: -openjdk17
Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Provides: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
Requires: maven = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: java-17-openjdk-headless Requires: java-17-openjdk-headless
Recommends: java-17-openjdk-devel Recommends: java-17-openjdk-devel
Conflicts: maven-jdk-binding Conflicts: %{name}-jdk-binding
%description openjdk17 %description openjdk17
Configures Maven to run with OpenJDK 17. Configures Maven to run with OpenJDK 17.
@ -150,11 +150,11 @@ Configures Maven to run with OpenJDK 17.
%package openjdk21 %package openjdk21
Summary: OpenJDK 21 binding for Maven Summary: OpenJDK 21 binding for Maven
RemovePathPostfixes: -openjdk21 RemovePathPostfixes: -openjdk21
Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Provides: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
Requires: maven = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: java-21-openjdk-headless Requires: java-21-openjdk-headless
Recommends: java-21-openjdk-devel Recommends: java-21-openjdk-devel
Conflicts: maven-jdk-binding Conflicts: %{name}-jdk-binding
%description openjdk21 %description openjdk21
Configures Maven to run with OpenJDK 21. Configures Maven to run with OpenJDK 21.
@ -162,7 +162,7 @@ Configures Maven to run with OpenJDK 21.
%{?javadoc_package} %{?javadoc_package}
%prep %prep
%setup -q -n apache-%{name}-%{version} %setup -q -n apache-maven-%{version}
find -name '*.java' -exec sed -i 's/\r//' {} + find -name '*.java' -exec sed -i 's/\r//' {} +
find -name 'pom.xml' -exec sed -i 's/\r//' {} + find -name 'pom.xml' -exec sed -i 's/\r//' {} +