[rpmfusion-nonfree-release/f33] Remove livna
by Leigh Scott
commit 2722a6fa819cd1a29a6f90a3917f30196b029ecb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 21 15:15:25 2020 +0100
Remove livna
rpmfusion-nonfree-release.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 4764d38..42e39c8 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -43,10 +43,6 @@ This package provides the RPM Fusion rawhide %{_repo} repo definitions.
%package tainted
Summary: RPM Fusion %{_repo} Tainted repo definition
Requires: %{name} = %{version}-%{release}
-%if %{_repo} == "free"
-Obsoletes: livna-release < 1:1-2
-Provides: livna-release = 1:1-2
-%endif
%description tainted
This package provides the RPM Fusion %{_repo} Tainted repo definitions.
4 years, 3 months
[rpmfusion-nonfree-release] Remove livna
by Leigh Scott
commit ceddc9153e6cc851449259a6295a749a88b615eb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 21 15:15:25 2020 +0100
Remove livna
rpmfusion-nonfree-release.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index f916445..a8addae 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -43,10 +43,6 @@ This package provides the RPM Fusion rawhide %{_repo} repo definitions.
%package tainted
Summary: RPM Fusion %{_repo} Tainted repo definition
Requires: %{name} = %{version}-%{release}
-%if %{_repo} == "free"
-Obsoletes: livna-release < 1:1-2
-Provides: livna-release = 1:1-2
-%endif
%description tainted
This package provides the RPM Fusion %{_repo} Tainted repo definitions.
4 years, 3 months
[rpmfusion-free-release/f33] Remove livna
by Leigh Scott
commit d3ddd1c73cb4644f79bc55bb37fbbe38be530efe
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 21 15:13:32 2020 +0100
Remove livna
rpmfusion-free-release.spec | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index d845b96..a4c4e55 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -1,5 +1,5 @@
%global _repo free
-#global repo nonfree
+#global _repo nonfree
%global israwhide 0
Name: rpmfusion-%{_repo}-release
@@ -43,10 +43,6 @@ This package provides the RPM Fusion rawhide %{_repo} repo definitions.
%package tainted
Summary: RPM Fusion %{_repo} Tainted repo definition
Requires: %{name} = %{version}-%{release}
-%if %{_repo} == "free"
-Obsoletes: livna-release < 1:1-2
-Provides: livna-release = 1:1-2
-%endif
%description tainted
This package provides the RPM Fusion %{_repo} Tainted repo definitions.
4 years, 3 months
[rpmfusion-free-release] Remove livna
by Leigh Scott
commit b4354c4b12a867923c3ba3bb4fd98b3dad68b491
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 21 15:11:05 2020 +0100
Remove livna
rpmfusion-free-release.spec | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 04c6663..0038be3 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -1,5 +1,5 @@
%global _repo free
-#global repo nonfree
+#global _repo nonfree
%global israwhide 1
Name: rpmfusion-%{_repo}-release
@@ -43,10 +43,6 @@ This package provides the RPM Fusion rawhide %{_repo} repo definitions.
%package tainted
Summary: RPM Fusion %{_repo} Tainted repo definition
Requires: %{name} = %{version}-%{release}
-%if %{_repo} == "free"
-Obsoletes: livna-release < 1:1-2
-Provides: livna-release = 1:1-2
-%endif
%description tainted
This package provides the RPM Fusion %{_repo} Tainted repo definitions.
4 years, 3 months
[buildsys-build-rpmfusion] Fix updates script
by Leigh Scott
commit 81fb68f9182c9e767666fda44651c0b3a2e963d7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 21 14:24:21 2020 +0100
Fix updates script
update-to-latest-kernels.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/update-to-latest-kernels.sh b/update-to-latest-kernels.sh
index 0fb6f63..8f250dd 100755
--- a/update-to-latest-kernels.sh
+++ b/update-to-latest-kernels.sh
@@ -29,4 +29,4 @@ rm clog
rfpkg push
branch=$(git rev-parse --abbrev-ref HEAD)
[ $branch == "master" ] && branch=rawhide
-rfpkg build --target ${branch}-free
+rfpkg build --target ${branch}-free-multilibs
4 years, 3 months
[rpmfusion-nonfree-release/f33] Switch to branch layout
by Leigh Scott
commit 3b23f40761c56bba449377f8eeee6be0375ddfaf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 21 14:05:00 2020 +0100
Switch to branch layout
rpmfusion-nonfree-rawhide.repo | 2 +-
rpmfusion-nonfree-release.spec | 7 +++++--
rpmfusion-nonfree-updates-testing.repo | 2 +-
rpmfusion-nonfree.repo | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/rpmfusion-nonfree-rawhide.repo b/rpmfusion-nonfree-rawhide.repo
index 391cb3e..adb2f06 100644
--- a/rpmfusion-nonfree-rawhide.repo
+++ b/rpmfusion-nonfree-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-rawhi...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index cecd5e4..4764d38 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -1,10 +1,10 @@
#global _repo free
%global _repo nonfree
-%global israwhide 1
+%global israwhide 0
Name: rpmfusion-%{_repo}-release
Version: 33
-Release: 0.2
+Release: 0.3
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
@@ -104,6 +104,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Fri Aug 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 33-0.3
+- Switch to branch layout
+
* Fri Feb 21 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 33-0.2
- Rebuild for 2020 key
diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo
index 90ba1c0..36e4d55 100644
--- a/rpmfusion-nonfree-updates-testing.repo
+++ b/rpmfusion-nonfree-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree.repo b/rpmfusion-nonfree.repo
index 5f73f00..239b8fb 100644
--- a/rpmfusion-nonfree.repo
+++ b/rpmfusion-nonfree.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$rele...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
4 years, 3 months
[rpmfusion-nonfree-release] Bump for 34
by Leigh Scott
commit ebe6837492af993f49354e88fa1dfde7d2401e18
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 21 13:58:34 2020 +0100
Bump for 34
rpmfusion-nonfree-release.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index cecd5e4..f916445 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -3,8 +3,8 @@
%global israwhide 1
Name: rpmfusion-%{_repo}-release
-Version: 33
-Release: 0.2
+Version: 34
+Release: 0.1
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
@@ -104,6 +104,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Fri Aug 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 34-0.1
+- Bump for 34
+
* Fri Feb 21 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 33-0.2
- Rebuild for 2020 key
4 years, 3 months
[rpmfusion-nonfree-release] Fix: bare words are no longer supported
by Leigh Scott
commit be8bb17eebcd8f6806606ade7b5df3e1888ab94c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 21 13:56:25 2020 +0100
Fix: bare words are no longer supported
rpmfusion-nonfree-release.spec | 54 +++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index c360964..cecd5e4 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -1,25 +1,25 @@
-#global repo free
-%global repo nonfree
+#global _repo free
+%global _repo nonfree
%global israwhide 1
-Name: rpmfusion-%{repo}-release
+Name: rpmfusion-%{_repo}-release
Version: 33
Release: 0.2
-Summary: RPM Fusion (%{repo}) Repository Configuration
+Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
URL: http://rpmfusion.org
-Source1: rpmfusion-%{repo}.repo
-Source2: rpmfusion-%{repo}-updates.repo
-Source3: rpmfusion-%{repo}-updates-testing.repo
-Source4: rpmfusion-%{repo}-rawhide.repo
-Source5: rpmfusion-%{repo}-tainted.repo
-Source32: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-32-primary
-Source33: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-2020
+Source1: rpmfusion-%{_repo}.repo
+Source2: rpmfusion-%{_repo}-updates.repo
+Source3: rpmfusion-%{_repo}-updates-testing.repo
+Source4: rpmfusion-%{_repo}-rawhide.repo
+Source5: rpmfusion-%{_repo}-tainted.repo
+Source32: RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-32-primary
+Source33: RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-2020
BuildArch: noarch
Requires: system-release(%{version})
-Provides: rpmfusion-%{repo}-repos(%{version})
+Provides: rpmfusion-%{_repo}-repos(%{version})
%if 0%{?israwhide}
Obsoletes: %{name}-rawhide < %{version}-%{release}
@@ -27,29 +27,29 @@ Provides: %{name}-rawhide = %{version}-%{release}
%endif
%description
-RPM Fusion %{repo} package repository files for yum and dnf
+RPM Fusion %{_repo} package repository files for yum and dnf
along with gpg public keys
%if ! 0%{?israwhide}
%package rawhide
-Summary: RPM Fusion Rawhide %{repo} repo definitions
+Summary: RPM Fusion Rawhide %{_repo} repo definitions
Requires: %{name} = %{version}-%{release}
%description rawhide
-This package provides the RPM Fusion rawhide %{repo} repo definitions.
+This package provides the RPM Fusion rawhide %{_repo} repo definitions.
%endif
%package tainted
-Summary: RPM Fusion %{repo} Tainted repo definition
+Summary: RPM Fusion %{_repo} Tainted repo definition
Requires: %{name} = %{version}-%{release}
-%if %{repo} == "free"
+%if %{_repo} == "free"
Obsoletes: livna-release < 1:1-2
Provides: livna-release = 1:1-2
%endif
%description tainted
-This package provides the RPM Fusion %{repo} Tainted repo definitions.
+This package provides the RPM Fusion %{_repo} Tainted repo definitions.
%prep
echo "Nothing to prep"
@@ -71,13 +71,13 @@ install -d -m755 \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-32
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-33
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-34
+ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-32
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-33
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-34
# Links for the keys
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-latest
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-rawhide
# Yum .repo files
@@ -92,16 +92,16 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%files
%config %{_sysconfdir}/pki/rpm-gpg/*
-%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-updates*.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-updates*.repo
%if ! 0%{?israwhide}
%files rawhide
%endif
-%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-rawhide.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-rawhide.repo
%files tainted
-%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
* Fri Feb 21 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 33-0.2
4 years, 3 months
[rpmfusion-nonfree-release] Add new key and remove old key
by Leigh Scott
commit 0141526f4b6262c6d1b2ec67eebdc9726b1987a3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 23 23:19:32 2020 +0100
Add new key and remove old key
rpmfusion-nonfree-release.spec | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 771426f..c360964 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -14,7 +14,6 @@ Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
Source5: rpmfusion-%{repo}-tainted.repo
-Source31: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-31-primary
Source32: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-32-primary
Source33: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-2020
BuildArch: noarch
@@ -67,18 +66,17 @@ install -d -m755 \
# GPG Key
%{__install} -Dp -m644 \
- %{SOURCE31} \
%{SOURCE32} \
%{SOURCE33} \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-31
ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-32
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-33
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-34
# Links for the keys
-ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide
4 years, 3 months