[xtables-addons/f31] Release 3.5
by Leigh Scott
Summary of changes:
7255f96... Release 3.5 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[xtables-addons] Release 3.5
by Leigh Scott
commit 7255f960c55d0c5f116bcbbe047160e234131ebd
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Oct 20 10:21:05 2019 +0100
Release 3.5
sources | 2 +-
xtables-addons.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 41f7724..5adb024 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e99ea681b7b3866a581390e1b3ea185e xtables-addons-3.3.tar.xz
+SHA512 (xtables-addons-3.5.tar.xz) = 25f7d71558773f4eb9a21956b5e60f9243e9049d4cc169823d06c71970ea01e16fc6799b555e6b4e09008b5869647f3f22b9cb869f8c158d71ccb12f67ee46e8
diff --git a/xtables-addons.spec b/xtables-addons.spec
index d2fa2eb..8d51043 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,7 +1,7 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 3.3
-Release: 2%{?dist}
+Version: 3.5
+Release: 1%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
License: GPLv2 and LGPLv2
URL: https://xtables-addons.sourceforge.net
@@ -50,10 +50,13 @@ rm -f %{buildroot}%{_libdir}/*.{la,so}
%{_mandir}/man?/*
%changelog
+* Sun Oct 20 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3.5-1
+- Release 3.5
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-* Tue Apr 02 18:14:09 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 3.3-1
+* Tue Apr 02 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 3.3-1
- Release 3.3
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.2-2
4 years, 7 months
[xorg-x11-drv-nvidia-390xx/el8] Adjust for el8
by Leigh Scott
commit 4f0bd88158f138814cce23c2639bc32e12b9d00e
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Oct 19 13:29:02 2019 +0100
Adjust for el8
xorg-x11-drv-nvidia-390xx.spec | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index 49fc73c..a1f88f2 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -68,7 +68,7 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
# AppStream metadata generation
BuildRequires: python3
BuildRequires: libappstream-glib >= 0.6.3
@@ -183,7 +183,7 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
-%if 0%{?fedora} >= 25
+%if 0%{?fedora} || 0%{?rhel} > 7
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
@@ -383,7 +383,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/nvidia
mkdir -p %{buildroot}%{_datadir}/nvidia-390xx-kmod-%{version}
tar Jcf %{buildroot}%{_datadir}/nvidia-390xx-kmod-%{version}/nvidia-390xx-kmod-%{version}-%{_target_cpu}.tar.xz kernel
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
# install AppData and add modalias provides
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
@@ -479,7 +479,7 @@ fi ||:
%{_udevrulesdir}/60-nvidia.rules
%{_unitdir}/nvidia-fallback.service
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
%{_metainfodir}/%{name}.metainfo.xml
%{_datadir}/pixmaps/%{name}.png
%{_dracut_conf_d}/99-nvidia-dracut.conf
@@ -531,7 +531,7 @@ fi ||:
%{_libdir}/libGLESv1_CM_nvidia.so.%{version}
%{_libdir}/libGLESv2_nvidia.so.2
%{_libdir}/libGLESv2_nvidia.so.%{version}
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 8
%{_libdir}/libGLX_indirect.so.0
%endif
%{_libdir}/libGLX_nvidia.so.0
4 years, 7 months
[nvidia-390xx-kmod] Add BuildRequires needed for current build
by Leigh Scott
commit 46981aacf44f24993216468f458651bf4acede84
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Oct 19 12:33:28 2019 +0100
Add BuildRequires needed for current build
nvidia-390xx-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 5c3ce8e..6a5107e 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -29,7 +29,7 @@ ExclusiveArch: i686 x86_64 armv7hl
%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-390xx-kmodsrc >= %{epoch}:%{version}
BuildRequires: %{AkmodsBuildRequires}
-%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
+%{!?kernels:BuildRequires: gcc, elfutils-libelf-devel, buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia --obsolete-version "%{?epoch}:%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
4 years, 7 months
[xorg-x11-drv-nvidia-390xx] switch to python3 requires
by Leigh Scott
commit c420984583cf008cc967fcb2f04fc98712535731
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Oct 19 12:28:48 2019 +0100
switch to python3 requires
parse-readme.py | 2 +-
xorg-x11-drv-nvidia-390xx.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/parse-readme.py b/parse-readme.py
index b2fa2ba..0baff3c 100755
--- a/parse-readme.py
+++ b/parse-readme.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
#
# Copyright (C) 2016 Richard Hughes <richard(a)hughsie.com>
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index 412ac9a..49fc73c 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -70,7 +70,7 @@ Requires(postun): systemd
%endif
%if 0%{?fedora}
# AppStream metadata generation
-BuildRequires: python2
+BuildRequires: python3
BuildRequires: libappstream-glib >= 0.6.3
# Xorg with PrimaryGPU
Requires: Xorg >= 1.19.0-3
4 years, 7 months
