From e61555f61762c522a6aca95d880eab23c18185f8 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 21 Oct 2024 14:12:29 +0200 Subject: [PATCH] Adjsuted for rhel --- adoptium-temurin-java-repository.conf | 3 --- adoptium-temurin-java-repository.repo | 2 +- adoptium-temurin-java-repository.spec | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 adoptium-temurin-java-repository.conf diff --git a/adoptium-temurin-java-repository.conf b/adoptium-temurin-java-repository.conf deleted file mode 100644 index c85aef8..0000000 --- a/adoptium-temurin-java-repository.conf +++ /dev/null @@ -1,3 +0,0 @@ -[adoptium-temurin-java-repository] -type=dnf - diff --git a/adoptium-temurin-java-repository.repo b/adoptium-temurin-java-repository.repo index 8bfddf0..67c9c67 100644 --- a/adoptium-temurin-java-repository.repo +++ b/adoptium-temurin-java-repository.repo @@ -1,6 +1,6 @@ [adoptium-temurin-java-repository] name=Adoptium -baseurl=https://packages.adoptium.net/artifactory/rpm/fedora/$releasever/$basearch +baseurl=https://packages.adoptium.net/artifactory/rpm/rhel/$releasever/$basearch enabled=0 gpgcheck=1 gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public diff --git a/adoptium-temurin-java-repository.spec b/adoptium-temurin-java-repository.spec index 8407171..4a8fdc1 100644 --- a/adoptium-temurin-java-repository.spec +++ b/adoptium-temurin-java-repository.spec @@ -1,6 +1,5 @@ %global reponame %{name}.repo %global repodir %{_sysconfdir}/yum.repos.d -%global thirdparty %{_prefix}/lib/fedora-third-party/conf.d # 0/1 may vary in time, and is always enabled to 1 per FESCO exception %global enabled_by_default 0 @@ -12,14 +11,10 @@ Summary: Fedora package repository files for yum and dnf along with gpg publi License: EPL-2.0 URL: https://adoptium.net/installation/linux/#_centosrhelfedora_instructions Source0: LICENSE -Source1: %{name}.conf Source2: %{reponame} Source3: README.md BuildArch: noarch -# fedora-third-party contains tools to work with 3rd party repos and owns fedora-third-party/conf.d/ directory -Requires: fedora-third-party - %description This package adds configuration to add a remote repository @@ -35,13 +30,11 @@ cat %{SOURCE2} | sed "s/^enabled=0/enabled=%{enabled_by_default}/" > %{reponame %install install -D -m0644 %{SOURCE0} %{buildroot}%{_datadir}/licenses/%{name}/LICENSE -install -D -m0644 %{SOURCE1} -t %{buildroot}%{thirdparty}/ install -D -m0644 %{reponame} -t %{buildroot}%{repodir}/ install -D -m0644 %{SOURCE3} -t %{buildroot}%{_docdir}/%{name}/ %files %license LICENSE -%{thirdparty}/* %config %{repodir}/%{reponame} %doc README.md