[mixxx/f30] Add appdata patch
by Uwe Klotz
commit d23574701d2b66be709af74455422f3598603a4c
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Mon Nov 11 20:54:43 2019 +0100
Add appdata patch
appdata.patch | 24 ++++++++++++++++++++++++
mixxx.spec | 6 +++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/appdata.patch b/appdata.patch
new file mode 100644
index 0000000..58ad954
--- /dev/null
+++ b/appdata.patch
@@ -0,0 +1,24 @@
+From 5c3222a6118b507ea1d6ace18b22678fabfcc276 Mon Sep 17 00:00:00 2001
+From: Rebecca Wallander <FakeShemp(a)users.noreply.github.com>
+Date: Thu, 11 Jul 2019 14:45:35 +0200
+Subject: [PATCH] Add desktop-application to appdata so that it shows up in
+ storefronts
+
+https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html
+---
+ res/linux/mixxx.appdata.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/res/linux/mixxx.appdata.xml b/res/linux/mixxx.appdata.xml
+index d2366c31705..b0899019982 100644
+--- a/res/linux/mixxx.appdata.xml
++++ b/res/linux/mixxx.appdata.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Author 2014 Tuukka Pasanen <pasanen.tuukka(a)gmail.com> -->
+-<component>
++<component type="desktop-application">
+ <id>org.mixxx.Mixxx</id>
+ <launchable type="desktop-id">mixxx.desktop</launchable>
+ <metadata_license>CC-BY-SA-3.0</metadata_license>
+
diff --git a/mixxx.spec b/mixxx.spec
index caee0aa..0aea552 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,13 +17,14 @@
Name: mixxx
Version: 2.2.2
-Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s...
Patch0: launcher-platform-xcb.patch
+Patch1: appdata.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -163,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Mon Nov 11 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-4
+- Add appdata patch
+
* Wed Nov 06 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-3
- Fix desktop launcher patch
4 years, 11 months
[mixxx/f29] Add appdata patch
by Uwe Klotz
commit c995509e4450cacabea444d7b53f84c79ed03276
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Mon Nov 11 20:54:43 2019 +0100
Add appdata patch
appdata.patch | 24 ++++++++++++++++++++++++
mixxx.spec | 6 +++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/appdata.patch b/appdata.patch
new file mode 100644
index 0000000..58ad954
--- /dev/null
+++ b/appdata.patch
@@ -0,0 +1,24 @@
+From 5c3222a6118b507ea1d6ace18b22678fabfcc276 Mon Sep 17 00:00:00 2001
+From: Rebecca Wallander <FakeShemp(a)users.noreply.github.com>
+Date: Thu, 11 Jul 2019 14:45:35 +0200
+Subject: [PATCH] Add desktop-application to appdata so that it shows up in
+ storefronts
+
+https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html
+---
+ res/linux/mixxx.appdata.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/res/linux/mixxx.appdata.xml b/res/linux/mixxx.appdata.xml
+index d2366c31705..b0899019982 100644
+--- a/res/linux/mixxx.appdata.xml
++++ b/res/linux/mixxx.appdata.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Author 2014 Tuukka Pasanen <pasanen.tuukka(a)gmail.com> -->
+-<component>
++<component type="desktop-application">
+ <id>org.mixxx.Mixxx</id>
+ <launchable type="desktop-id">mixxx.desktop</launchable>
+ <metadata_license>CC-BY-SA-3.0</metadata_license>
+
diff --git a/mixxx.spec b/mixxx.spec
index b3b75a5..84376a6 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,13 +17,14 @@
Name: mixxx
Version: 2.2.2
-Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s...
Patch0: launcher-platform-xcb.patch
+Patch1: appdata.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -163,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Mon Nov 11 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-4
+- Add appdata patch
+
* Wed Nov 06 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-3
- Fix desktop launcher patch
4 years, 11 months
[xorg-x11-drv-nvidia-390xx] Fix udev rules (rfbz#5448)
by Leigh Scott
commit 2760ca361e8eff9a7e42e4756f22d35d5d9135c9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 10 17:54:28 2019 +0000
Fix udev rules (rfbz#5448)
60-nvidia-uvm.rules | 4 ++--
60-nvidia.rules | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/60-nvidia-uvm.rules b/60-nvidia-uvm.rules
index 8f42f89..9a8b8a6 100644
--- a/60-nvidia-uvm.rules
+++ b/60-nvidia-uvm.rules
@@ -1,2 +1,2 @@
-KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
-KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm-tools c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
+KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
+KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
diff --git a/60-nvidia.rules b/60-nvidia.rules
index 429e532..5df2acb 100644
--- a/60-nvidia.rules
+++ b/60-nvidia.rules
@@ -1,3 +1,3 @@
KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c 195 255'"
-KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia${i} c 195 ${i}; done'"
+KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia$${i} c 195 $${i}; done'"
KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c 195 254'"
4 years, 11 months
[xorg-x11-drv-nvidia] Fix udev rules (rfbz#5448)
by Leigh Scott
commit f31632b9248ba6bd77775cad17be5301a0e5cc61
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 10 17:52:16 2019 +0000
Fix udev rules (rfbz#5448)
60-nvidia-uvm.rules | 4 ++--
60-nvidia.rules | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/60-nvidia-uvm.rules b/60-nvidia-uvm.rules
index 8f42f89..9a8b8a6 100644
--- a/60-nvidia-uvm.rules
+++ b/60-nvidia-uvm.rules
@@ -1,2 +1,2 @@
-KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
-KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm-tools c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
+KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
+KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
diff --git a/60-nvidia.rules b/60-nvidia.rules
index c1d19be..97fd5b9 100644
--- a/60-nvidia.rules
+++ b/60-nvidia.rules
@@ -1,5 +1,5 @@
KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c 195 255'"
-KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia${i} c 195 ${i}; done'"
+KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia$${i} c 195 $${i}; done'"
KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c 195 254'"
# Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
4 years, 11 months
[xorg-x11-drv-nvidia-390xx] Fix boolean requires on el8
by Leigh Scott
commit 3700f33d823cf103155a9d7499d7776c02139b10
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Nov 10 12:51:13 2019 +0000
Fix boolean requires on el8
xorg-x11-drv-nvidia-390xx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index 4594153..0675cfa 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -142,7 +142,7 @@ Summary: CUDA driver for %{name}
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: nvidia-persistenced%{?_isa} >= %{version}
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Suggests: nvidia-modprobe%{?_isa} >= %{version}
# Boolean dependencies are only fedora
%ifarch x86_64
4 years, 11 months
[nvidia-kmod/el8: 9/9] Merge branch 'master' into el8
by Leigh Scott
commit f195d1eae7bf783c283f8589fc037b201ba4914e
Merge: 8709636 051b1f2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Nov 10 12:16:57 2019 +0000
Merge branch 'master' into el8
nvidia-kmod.spec | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
---
4 years, 11 months