commit a07b515103c04bd0d1cb1ec24734ccff446f2180 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Thu Aug 3 19:21:12 2017 +0200 Update to 384.59 .gitignore | 2 +- nvidia-xconfig.spec | 50 +++++++++++++++----------------------------------- sources | 2 +- 3 files changed, 17 insertions(+), 37 deletions(-) --- diff --git a/.gitignore b/.gitignore index cbe5c0e..18df80c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -nvidia-xconfig-319.32.tar.bz2 +nvidia-xconfig-*.tar.bz2 diff --git a/nvidia-xconfig.spec b/nvidia-xconfig.spec index 6538dd3..764fb81 100644 --- a/nvidia-xconfig.spec +++ b/nvidia-xconfig.spec @@ -1,27 +1,17 @@ -%global nversion 319.32 - Name: nvidia-xconfig -Version: %{nversion} -Release: 2%{?dist} +Version: 384.59 +Release: 1%{?dist} Summary: NVIDIA X configuration file editor Group: Applications/System License: GPLv2+ -URL: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/ -Source0: ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-%{nversio... +URL: https://download.nvidia.com/XFree86/nvidia-xconfig +Source0: %{url}/nvidia-xconfig-%{version}.tar.bz2 Patch0: nvidia-xconfig-1.0-default.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?fedora} > 11 || 0%{?rhel} > 5 ExclusiveArch: i686 x86_64 armv7hl -%else 0%{?fedora} == 11 -ExclusiveArch: i586 x86_64 -%else -ExclusiveArch: i386 x86_64 -%endif BuildRequires: m4 -Provides: %{name}-nversion = %{nversion} %description @@ -30,7 +20,7 @@ NVIDIA X configuration file editor. %prep -%setup -q -n nvidia-xconfig-%{nversion} +%setup -q sed -i -e 's|/usr/local|%{_prefix}|g' utils.mk @@ -40,34 +30,24 @@ make \ NVDEBUG=1 \ NV_VERBOSE=1 \ X_LDFLAGS="-L%{_libdir}" \ - CC_ONLY_CFLAGS="$RPM_OPT_FLAGS" + CC_ONLY_CFLAGS="%{optflags}" %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - -#We usually have it in sbin -mv $RPM_BUILD_ROOT%{_bindir}/nvidia-xconfig \ - $RPM_BUILD_ROOT%{_sbindir}/nvidia-xconfig-current - -mv $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-xconfig.1.gz \ - $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-xconfig-current.1.gz - - - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_sbindir} +%make_install INSTALL="install -p" %files -%defattr(-,root,root,-) -%doc COPYING -%{_sbindir}/nvidia-xconfig-current -%{_mandir}/man1/nvidia-xconfig-current.1.* +%license COPYING +%{_sbindir}/nvidia-xconfig +%{_mandir}/man1/nvidia-xconfig.1.* + %changelog +* Thu Aug 03 2017 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 384.59-1 +- Update to 384.59 + * Sun Mar 26 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 319.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 47ea8bb..d55546a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac5041ab0337c5ee509cc159cab55d5b nvidia-xconfig-319.32.tar.bz2 +b80e46d4fe7bdb790dea263482890cc5 nvidia-xconfig-384.59.tar.bz2