[xorg-x11-drv-nvidia] Add icon to be used by appdata
by Nicolas Chauvet
commit de114e4b1febdd99c61888dbe5579bda588a5368
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Apr 9 18:56:33 2018 +0200
Add icon to be used by appdata
xorg-x11-drv-nvidia.metainfo.xml | 1 +
xorg-x11-drv-nvidia.spec | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.metainfo.xml b/xorg-x11-drv-nvidia.metainfo.xml
index 1ac86f3..9c8248a 100644
--- a/xorg-x11-drv-nvidia.metainfo.xml
+++ b/xorg-x11-drv-nvidia.metainfo.xml
@@ -19,6 +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>
<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.spec b/xorg-x11-drv-nvidia.spec
index d4a3ffc..188233b 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -389,6 +389,8 @@ fn=%{buildroot}%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
%{SOURCE13} README.txt "NVIDIA QUADRO GPUS" | xargs appstream-util add-provide ${fn} modalias
%{SOURCE13} README.txt "NVIDIA NVS GPUS" | xargs appstream-util add-provide ${fn} modalias
%{SOURCE13} README.txt "NVIDIA TESLA GPUS" | xargs appstream-util add-provide ${fn} modalias
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
%endif
# Install nvidia-fallback
@@ -475,7 +477,8 @@ fi ||:
%{_unitdir}/nvidia-fallback.service
%endif
%if 0%{?fedora} >= 25
-%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
+%{_datadir}/appdata/%{name}.metainfo.xml
+%{_datadir}/pixmaps/%{name}.png
%{_dracut_conf_d}/99-nvidia-dracut.conf
%else
# Owns the directory since libglvnd is optional here
6 years
[xorg-x11-drv-nvidia] Add cuda-libs(x86-32) if libGL(x86-32) is present
by Nicolas Chauvet
commit 711673bbb967f1e32254925f2aa56a53536f74e5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Apr 9 18:34:35 2018 +0200
Add cuda-libs(x86-32) if libGL(x86-32) is present
xorg-x11-drv-nvidia.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index c21cc62..d4a3ffc 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -144,6 +144,10 @@ Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: nvidia-persistenced%{?_isa} = %{version}
%if 0%{?fedora}
Suggests: nvidia-modprobe%{?_isa} = %{version}
+# Boolean dependencies are only fedora
+%ifarch x86_64
+Requires: (%{name}-cuda-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
+%endif
%else
Requires: nvidia-modprobe%{?_isa} = %{version}
%endif
6 years
[xorg-x11-drv-nvidia] Remove any desktop file from the driver
by Nicolas Chauvet
commit 695c77aafb817ccc5ea03bf9ecef2769b782a7d9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Apr 9 18:31:20 2018 +0200
Remove any desktop file from the driver
nvidia-settings.desktop | 12 ------------
xorg-x11-drv-nvidia.spec | 7 -------
2 files changed, 19 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index c234949..c21cc62 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -50,7 +50,6 @@ Source4: 99-nvidia.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
Source7: alternate-install-present
-Source9: nvidia-settings.desktop
Source10: nvidia.conf
Source11: 60-nvidia.rules
Source12: xorg-x11-drv-nvidia.metainfo.xml
@@ -63,7 +62,6 @@ Source21: nvidia-fallback.service
ExclusiveArch: i686 x86_64 armv7hl
-BuildRequires: desktop-file-utils
%if 0%{?rhel} > 6 || 0%{?fedora}
Buildrequires: systemd
Requires(post): systemd
@@ -378,10 +376,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/nvidia
mkdir -p %{buildroot}%{_datadir}/nvidia-kmod-%{version}
tar Jcf %{buildroot}%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel
-#Add autostart file for nvidia-settings to load user config
-install -D -p -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
-desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
-
%if 0%{?fedora} >= 25
# install AppData and add modalias provides
mkdir -p %{buildroot}%{_datadir}/appdata/
@@ -494,7 +488,6 @@ fi ||:
%{_dracut_conf_d}/99-nvidia-dracut.conf
%endif
%endif
-%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
%{_bindir}/nvidia-bug-report.sh
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
6 years
[nvidia-settings/f28] (3 commits) ...Fixup and appdata
by Nicolas Chauvet
Summary of changes:
2e7c61e... add missing scriptlet and remove extra install from make_in (*)
ebd0380... Add nvidia-settings appdata (*)
9b20042... Fixup and appdata (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[nvidia-settings] Fixup and appdata
by Nicolas Chauvet
commit 9b20042a88ee3449ff3dc7d373fcd84541082f05
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Apr 9 18:12:44 2018 +0200
Fixup and appdata
nvidia-settings-user.desktop | 12 ++++++++++++
nvidia-settings.spec | 32 +++++++++++++++++++++++++++-----
2 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/nvidia-settings-user.desktop b/nvidia-settings-user.desktop
new file mode 100644
index 0000000..838914b
--- /dev/null
+++ b/nvidia-settings-user.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Exec=nvidia-settings -l
+Icon=nvidia-settings
+Hidden=false
+NoDisplay=false
+Name[en_GB]=nvidia-settings
+Name=nvidia-settings
+Comment[en_GB]=Load user settings
+Comment=Load user settings
+X-GNOME-Autostart-Delay=30
+X-GNOME-Autostart-enabled=true
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 71164d6..c8d7480 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -1,12 +1,14 @@
Name: nvidia-settings
Version: 390.48
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
License: GPLv2+
URL: https://download.nvidia.com/XFree86/nvidia-settings/
Source0: %{url}/nvidia-settings-%{version}.tar.bz2
+Source1: %{name}-user.desktop
+Source2: %{name}.appdata.xml
ExclusiveArch: i686 x86_64 armv7hl
@@ -75,32 +77,52 @@ install -m 0644 doc/nvidia-settings.desktop \
sed -i -e 's|__UTILS_PATH__/||' -e 's|__PIXMAP_PATH__/||' \
-e 's|nvidia-settings.png|nvidia-settings|' \
- -e 's|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|' \
+ -e 's|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|System;Settings;|' \
%{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-validate \
%{buildroot}%{_datadir}/applications/%{name}.desktop
# Pixmap installation
-mkdir -p %{buildroot}%{_datadir}/pixmap
+mkdir -p %{buildroot}%{_datadir}/pixmaps
install -pm 0644 doc/nvidia-settings.png \
- %{buildroot}%{_datadir}/pixmap
+ %{buildroot}%{_datadir}/pixmaps
+
+# User settings installation
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
+install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-user.desktop
+desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-user.desktop
+
+%if 0%{?fedora}
+# AppData installation
+mkdir -p %{buildroot}%{_datadir}/appdata
+install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/
+%endif
%ldconfig_scriptlets
%files
%doc doc/*.txt
+%config %{_sysconfdir}/xdg/autostart/%{name}-user.desktop
%{_bindir}/nvidia-settings
%{_libdir}/libnvidia-gtk?.so.*
%if 0%{?fedora} || 0%{?rhel} > 6
%exclude %{_libdir}/libnvidia-gtk2.so.*
%endif
-%{_datadir}/pixmap/%{name}.png
+%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
+%if 0%{?fedora}
+%{_datadir}/appdata/%{name}.appdata.xml
+%endif
%{_mandir}/man1/nvidia-settings.1.*
%changelog
+* Mon Apr 09 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 390.48-2
+- Fix typo on icon directory
+- Add appdata file
+- Bundle user desktop settings here.
+
* Thu Mar 29 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 390.48-1
- Update to 390.48
6 years
[nvidia-settings] Add nvidia-settings appdata
by Nicolas Chauvet
commit ebd03802c7623b96498af53ce9f41d0e6e42cd77
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Apr 9 17:51:09 2018 +0200
Add nvidia-settings appdata
nvidia-settings.appdata.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
---
diff --git a/nvidia-settings.appdata.xml b/nvidia-settings.appdata.xml
new file mode 100644
index 0000000..197b8e7
--- /dev/null
+++ b/nvidia-settings.appdata.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>nvidia-settings.desktop</id>
+ <name>NVIDIA Graphics Drivers Control Panel</name>
+ <summary>Accelerated Linux Graphics Driver Control Panel</summary>
+ <description>
+ <p>
+ The NVIDIA Accelerated Linux Graphics Driver brings accelerated 2D
+ functionality and high-performance OpenGL support to Linux with the
+ use of NVIDIA graphics processing units.
+ </p>
+ <p>
+ These drivers provide optimized hardware acceleration for OpenGL and X
+ applications and support nearly all recent NVIDIA GPU products.
+ The NVIDIA graphics driver uses a Unified Driver Architecture: the single
+ graphics driver supports all modern NVIDIA GPUs.
+ </p>
+ <p>
+ The nvidia-settings utility is a tool for configuring the NVIDIA graphics
+ driver. It operates by communicating with the NVIDIA X driver, querying
+ and updating state as appropriate. This communication is done via the
+ NV-CONTROL, GLX, XVideo, and RandR X extensions.
+ </p>
+ <p>
+ Values such as brightness and gamma, XVideo attributes, temperature, and
+ OpenGL settings can be queried and configured via nvidia-settings.
+ </p>
+ </description>
+ <translation/>
+ <url type="homepage">http://www.nvidia.com/</url>
+ <icon type="local" width="128" height="128">/usr/share/pixmaps/nvidia-settings.png</icon>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <developer_name>NVIDIA Corporation</developer_name>
+ <keywords>
+ <keyword>NVIDIA</keyword>
+ <keyword>driver</keyword>
+ <keyword>GeForce</keyword>
+ <keyword>Quadro</keyword>
+ <keyword>Vulkan</keyword>
+ <keyword>OpenGL</keyword>
+ </keywords>
+ <update_contact>nvidia-settings-owner(a)rpmfusion.org</update_contact>
+</component>
6 years
[telegram-desktop/f26] Added custom API tokens (rfbz#4859).
by Vitaly Zaitsev
commit a87cb279208bf8746e6e60f316bd0a3ae14b2020
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Apr 9 17:31:44 2018 +0200
Added custom API tokens (rfbz#4859).
telegram-desktop-api-tokens.patch | 29 +++++++++++++++++++++++++++++
telegram-desktop.spec | 6 +++++-
2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/telegram-desktop-api-tokens.patch b/telegram-desktop-api-tokens.patch
new file mode 100644
index 0000000..b4c082f
--- /dev/null
+++ b/telegram-desktop-api-tokens.patch
@@ -0,0 +1,29 @@
+From c6a39ae561374ef2cc620f75a4f9839729544ef8 Mon Sep 17 00:00:00 2001
+From: Vitaly Zaitsev <vitaly(a)easycoding.org>
+Date: Mon, 9 Apr 2018 16:57:13 +0200
+Subject: [PATCH] Changed default Telegram Desktop's test API keys to obtained
+ specially for Fedora/RPMFusion. We cannot hide them because we need to
+ provide reproducible builds.
+
+---
+ Telegram/SourceFiles/config.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
+index 6384d44c..4aa105e4 100644
+--- a/Telegram/SourceFiles/config.h
++++ b/Telegram/SourceFiles/config.h
+@@ -217,8 +217,8 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
+ #ifdef CUSTOM_API_ID
+ #include "../../../TelegramPrivate/custom_api_id.h" // Custom API id and API hash
+ #else
+-static const int32 ApiId = 17349;
+-static const char *ApiHash = "344583e45741c457fe1862106095a5eb";
++static const int32 ApiId = 208164;
++static const char *ApiHash = "dfbe1bc42dc9d20507e17d1814cc2f0a";
+ #endif
+
+ #if Q_BYTE_ORDER == Q_BIG_ENDIAN
+--
+2.14.3
+
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 6d85b48..92cec4f 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -11,7 +11,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
Version: 1.2.17
-Release: 1%{?dist}
+Release: 2%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -27,6 +27,7 @@ ExclusiveArch: i686 x86_64
Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz
Source1: https://github.com/telegramdesktop/crl/archive/%{commit1}.tar.gz#/crl-%{s...
Patch0: %{name}-build-fixes.patch
+Patch1: %{name}-api-tokens.patch
Recommends: libappindicator-gtk3%{?_isa}
Requires: qt5-qtimageformats%{?_isa}
@@ -136,6 +137,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Mon Apr 09 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.17-2
+- Added custom API tokens.
+
* Sun Apr 08 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.17-1
- Updated to 1.2.17.
6 years