5:28 p.m.
commit 31a0ae784cea2d19cf65cc72862c95db9b3221ed
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Aug 3 19:28:43 2017 +0200
Update to 384.59
.gitignore | 2 +-
nvidia-settings.spec | 46 ++++++++++------------------------------------
sources | 2 +-
3 files changed, 12 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7dab06e..51eb49f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-nvidia-settings-319.32.tar.bz2
+nvidia-settings-*.tar.bz2
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index e6273a0..031824c 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -1,18 +1,12 @@
-# We use the driver version as a snapshot internal number
-# The real version of the package remains 1.0
-# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 384.59
-%global nserie current
-
Name: nvidia-settings
-Version: %{nversion}
+Version: 384.59
Release: 1%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
License: GPLv2+
URL: https://download.nvidia.com/XFree86/nvidia-settings/
-Source0: %{url}/nvidia-settings-%{nversion}.tar.bz2
+Source0: %{url}/nvidia-settings-%{version}.tar.bz2
ExclusiveArch: i686 x86_64 armv7hl
@@ -32,21 +26,17 @@ BuildRequires: m4
BuildRequires: mesa-libGL-devel
-Provides: nvidia-settings-nversion = %{nversion}
-
-
-
%description
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 with the NV-CONTROL X extension.
-nvidia-settings is compatible with driver up to %{nversion}.
+nvidia-settings is compatible with driver %{version}.
%prep
-%setup -q -n nvidia-settings-%{nversion}
+%setup -q
# We are building from source
rm -rf src/libXNVCtrl/libXNVCtrl.a
@@ -56,7 +46,7 @@ sed -i -e 's|-lXxf86vm|-lXxf86vm -ldl -lm|g' Makefile
%build
# no job control
export CFLAGS="%{optflags}"
-export CFLAGS="%{optflags}"
+export LDFLAGS="%{?__global_ldflags}"
pushd src/libXNVCtrl
make
popd
@@ -70,35 +60,19 @@ make \
%install
%make_install INSTALL="install -p"
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/applications
# Desktop entry for nvidia-settings
-desktop-file-install --vendor "rpmfusion" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+desktop-file-install --vendor \
+ --dir %{buildroot}%{_datadir}/applications/ \
doc/nvidia-settings.desktop
-#Move the binary elsewhere
-mv $RPM_BUILD_ROOT%{_bindir}/nvidia-settings \
- $RPM_BUILD_ROOT%{_sbindir}/nvidia-settings
-#touch $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
-chmod 0755 $RPM_BUILD_ROOT%{_bindir}/nvidia-settings*
-
-#Move the manpage elsewhere
-mv $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz \
- $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
-#touch $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz
-chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings*
-
-
%files
%doc doc/*.txt
-#ghost %{_bindir}/nvidia-settings
-%{_bindir}/nvidia-settings-%{nserie}
-#ghost %{_mandir}/man1/nvidia-settings.1.gz
-%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
+%{_bindir}/nvidia-settings
+%{_mandir}/man1/nvidia-settings.1.*
-%exclude %{_datadir}/applications/*nvidia-settings.desktop
%changelog
* Thu Aug 03 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 384.59-1
diff --git a/sources b/sources
index a17e3ac..b73dca9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e79e4cae77ceaa8da8dbcaf6b3c9eb39 nvidia-settings-319.32.tar.bz2
+18a45291de0c93aae27c70eee40a5665 nvidia-settings-384.59.tar.bz2