[rpmfusion-free-release] Update for rawhide
by Nicolas Chauvet
commit 16229b62119463ac6a69e8665f8c60ca6554f6e9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 18 19:07:47 2016 +0100
Update for rawhide
RPM-GPG-KEY-rpmfusion-free-fedora-23-primary | 30 ----------
RPM-GPG-KEY-rpmfusion-free-fedora-24-primary | 30 ----------
RPM-GPG-KEY-rpmfusion-free-fedora-26-primary | 29 +++++++++
RPM-GPG-KEY-rpmfusion-free-fedora-27-primary | 30 ++++++++++
rpmfusion-free-release.spec | 89 ++++++++++++++++------------
5 files changed, 110 insertions(+), 98 deletions(-)
---
diff --git a/RPM-GPG-KEY-rpmfusion-free-fedora-26-primary b/RPM-GPG-KEY-rpmfusion-free-fedora-26-primary
new file mode 100644
index 0000000..3b5a1f1
--- /dev/null
+++ b/RPM-GPG-KEY-rpmfusion-free-fedora-26-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFgvIx8BEADF4nXuAiSwzP2Z/kJ+L9nAotobbarVbwZVqYOs21vkynqjsaxl
+tiLAGqDbL6YYS1SULd/7mytFzHQybfnQX1UlBWihrNw8CDYJBff9XTtHbg3oDlC6
+H9XvxSWicz+/N4jRD5u7wsml+j5H936L6hQBumgjCh1gouwpc1CBy2TFYZNRgSrC
+rm35gE5YAF1yLjy6WIeABpnLLNNWZguwWrMmLocYTrwqOY7kIJFtQemfgX4MRNUr
+aH9rLeMyMf0kCpJ/NDKU6+lTzYFVJsGtSpNivZCEkpH5gMsPcraNvcj44D0Jih3W
+s0igflzR411GP1Kvc8O4/RKla3yzw5KrfxhLaRIkVt0zxPxE4+6IAq0H9ClKVxCB
+urhtiIrH8mQiqqHjg9UgIz+VYHPy+qYRmor19hDj1Iyyxg6hdxHsVyxgxQ18+IE3
+3KHAZq8RCB7jE49bKGLJLwxJ9eet7HzpX3e8WRDIQdz3mUIjFVXn1SDvdbuatIxo
+Eb8aaFN+S9ul32376fDR3G1BSx9I5NXNgHiYRx/oA7hGFsXbq33FAXCltIWBB3az
++dxLLhmkKmIFw6mhmf/QEI5HvSaPU7FBOv3nazpsk0F5bivGjReaDKRUhtHSdlXv
+mxvdbfnYRF8iBMf17fB5chawu6mt8iA0/a1QNi1jrFvzWZwbF5Y6HhsM6wARAQAB
+tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyNikgPHJw
+bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCMgQTAQIAHAUC
+WC8jHwIbAwQLCQgHAxUICgMWAgACHgECF4AACgkQIMfJ1paQ5K/QeQ//eDMsZEn+
+IX2aMhzmLe2Sg78OX/Ky2TON8CrWzt5QcS3pXfNTzX1rfSVaXEX5+J1f52/Lzvjb
+cRkAGHr5x5jxFdjbJngp50QFN6xJwMga/cELzGah/j7TGo9om7hIta64uvPgqhec
+KreQ9g89PSNfHQdDAb19iNkm6Jt92P7Rur511pJu4+2JSI90z4tfUCGVfQxgCrfu
+NQ0SWThjXEV5FSFMtnScffvd5DOapWtJOmRNX4tlGUF8hYJN3QVXKItwn5Rvq+u+
+cnaoqIrfDjM5VEF2ZlJHPSb9cDAqe1CKISIhh5vdfyDam4LRE6vWOhnmzHC5toVT
+Gc4ATeqh4plhaKmUldF1kMUuK36yvyjXwrgnewM4hmOedKS+aNydfvEGYTF3sfQW
+5V9NEYk27tGAzMbZhvt/17LmL4wV0dWxU6XKCJO+BUzRCwwLEVgsB6aSWP7fd8tl
+SNyt01jRdeJ7bYxOydewYh9IkczpGwB82m1V7D6syR7khhmTYFmmGiIRjQRUnq0P
+rGY4NtnLcLb/Yr5gX4MH8U94jew8Gh3vZnNgtCZxSnEMavYGPv4jZJB8L59Dj8kV
+/GhSrBWn4+DKXGSrWun3QHeoj9xzPgLkZgahQ6XaIpeRsbiSk3tk+9hkIyAj3D5y
+qouozmwaswI1gb7FkHj0Xg+Gs8kSJtaCfkY=
+=1lsn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-rpmfusion-free-fedora-27-primary b/RPM-GPG-KEY-rpmfusion-free-fedora-27-primary
new file mode 100644
index 0000000..b410fd3
--- /dev/null
+++ b/RPM-GPG-KEY-rpmfusion-free-fedora-27-primary
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQINBFgvJJQBEAC+RWjM9Aoj/VU64vXDsPJVv1mFtJoi75AWb/YUhTOkiV/nsBHQ
+Rku3rDHYdWzqXMA98sONCYE2sBFeI/O5UuAPORvt8572L56Eake1XMbnZHzrXWhU
+FZiC3O+aAUsUEYy35fEOT18I3CFPf8hpFyvL3ZvBou1okTgKBOiitj+d8P/o/UcP
+k+El8TLAp80Nsgzt9nfgmBYdLaNJr8/UXMVJMO/UsdnUC8s2ANcXQ15x64UMrAzF
+F9O/OdfQlXvXb3ATAsi9oPWdBl9YDWJrF3pb2XUIYNIZI3/aO+3xotkRJNXo8Gpi
+4A5Qh6UmIi/rU8mT0GYe33rGlhS7yK2fYAlgfvzv3LvQhF7MPFF36P1hWogweOVJ
+IdHFj15tcAHsKmQBeEPBY0pdckqtSF1q9Jy3y9GV9Z3cQdYv+RV6C01mVLjeWfVN
+cAMhZVoWe5uxxbDxt7Ptl1ukQX2nb2qu1wshMZdZgtBlGEvEhGpJYZppgZglYCHY
+waggUum3TxHt5xklwXhuRlRy0QeOQpMXOxiGL5Wc5J2bVLv40V45BZb48CB5ozix
+1aeYr9KBJ2V+UAoXi6OX7mUhq+H5TmdpBEkCL1H0w5Oa/cWzRGpZx8eb/bQkhWwd
+i0jgku9a0wAZsFw1SkmrFHDzm6rpQ9dW7avRJy2zuW8FqdFgjggHWPNPRwARAQAB
+tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyNykgPHJw
+bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCMgQTAQgAHAUC
+WC8klAIbAwQLCQgHAxUICgMWAgACHgECF4AACgkQHb3mBX2Dg3fiKQ//f2JMwPyu
+ZFM4LzngTszF4cSPDWSdKxOJDG9xIraVpM8G22BgTju95VvNXJdEmXDVuwYeQVL9
+U+UBPmM7Q/bFi2Zyhlv0S7DDpBkTeJUgRzBPpyzWeuEJomH36E8a6Q/mVN9Z7hc4
+lL/ke6flrFE5Xz1hmCbX0bYHMaPHVJtN38jh/mypu5j+b9fHnKLNkg1G8j0x/RdT
+gQEWs2qQV7YG6m13JknQ1V6HpK+gWAyZSoW4HRGgWuUrCI3cs7yMW29yFK4WZ9e5
+H+z/kxASfEjxHlBpncCUkrx55IXNld2GOcfr4j2s1DmfEuESgdKc7v008KSLiAQF
+Lx7RJFQjt8lh9G/qoZm1wXgSZ4z1w0fZggz57AsehEAj54dY0ZiYxyt6xd0k1Ih1
+HiXfas2Ey6kbB00ZATbqhaq0J3UYxF7BP3wYzbH2AexFkru+KdsPU+bBTxVycHlK
+tJG72yYTL8/ZzgBBJiqRJWtHuDDdlY1PlfbjXBgFPdbXJx+vvryoPAEsi5ly9nPg
+cw+jkkItyflBQ9uNaYQgn2QInt4eR9Vqnl3sRk7ueniIbZnzZ1jRm2X8zI9f4AGd
+5fC0IdLkMpgq/jknCgAr8P3DOIvOYKJLDJAGLkcskdzlxowB0eTznM+ACs9Uxyjy
+M99Aoesdo45i72vYWOOJ//Vl5RKzIC75Sbs=
+=Fu3d
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 629bc77..f41a51f 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -1,9 +1,10 @@
-%define repo free
-#define repo nonfree
+%global repo free
+#global repo nonfree
+%global israwhide 1
Name: rpmfusion-%{repo}-release
Version: 26
-Release: 0.3
+Release: 0.4
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -13,34 +14,31 @@ Source1: rpmfusion-%{repo}.repo
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
-Source23: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-23-primary
-Source24: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-24-primary
Source25: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-25-primary
+Source26: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-26-primary
+Source27: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-27-primary
BuildArch: noarch
-Requires: system-release >= %{version}
+Requires: system-release(%{version})
+Provides: rpmfusion-%{repo}-repos(%{version})
-
-%if %{repo} == "nonfree"
-Requires: rpmfusion-free-release >= %{version}
+%if 0%{?israwhide}
+Obsoletes: %{name}-rawhide < %{version}-%{release}
+Provides: %{name}-rawhide = %{version}-%{release}
+%endif
%description
-RPM Fusion repository contains open source and other distributable software for
-Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories.
-
-This package contains the RPM Fusion GPG key as well as Yum package manager
-configuration files for RPM Fusion's "nonfree" repository, which holds
-software that is not considered as Open Source Software according to the
-Fedora packaging guidelines.
-%else
-%description
-RPM Fusion repository contains open source and other distributable software for
-Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories.
+RPM Fusion %{repo} package repository files for yum and dnf
+along with gpg public keys
+
-This package contains the RPM Fusion GPG key as well as Yum package manager
-configuration files for RPM Fusion's "free" repository, which holds only
-software that is considered as Open Source Software according to the Fedora
-packaging guidelines.
+%if ! 0%{?israwhide}
+%package rawhide
+Summary: RPM Fusion Rawhide %{repo} repo definitions
+Requires: %{name} = %{version}-%{release}
+
+%description rawhide
+This package provides the RPM Fusion rawhide %{repo} repo definitions.
%endif
%prep
@@ -53,39 +51,54 @@ echo "Nothing to build"
# Create dirs
install -d -m755 \
- $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg \
- $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
+ %{buildroot}%{_sysconfdir}/pki/rpm-gpg \
+ %{buildroot}%{_sysconfdir}/yum.repos.d
# GPG Key
%{__install} -Dp -m644 \
- %{SOURCE23} \
- %{SOURCE24} \
%{SOURCE25} \
- $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
+ %{SOURCE26} \
+ %{SOURCE27} \
+ %{buildroot}%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE24}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE25}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE23}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-23
-ln -s $(basename %{SOURCE24}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-24
-ln -s $(basename %{SOURCE25}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-25
+ln -s $(basename %{SOURCE25}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-25
+ln -s $(basename %{SOURCE26}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-26
+ln -s $(basename %{SOURCE27}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-27
# Links for the keys
-ln -s $(basename %{SOURCE24}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
-ln -s $(basename %{SOURCE25}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide
+ln -s $(basename %{SOURCE26}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest
+ln -s $(basename %{SOURCE27}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide
# Yum .repo files
%{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
- $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
+ %{buildroot}%{_sysconfdir}/yum.repos.d
%files
-%{_sysconfdir}/pki/rpm-gpg/*
-%config(noreplace) %{_sysconfdir}/yum.repos.d/*
+%config %{_sysconfdir}/pki/rpm-gpg/*
+%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
%changelog
+* Fri Nov 18 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.4
+- Add f26/f27 keys
+- Remove f23/f24 keys
+- Clean-up Description
+- Improve Requires/Provides
+- Drop dependency on free from nonfree
+- Add a rawhide sub-package - rfbz#3223
+- Mark gpg keys as %%config
+
* Wed Nov 02 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 26-0.3
- Add metalinks over https
7 years, 5 months
[xorg-x11-drv-nvidia/f25: 5/5] fix merge
by Leigh Scott
commit 2320fc52a29a4f49fccb24f690fd948a14aa44e0
Merge: 039843e c329399
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Nov 18 17:56:13 2016 +0000
fix merge
.gitignore | 6 ++++++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 27 ++++++++++++++++++++-------
3 files changed, 29 insertions(+), 10 deletions(-)
---
7 years, 5 months
[xorg-x11-drv-nvidia/f25] (5 commits) ...fix merge
by Leigh Scott
Summary of changes:
2e7b89b... Update to 375.10 beta release (*)
9e01fee... /etc/glvnd/egl_vendor.d/10_nvidia.json (*)
c8a9eb7... Add glvnd/egl_vendor.d file (*)
c329399... Update to 375.20 (*)
2320fc5... fix merge
(*) This commit already existed in another branch; no separate mail sent
7 years, 5 months
[nvidia-kmod] Update to 375.20
by Leigh Scott
commit ab65b908ebdab3cd29621624a57c2ec63a91a5e9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Nov 18 17:49:20 2016 +0000
Update to 375.20
nvidia-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index f78ab64..cb278af 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 375.10
+Version: 375.20
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Nov 18 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.20-1
+- Update to 375.20
+
* Sat Oct 22 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.10-1
- Update to 375.10 beta release
7 years, 5 months
[xorg-x11-drv-nvidia] Update to 375.20
by Leigh Scott
commit c329399bf268536ad56e21be094cef2c48cebfa6
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Nov 18 17:42:40 2016 +0000
Update to 375.20
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 11 +++++++----
3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b18a86c..10bd31d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ NVIDIA-Linux-x86_64-358.16.run
/NVIDIA-Linux-x86-375.10.run
/NVIDIA-Linux-x86_64-375.10.run
/NVIDIA-Linux-armv7l-gnueabihf-375.10.run
+/NVIDIA-Linux-x86-375.20.run
+/NVIDIA-Linux-x86_64-375.20.run
+/NVIDIA-Linux-armv7l-gnueabihf-375.20.run
diff --git a/sources b/sources
index ead69c6..d9b2f55 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-8414d40bd101272ce082e204a7d032b2 NVIDIA-Linux-x86-375.10.run
-f3d5b040f3698181f25c484c5b7d0b31 NVIDIA-Linux-x86_64-375.10.run
-3ec5d77c343b53364ea58e654ef37f0d NVIDIA-Linux-armv7l-gnueabihf-375.10.run
+b9bfa7f3f591418972e963b087ab91e3 NVIDIA-Linux-x86-375.20.run
+874ec6d875f532ee9995082176cf9074 NVIDIA-Linux-x86_64-375.20.run
+7ffb39f1faed7ff0a460b9b99847917f NVIDIA-Linux-armv7l-gnueabihf-375.20.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index e895496..808f579 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -8,8 +8,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 375.10
-Release: 2%{?dist}
+Version: 375.20
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -267,7 +267,7 @@ sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
# Comment Xorg abi override
-install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+#install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
@@ -441,7 +441,7 @@ fi ||:
%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
# Comment Xorg abi override
-%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
+#%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
@@ -555,6 +555,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Fri Nov 18 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.20-1
+- Update to 375.20 release
+
* Mon Oct 24 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.10-2
- Add glvnd/egl_vendor.d file
- Add requires vulkan-filesystem
7 years, 5 months