[xorg-x11-drv-nvidia-390xx] Fix appdata
by Leigh Scott
commit d63c4b0e39a487c0df9664bd22637c2abd00e8aa
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 20 10:11:52 2020 +0100
Fix appdata
nvidia-settings-user.desktop | 12 ----------
nvidia-settings.appdata.xml | 43 ----------------------------------
xorg-x11-drv-nvidia-390xx.metainfo.xml | 2 +-
xorg-x11-drv-nvidia-390xx.spec | 5 +++-
4 files changed, 5 insertions(+), 57 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia-390xx.metainfo.xml b/xorg-x11-drv-nvidia-390xx.metainfo.xml
index a7d01f0..8e93a5a 100644
--- a/xorg-x11-drv-nvidia-390xx.metainfo.xml
+++ b/xorg-x11-drv-nvidia-390xx.metainfo.xml
@@ -19,7 +19,7 @@
</description>
<translation/>
<url type="homepage">http://www.nvidia.com/</url>
- <icon type="local" width="128" height="128">/usr/share/pixmaps/xorg-x11-drv-nvidia.png</icon>
+ <icon type="local" width="128" height="128">/usr/share/pixmaps/xorg-x11-drv-nvidia-390xx.png</icon>
<metadata_license>CC0-1.0</metadata_license>
<project_license>LicenseRef-proprietary:NVIDIA</project_license>
<developer_name>NVIDIA Corporation</developer_name>
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index 8de048c..c4a603d 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -37,7 +37,7 @@
Name: xorg-x11-drv-nvidia-390xx
Epoch: 3
Version: 390.138
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 390xx series proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -588,6 +588,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Sun Sep 20 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3:390.138-3
+- Fix appdata
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3:390.138-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 8 months
[nvidia-settings-390xx] Fix appdata conflict with nvidia main
by Leigh Scott
commit d00c3c08e1f2aa98b226a03801bcc40bfb6cc2a7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 20 09:45:41 2020 +0100
Fix appdata conflict with nvidia main
nvidia-settings-390xx.spec | 16 +++++++++++-----
nvidia-settings.appdata.xml | 43 -------------------------------------------
2 files changed, 11 insertions(+), 48 deletions(-)
---
diff --git a/nvidia-settings-390xx.spec b/nvidia-settings-390xx.spec
index 4826870..c1bc065 100644
--- a/nvidia-settings-390xx.spec
+++ b/nvidia-settings-390xx.spec
@@ -1,13 +1,13 @@
Name: nvidia-settings-390xx
Version: 390.138
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Configure the NVIDIA 390xx series graphics driver
License: GPLv2+
URL: https://download.nvidia.com/XFree86/nvidia-settings/
Source0: %{url}/nvidia-settings-%{version}.tar.bz2
Source1: nvidia-settings-user.desktop
-Source2: nvidia-settings.appdata.xml
+Source2: nvidia-settings-390xx.appdata.xml
Patch0: https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d...
ExclusiveArch: i686 x86_64 armv7hl
@@ -86,8 +86,11 @@ sed -i -e 's|__UTILS_PATH__/||' -e 's|__PIXMAP_PATH__/||' \
-e 's|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|System;Settings;|' \
%{buildroot}%{_datadir}/applications/nvidia-settings.desktop
+# Fix appdata conflict with nvidia main
+mv %{buildroot}%{_datadir}/applications/nvidia-settings.desktop \
+ %{buildroot}%{_datadir}/applications/nvidia-settings-390xx.desktop
desktop-file-validate \
- %{buildroot}%{_datadir}/applications/nvidia-settings.desktop
+ %{buildroot}%{_datadir}/applications/nvidia-settings-390xx.desktop
# Pixmap installation
mkdir -p %{buildroot}%{_datadir}/pixmaps
@@ -118,14 +121,17 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%exclude %{_libdir}/libnvidia-gtk2.so.*
%endif
%{_datadir}/pixmaps/nvidia-settings.png
-%{_datadir}/applications/nvidia-settings.desktop
+%{_datadir}/applications/nvidia-settings-390xx.desktop
%if 0%{?fedora}
-%{_metainfodir}/nvidia-settings.appdata.xml
+%{_metainfodir}/nvidia-settings-390xx.appdata.xml
%endif
%{_mandir}/man1/nvidia-settings.1.*
%changelog
+* Sun Sep 20 2020 Leigh Scott <leigh123linux(a)gmail.com> - 390.138-3
+- Fix appdata conflict with nvidia main
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 390.138-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 8 months
[rpmfusion-nonfree-appstream-data] Fix
by Leigh Scott
commit d6f108fcfc8f1e3d928d3c5990e30d5f1feb663a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 20 09:22:43 2020 +0100
Fix
update-appdata-rpmfusion-nonfree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/update-appdata-rpmfusion-nonfree.sh b/update-appdata-rpmfusion-nonfree.sh
index 05cde81..183c366 100755
--- a/update-appdata-rpmfusion-nonfree.sh
+++ b/update-appdata-rpmfusion-nonfree.sh
@@ -21,7 +21,7 @@ main ()
fi
- #rsync -avPh "$URL" .
+ rsync -avPh "$URL" .
# rsync -avPh --exclude debug "$URL1" ./Packages/
rm -rf repo*
3 years, 8 months
[rpmfusion-nonfree-appstream-data] Include failed
by Leigh Scott
commit 94abd9b812156ca5b6635e85e7bc1c332fb612a9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 20 09:20:33 2020 +0100
Include failed
update-appdata-rpmfusion-nonfree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/update-appdata-rpmfusion-nonfree.sh b/update-appdata-rpmfusion-nonfree.sh
index 03495b6..05cde81 100755
--- a/update-appdata-rpmfusion-nonfree.sh
+++ b/update-appdata-rpmfusion-nonfree.sh
@@ -30,7 +30,7 @@ main ()
# repomanage -o --space ./Packages/ | xargs rm
# rm -rf Packages/repo*
#
- appstream-builder --verbose --max-threads=6 --log-dir=./logs/ \
+ appstream-builder --verbose --include-failed --max-threads=6 --log-dir=./logs/ \
--packages-dir=./Packages/ --temp-dir=./tmp/ --output-dir=./appstream-data/ \
--basename="rpmfusion-nonfree-$RELEASE" --origin="rpmfusion-nonfree-$RELEASE" \
--enable-hidpi --veto-ignore=missing-parents
3 years, 8 months