commit 42b457a623c6d74de173d95708d51b8b038b604e
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Jun 19 15:56:35 2018 +0200
Don't use $releasever, it's not expanding as expected on RHEL
rpmfusion-nonfree-release.spec | 5 ++++-
rpmfusion-nonfree-tainted.repo | 24 ++++++++++++------------
2 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 53b6b6d..7659742 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -3,7 +3,7 @@
Name: rpmfusion-%{repo}-release
Version: 6
-Release: 3
+Release: 4
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Tue Jun 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 6-4
+- Don't use $releasever, it's not expanding as expected on RHEL (RFBZ#4943).
+
* Tue Jun 19 2018 Xavier Bachelot <xavier(a)bachelot.org> - 6-3
- Only include tainted repo definition in tainted sub-package.
diff --git a/rpmfusion-nonfree-tainted.repo b/rpmfusion-nonfree-tainted.repo
index be62770..447d065 100644
--- a/rpmfusion-nonfree-tainted.repo
+++ b/rpmfusion-nonfree-tainted.repo
@@ -1,33 +1,33 @@
[rpmfusion-nonfree-tainted]
-name=RPM Fusion for EL $releasever - Nonfree tainted
-#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-$releasever&arch=$basearch
+name=RPM Fusion for EL 6 - Nonfree tainted
+#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/6/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-6&arch=$basearch
enabled=1
metadata_expire=6h
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
[rpmfusion-nonfree-tainted-debuginfo]
-name=RPM Fusion for EL $releasever - Nonfree tainted - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-debug-$releasever&arch=$basearch
+name=RPM Fusion for EL 6 - Nonfree tainted - Debug
+#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/6/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-debug-6&arch=$basearch
enabled=0
metadata_expire=6h
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
[rpmfusion-nonfree-tainted-source]
-name=RPM Fusion for EL $releasever - Nonfree tainted - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-source-$releasever&arch=$basearch
+name=RPM Fusion for EL 6 - Nonfree tainted - Source
+#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/6/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-source-6&arch=$basearch
enabled=0
metadata_expire=6h
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
Show replies by date