diff --git a/anda/terra/release/terra-extra.repo b/anda/terra/release/terra-extra.repo deleted file mode 100644 index 60dedad5a6..0000000000 --- a/anda/terra/release/terra-extra.repo +++ /dev/null @@ -1,26 +0,0 @@ -[terra-extra] -name=Terra $releasever (Extra) -#baseurl=https://repos.fyralabs.com/terra$releasever -metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever&arch=$basearch -metadata_expire=6h -type=rpm -gpgcheck=1 -gpgkey=https://repos.fyralabs.com/terra$releasever-extra/key.asc -repo_gpgcheck=1 -enabled=1 -enabled_metadata=1 -countme=1 -priority=150 - -[terra-extra-source] -name=Terra $releasever (Extra) - Source -#baseurl=https://repos.fyralabs.com/terra$releasever-source -metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-extras-source&arch=$basearch -metadata_expire=6h -type=rpm -gpgcheck=1 -gpgkey=https://repos.fyralabs.com/terra$releasever-source/key.asc -repo_gpgcheck=1 -enabled=0 -enabled_metadata=0 -priority=150 diff --git a/anda/terra/release/terra-extras.repo b/anda/terra/release/terra-extras.repo new file mode 100644 index 0000000000..0251d65403 --- /dev/null +++ b/anda/terra/release/terra-extras.repo @@ -0,0 +1,26 @@ +[terra-extras] +name=Terra $releasever (Extras) +#baseurl=https://repos.fyralabs.com/terra$releasever-extras +metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-extras&arch=$basearch +metadata_expire=6h +type=rpm +gpgcheck=1 +gpgkey=https://repos.fyralabs.com/terra$releasever-extras/key.asc +repo_gpgcheck=1 +enabled=1 +enabled_metadata=1 +countme=1 +priority=150 + +[terra-extras-source] +name=Terra $releasever (Extras) - Source +#baseurl=https://repos.fyralabs.com/terra$releasever-extras-source +metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-extras-source&arch=$basearch +metadata_expire=6h +type=rpm +gpgcheck=1 +gpgkey=https://repos.fyralabs.com/terra$releasever-extras-source/key.asc +repo_gpgcheck=1 +enabled=0 +enabled_metadata=0 +priority=150 diff --git a/anda/terra/release/terra-release.spec b/anda/terra/release/terra-release.spec index b39de101b2..e1560c7269 100644 --- a/anda/terra/release/terra-release.spec +++ b/anda/terra/release/terra-release.spec @@ -1,12 +1,12 @@ Name: terra-release Version: 42 -Release: 2 +Release: 3 Summary: Release package for Terra License: MIT URL: https://terra.fyralabs.com Source0: terra.repo -Source1: terra-extra.repo +Source1: terra-extras.repo BuildArch: noarch %dnl We probably shouldn't do this in Rawhide! @@ -15,10 +15,12 @@ BuildArch: noarch %description Release package for Terra, containing the Terra repository configuration. -%package extra +%package extras Summary: Release package for Terra Extra +Obsoletes: terra-release-extra < 42-3 +Provides: terra-release-extra = %version-%release -%description extra +%description extras Release package for Terra Extra, which is a repository with packages that might cause conflict with Fedora. @@ -33,8 +35,8 @@ install -Dpm644 -t %buildroot%_sysconfdir/yum.repos.d %SOURCE1 %files %config(noreplace) %{_sysconfdir}/yum.repos.d/terra.repo -%files extra -%config(noreplace) %{_sysconfdir}/yum.repos.d/terra-extra.repo +%files extras +%config(noreplace) %{_sysconfdir}/yum.repos.d/terra-extras.repo %changelog * Fri Oct 25 2024 madonuko - 42-2