Author: kwizart Update of /cvs/nonfree/rpms/nvidia-settings/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14164/F-19 Modified Files: .cvsignore nvidia-settings.spec sources Log Message: Update to new packaging scheme Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-settings/F-19/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 16 Jan 2013 14:25:31 -0000 1.25 +++ .cvsignore 26 Mar 2013 21:48:12 -0000 1.26 @@ -1 +1 @@ -nvidia-settings-313.18.tar.bz2 +nvidia-settings-313.26.tar.bz2 Index: nvidia-settings.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-settings/F-19/nvidia-settings.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- nvidia-settings.spec 16 Jan 2013 14:25:31 -0000 1.28 +++ nvidia-settings.spec 26 Mar 2013 21:48:12 -0000 1.29 @@ -1,15 +1,13 @@ # 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 313.18 -#Possible replacement/complement: -#http://willem.engen.nl/projects/disper/ - -%global _default_patch_fuzz 2 +%global nversion 313.26 +%global npriority $(echo %{nversion} | cut -f 1 -d ".") +%global nserie current Name: nvidia-settings Version: 1.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Configure the NVIDIA graphics driver Group: Applications/System @@ -17,7 +15,6 @@ URL: ftp://download.nvidia.com/XFree86/nvidia-settings/ Source0: http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot/nvidia-se... Patch0: nvidia-settings-256.35-validate.patch -Patch1: 03_do_not_exit_on_no_scanout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} > 11 || 0%{?rhel} > 5 @@ -36,11 +33,16 @@ BuildRequires: libXext-devel BuildRequires: libXrandr-devel BuildRequires: libXv-devel -#Needed for FBConfig table -BuildRequires: xorg-x11-drv-nvidia-devel -BuildRequires: mesa-libGL-devel +#Needed for FBConfig table - Uneeded if GLX_VERSION_1_3 +#BuildRequires: xorg-x11-drv-nvidia-devel +BuildRequires: mesa-libGL-devel + +Requires: nvidia-settings-desktop +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives -Provides: %{name}-nversion = %{nversion} +Provides: nvidia-settings-nversion = %{nversion} +Provides: nvidia-304xx-settings = %{nversion} @@ -52,10 +54,17 @@ This communication is done with the NV-CONTROL X extension. nvidia-settings is compatible with driver up to %{nversion}. +%package desktop +Summary: Desktop file for %{name} +Group: Applications/System + +%description desktop +This package provides the desktop file of the %{name} package. + + %prep %setup -q -n nvidia-settings-%{nversion} %patch0 -p1 -b .validate -%patch1 -p1 -b .noscanout rm -rf src/libXNVCtrl/libXNVCtrl.a sed -i -e 's|/usr/local|%{_prefix}|g' utils.mk @@ -63,6 +72,7 @@ %build # no job control +export CFLAGS="$RPM_OPT_FLAGS" pushd src/libXNVCtrl make popd @@ -72,8 +82,6 @@ X_LDFLAGS="-L%{_libdir}" \ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS" || : -make -C samples - %install rm -rf $RPM_BUILD_ROOT @@ -86,20 +94,53 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ doc/nvidia-settings.desktop +#Move the binary elsewhere +mv $RPM_BUILD_ROOT%{_bindir}/nvidia-settings \ + $RPM_BUILD_ROOT%{_bindir}/nvidia-settings-%{nserie} +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* + %clean rm -rf $RPM_BUILD_ROOT +%post +%{_sbindir}/alternatives \ + --install %{_bindir}/nvidia-settings nvidia-settings %{_bindir}/nvidia-settings-%{nserie} %{npriority} \ + --slave %{_mandir}/man1/nvidia-settings.1.gz nvidia-settings.1.gz %{_mandir}/man1/nvidia-settings-%{nserie}.1.gz || : + +%postun +if [ $1 -eq 0 ]; then + %{_sbindir}/alternatives --remove nvidia-settings %{_bindir}/%{name}-%{nserie} +fi || : %files %defattr(-,root,root,-) %doc doc/*.txt -%{_bindir}/nvidia-settings -%{_datadir}/applications/*nvidia-settings.desktop -%{_mandir}/man1/nvidia-settings.1.gz +%ghost %{_bindir}/nvidia-settings +%{_bindir}/nvidia-settings-%{nserie} +%ghost %{_mandir}/man1/nvidia-settings.1.gz +%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz +%files desktop +%defattr(-,root,root,-) +%{_datadir}/applications/*nvidia-settings.desktop %changelog +* Mon Mar 11 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0-30 +- Update to 313.26 +- Add Alternatives support +- Drop patch needed for older 173xx/96xx series. + Thoses will use nvidia-settings-legacy instead +- Build libXNVCtrl with our %%optflags +- Split the desktop file in a sub-package + * Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.0-29 - Update to 313.18 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-settings/F-19/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 16 Jan 2013 14:25:31 -0000 1.25 +++ sources 26 Mar 2013 21:48:12 -0000 1.26 @@ -1 +1 @@ -8d2cf904aa612e7027d56669a68f5cb6 nvidia-settings-313.18.tar.bz2 +fe4b30e2d807e3d869db4881cd38f19a nvidia-settings-313.26.tar.bz2