[unifi: 2/2] Fix merge conflicts.
by Richard Shaw
commit c709f95524d8deb91e4c42c46caa12cbed738ed5
Merge: 66ae52b fc85bef
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Mar 16 16:29:50 2020 -0500
Fix merge conflicts.
unifi.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --cc unifi.spec
index 9a8e8ef,899ef08..a0c18b6
--- a/unifi.spec
+++ b/unifi.spec
@@@ -283,9 -283,9 +283,12 @@@ f
%changelog
+* Mon Mar 16 2020 Richard Shaw <hobbes1069(a)gmail.com> - 5.12.35-2
+- Update java requires to work with change in java provides in Fedora.
+
+ * Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 5.12.35-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Tue Dec 03 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.12.35-1
- Update to 5.12.0.
4 years, 8 months
[unifi] (2 commits) ...Fix merge conflicts.
by Richard Shaw
Summary of changes:
66ae52b... Update java requires to work with change in java provides i (*)
c709f95... Fix merge conflicts.
(*) This commit already existed in another branch; no separate mail sent
4 years, 8 months
[xorg-x11-drv-nvidia] Obsoletes cuda-drivers
by Nicolas Chauvet
commit 8cf25af610672e5761bd37f321f26ae0f23c89ff
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Mar 16 09:32:06 2020 +0100
Obsoletes cuda-drivers
xorg-x11-drv-nvidia.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 54ecf4c..184b479 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -127,6 +127,8 @@ Conflicts: xorg-x11-drv-nvidia-340xx-cuda
#Don't put an epoch here
Provides: cuda-drivers = %{version}.100
Provides: cuda-drivers%{?_isa} = %{version}.100
+Obsoletes: cuda-drivers < %{version}.100
+Obsoletes: cuda-drivers%{?_isa} < %{version}.100
Provides: nvidia-driver = %{version}-100
Provides: nvidia-driver%{?_isa} = %{version}-100
Provides: nvidia-drivers = %{version}-100
4 years, 8 months
[xorg-x11-drv-nvidia/el8] Obsoletes cuda-drivers
by Nicolas Chauvet
commit d1bc37314fcc2fc427fbe9c62dfcd810d0ddeb89
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Mar 16 09:32:06 2020 +0100
Obsoletes cuda-drivers
xorg-x11-drv-nvidia.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 54ecf4c..184b479 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -127,6 +127,8 @@ Conflicts: xorg-x11-drv-nvidia-340xx-cuda
#Don't put an epoch here
Provides: cuda-drivers = %{version}.100
Provides: cuda-drivers%{?_isa} = %{version}.100
+Obsoletes: cuda-drivers < %{version}.100
+Obsoletes: cuda-drivers%{?_isa} < %{version}.100
Provides: nvidia-driver = %{version}-100
Provides: nvidia-driver%{?_isa} = %{version}-100
Provides: nvidia-drivers = %{version}-100
4 years, 8 months