rpms/nvidia-settings/F-19 nvidia-settings.spec,1.34,1.35
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19574/F-19
Modified Files:
nvidia-settings.spec
Log Message:
Workaround yum issue with Obsoletes
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-19/nvidia-settings.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nvidia-settings.spec 27 Jun 2013 20:38:31 -0000 1.34
+++ nvidia-settings.spec 21 Jul 2013 14:02:47 -0000 1.35
@@ -6,8 +6,8 @@
%global nserie current
Name: nvidia-settings
-Version: 1.0
-Release: 33%{?dist}
+Version: %{nversion}
+Release: 1%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -18,7 +18,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64 armv7hl
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
@@ -39,12 +39,11 @@
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
-Requires: nvidia-settings-desktop
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Obsoletes: nvidia-settings-desktop < 319.32
+#Requires(post): %{_sbindir}/alternatives
+#Requires(postun): %{_sbindir}/alternatives
Provides: nvidia-settings-nversion = %{nversion}
-Provides: nvidia-304xx-settings = %{nversion}
@@ -56,12 +55,12 @@
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.
+#package desktop
+#Summary: Desktop file for %{name}
+#Group: Applications/System
+#
+#description desktop
+#This package provides the desktop file of the %{name} package.
%prep
@@ -92,7 +91,7 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
# Desktop entry for nvidia-settings
-desktop-file-install --vendor "" \
+desktop-file-install --vendor "rpmfusion" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
doc/nvidia-settings.desktop
@@ -113,28 +112,31 @@
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 || :
+#{_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 || :
+#if [ $1 -eq 0 ]; then
+ %{_sbindir}/alternatives --remove nvidia-settings %{_bindir}/%{name}-%{nserie} &>/dev/null || :
+#fi || :
%files
%defattr(-,root,root,-)
%doc doc/*.txt
-%ghost %{_bindir}/nvidia-settings
+#ghost %{_bindir}/nvidia-settings
%{_bindir}/nvidia-settings-%{nserie}
-%ghost %{_mandir}/man1/nvidia-settings.1.gz
+#ghost %{_mandir}/man1/nvidia-settings.1.gz
%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
-%files desktop
-%defattr(-,root,root,-)
-%{_datadir}/applications/*nvidia-settings.desktop
+%exclude %{_datadir}/applications/*nvidia-settings.desktop
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 319.32-1
+- Build an empty package to workaround yum issue with obsoletes
+ using nvidia-settings-current build from sources binary
+
* Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-33
- Update to 319.32
10 years, 9 months
rpms/nvidia-settings/F-18 nvidia-settings.spec,1.31,1.32
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19574/F-18
Modified Files:
nvidia-settings.spec
Log Message:
Workaround yum issue with Obsoletes
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-18/nvidia-settings.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nvidia-settings.spec 30 May 2013 16:28:26 -0000 1.31
+++ nvidia-settings.spec 21 Jul 2013 14:02:48 -0000 1.32
@@ -1,27 +1,24 @@
# 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 304.88
-#Possible replacement/complement:
-#http://willem.engen.nl/projects/disper/
-
-%global _default_patch_fuzz 2
+%global nversion 319.32
+%global npriority $(echo %{nversion} | cut -f 1 -d ".")
+%global nserie current
Name: nvidia-settings
-Version: 1.0
-Release: 29%{?dist}
+Version: %{nversion}
+Release: 1%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
License: GPLv2+
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
-Source0: http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot/nvidia-se...
+Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
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
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64 armv7hl
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
@@ -36,12 +33,17 @@
BuildRequires: libXext-devel
BuildRequires: libXrandr-devel
BuildRequires: libXv-devel
-#Needed for FBConfig table
-BuildRequires: xorg-x11-drv-nvidia-devel
-BuildRequires: mesa-libGL-devel
+BuildRequires: libvdpau-devel
+BuildRequires: m4
+#Needed for FBConfig table - Uneeded if GLX_VERSION_1_3
+#BuildRequires: xorg-x11-drv-nvidia-devel
+BuildRequires: mesa-libGL-devel
+
+Obsoletes: nvidia-settings-desktop < 319.32
+#Requires(post): %{_sbindir}/alternatives
+#Requires(postun): %{_sbindir}/alternatives
-Provides: %{name}-nversion = %{nversion}
-Provides: nvidia-304xx-settings = %{nversion}
+Provides: nvidia-settings-nversion = %{nversion}
@@ -53,10 +55,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
@@ -64,6 +73,7 @@
%build
# no job control
+export CFLAGS="$RPM_OPT_FLAGS"
pushd src/libXNVCtrl
make
popd
@@ -73,8 +83,6 @@
X_LDFLAGS="-L%{_libdir}" \
CC_ONLY_CFLAGS="$RPM_OPT_FLAGS" || :
-make -C samples
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -83,30 +91,78 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
# Desktop entry for nvidia-settings
-desktop-file-install --vendor "" \
+desktop-file-install --vendor "rpmfusion" \
--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} &>/dev/null || :
+#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
+%exclude %{_datadir}/applications/*nvidia-settings.desktop
%changelog
-* Thu May 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-29
-- Update to 304.88
-- Provide nvidia-304xx-settings for the 304xx serie
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 319.32-1
+- Build an empty package to workaround yum issue with obsoletes
+ using nvidia-settings-current build from sources binary
+
+* Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-33
+- Update to 319.32
+
+* Fri May 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-32
+- Update to 319.23
+
+* Mon May 13 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-31
+- Update to 319.17
+- add build requires m4
+
+* Mon Mar 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 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> - 1.0-29
+- Update to 313.18
+
+* Sat Dec 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-28
+- Update to 310.19
-* Thu Oct 18 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-27
-- Update to 304.60
+* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-27
+- Update to 310.14
* Mon Sep 24 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-26
- Update to 304.51
@@ -191,7 +247,7 @@
* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
- Update internal to 190.42
-* Thu Jul 15 2009 kwizart < kwizart at gmail.com > - 1.0-3
+* Wed Jul 15 2009 kwizart < kwizart at gmail.com > - 1.0-3
- Update internal to 185.18.14
* Tue Mar 3 2009 kwizart < kwizart at gmail.com > - 1.0-2.1
10 years, 9 months
rpms/nvidia-settings/devel nvidia-settings.spec,1.35,1.36
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19574/devel
Modified Files:
nvidia-settings.spec
Log Message:
Workaround yum issue with Obsoletes
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- nvidia-settings.spec 27 Jun 2013 20:38:30 -0000 1.35
+++ nvidia-settings.spec 21 Jul 2013 14:02:47 -0000 1.36
@@ -6,8 +6,8 @@
%global nserie current
Name: nvidia-settings
-Version: 1.0
-Release: 33%{?dist}
+Version: %{nversion}
+Release: 1%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -18,7 +18,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64 armv7hl
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
@@ -39,12 +39,11 @@
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
-Requires: nvidia-settings-desktop
-Requires(post): %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Obsoletes: nvidia-settings-desktop < 319.32
+#Requires(post): %{_sbindir}/alternatives
+#Requires(postun): %{_sbindir}/alternatives
Provides: nvidia-settings-nversion = %{nversion}
-Provides: nvidia-304xx-settings = %{nversion}
@@ -56,12 +55,12 @@
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.
+#package desktop
+#Summary: Desktop file for %{name}
+#Group: Applications/System
+#
+#description desktop
+#This package provides the desktop file of the %{name} package.
%prep
@@ -92,7 +91,7 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
# Desktop entry for nvidia-settings
-desktop-file-install --vendor "" \
+desktop-file-install --vendor "rpmfusion" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
doc/nvidia-settings.desktop
@@ -113,28 +112,31 @@
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 || :
+#{_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 || :
+#if [ $1 -eq 0 ]; then
+ %{_sbindir}/alternatives --remove nvidia-settings %{_bindir}/%{name}-%{nserie} &>/dev/null || :
+#fi || :
%files
%defattr(-,root,root,-)
%doc doc/*.txt
-%ghost %{_bindir}/nvidia-settings
+#ghost %{_bindir}/nvidia-settings
%{_bindir}/nvidia-settings-%{nserie}
-%ghost %{_mandir}/man1/nvidia-settings.1.gz
+#ghost %{_mandir}/man1/nvidia-settings.1.gz
%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
-%files desktop
-%defattr(-,root,root,-)
-%{_datadir}/applications/*nvidia-settings.desktop
+%exclude %{_datadir}/applications/*nvidia-settings.desktop
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 319.32-1
+- Build an empty package to workaround yum issue with obsoletes
+ using nvidia-settings-current build from sources binary
+
* Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-33
- Update to 319.32
10 years, 9 months
rpms/nvidia-settings/F-17 nvidia-settings.spec,1.27,1.28
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19574/F-17
Modified Files:
nvidia-settings.spec
Log Message:
Workaround yum issue with Obsoletes
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-17/nvidia-settings.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nvidia-settings.spec 30 May 2013 16:29:24 -0000 1.27
+++ nvidia-settings.spec 21 Jul 2013 14:02:48 -0000 1.28
@@ -1,27 +1,24 @@
# 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 304.88
-#Possible replacement/complement:
-#http://willem.engen.nl/projects/disper/
-
-%global _default_patch_fuzz 2
+%global nversion 319.32
+%global npriority $(echo %{nversion} | cut -f 1 -d ".")
+%global nserie current
Name: nvidia-settings
-Version: 1.0
-Release: 29%{?dist}
+Version: %{nversion}
+Release: 1%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
License: GPLv2+
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
-Source0: http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot/nvidia-se...
+Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
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
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64 armv7hl
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
@@ -36,12 +33,17 @@
BuildRequires: libXext-devel
BuildRequires: libXrandr-devel
BuildRequires: libXv-devel
-#Needed for FBConfig table
-BuildRequires: xorg-x11-drv-nvidia-devel
-BuildRequires: mesa-libGL-devel
+BuildRequires: libvdpau-devel
+BuildRequires: m4
+#Needed for FBConfig table - Uneeded if GLX_VERSION_1_3
+#BuildRequires: xorg-x11-drv-nvidia-devel
+BuildRequires: mesa-libGL-devel
+
+Obsoletes: nvidia-settings-desktop < 319.32
+#Requires(post): %{_sbindir}/alternatives
+#Requires(postun): %{_sbindir}/alternatives
-Provides: %{name}-nversion = %{nversion}
-Provides: nvidia-304xx-settings = %{nversion}
+Provides: nvidia-settings-nversion = %{nversion}
@@ -53,10 +55,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
@@ -64,6 +73,7 @@
%build
# no job control
+export CFLAGS="$RPM_OPT_FLAGS"
pushd src/libXNVCtrl
make
popd
@@ -73,8 +83,6 @@
X_LDFLAGS="-L%{_libdir}" \
CC_ONLY_CFLAGS="$RPM_OPT_FLAGS" || :
-make -C samples
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -83,30 +91,78 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
# Desktop entry for nvidia-settings
-desktop-file-install --vendor "" \
+desktop-file-install --vendor "rpmfusion" \
--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} &>/dev/null || :
+#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
+%exclude %{_datadir}/applications/*nvidia-settings.desktop
%changelog
-* Thu May 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-29
-- Update to 304.88
-- Provide nvidia-304xx-settings for the 304xx serie
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 319.32-1
+- Build an empty package to workaround yum issue with obsoletes
+ using nvidia-settings-current build from sources binary
+
+* Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-33
+- Update to 319.32
+
+* Fri May 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-32
+- Update to 319.23
+
+* Mon May 13 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-31
+- Update to 319.17
+- add build requires m4
+
+* Mon Mar 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 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> - 1.0-29
+- Update to 313.18
+
+* Sat Dec 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-28
+- Update to 310.19
-* Thu Oct 18 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-27
-- Update to 304.60
+* Tue Oct 16 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-27
+- Update to 310.14
* Mon Sep 24 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-26
- Update to 304.51
@@ -191,7 +247,7 @@
* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
- Update internal to 190.42
-* Thu Jul 15 2009 kwizart < kwizart at gmail.com > - 1.0-3
+* Wed Jul 15 2009 kwizart < kwizart at gmail.com > - 1.0-3
- Update internal to 185.18.14
* Tue Mar 3 2009 kwizart < kwizart at gmail.com > - 1.0-2.1
10 years, 9 months
rpms/bsnes/devel bsnes.spec,1.51,1.52
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/bsnes/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17772
Modified Files:
bsnes.spec
Log Message:
Fix on real branch
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- bsnes.spec 26 Aug 2012 08:00:37 -0000 1.51
+++ bsnes.spec 21 Jul 2013 13:48:48 -0000 1.52
@@ -2,7 +2,7 @@
Name: bsnes
Version: 0.%{vernumber}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: SNES emulator focused on accuracy
License: GPLv3
@@ -13,6 +13,9 @@
Source2: bsnes-source-cleanup
Source3: README.bsnes
+#./nall/endian.hpp:39:4: error: #error "Unknown endian. Please specify in nall/intrinsics.hpp"
+ExclusiveArch: i686 x86_64
+
#bsnes does not use system snes_ntsc because the modified video processing
#filter algorithm calls back into bsnes specific c++ colortable code, that
#isn't available when the library is built stand alone
@@ -112,6 +115,9 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.091-2
+- Add ExclusiveArch - rfbz#2406
+
* Sat Aug 25 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.091-1
- Updated to 0.091
- Switched to Debian approach for system-wide installation
10 years, 9 months
rpms/bsnes/devel bsnes.spec,1.18,1.19
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/bsnes/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16748
Modified Files:
bsnes.spec
Log Message:
Add ExclusiveArch
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bsnes.spec 8 Feb 2012 23:39:39 -0000 1.18
+++ bsnes.spec 21 Jul 2013 13:32:50 -0000 1.19
@@ -2,7 +2,7 @@
Name: bsnes
Version: 0.%{vernumber}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: SNES emulator focused on accuracy
Group: Applications/Emulators
@@ -15,6 +15,9 @@
Patch0: bsnes-0.037a-strip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#./nall/endian.hpp:39:4: error: #error "Unknown endian. Please specify in nall/intrinsics.hpp"
+ExclusiveArch: i686 x86_64
+
#bsnes does not use system snes_ntsc because the modified video processing
#filter algorithm calls back into bsnes specific c++ colortable code, that
#isn't available when the library is built stand alone
@@ -80,6 +83,9 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.051-3
+- Add ExclusiveArch - rfbz#2406
+
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.051-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
10 years, 9 months
rpms/xorg-x11-drv-nvidia-173xx/devel nvidia-settings.desktop, 1.4, 1.5 xorg-x11-drv-nvidia-173xx.spec, 1.25, 1.26
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8973/devel
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Added Files:
nvidia-settings.desktop
Log Message:
- Avoid Obsoletes until rhbz#985944
- Restore destop file
Index: nvidia-settings.desktop
===================================================================
RCS file: nvidia-settings.desktop
diff -N nvidia-settings.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-settings.desktop 21 Jul 2013 12:04:09 -0000 1.5
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=NVIDIA X Server Settings
+Comment=Configure NVIDIA X Server Settings
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
+
+# Translations provided by Sun Microsystems
+Name[de]=NVIDIA X-Server-Einstellungen
+Name[es]=Valores de configuración del servidor NVIDIA X
+Name[fr]=Paramètres du serveur X NVIDIA
+Name[it]=NVIDIA X Server Settings
+Name[ja]=NVIDIA X サーバー設定
+Name[ko]=NVIDIA X 서버 설정
+Name[pt_BR]=Configurações do NVIDIA X Server
+Name[zh_CN]=NVIDIA X 服务器设置
+Name[zh_HK]=NVIDIA X 伺服器設定
+Name[zh_TW]=NVIDIA X 伺服器設定
+Comment[de]=Konfigurieren der NVIDIA X-Server-Einstellungen
+Comment[es]=Establezca los valores de configuración del servidor NVIDIA X
+Comment[fr]=Configurer les paramètres du serveur X NVIDIA
+Comment[it]=Configura NVIDIA X Server Settings
+Comment[ja]=NVIDIA X サーバー設定を構成します
+Comment[ko]=NVIDIA X 서버 설정 구성
+Comment[pt_BR]=Definir &configurações de gerenciamento de usuário...
+Comment[zh_CN]=配置 NVIDIA X 服务器设置
+Comment[zh_HK]=配置 NVIDIA X 伺服器設定
+Comment[zh_TW]=配置 NVIDIA X 伺服器設定
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-nvidia-173xx.spec 5 Apr 2013 08:13:57 -0000 1.25
+++ xorg-x11-drv-nvidia-173xx.spec 21 Jul 2013 12:04:09 -0000 1.26
@@ -5,7 +5,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.37
-Release: 1%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -17,6 +17,7 @@
Source3: nvidia-173xx-xorg.conf
Source6: blacklist-nouveau.conf
Source11: nvidia-173xx-README.Fedora
+Source99: nvidia-settings.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -26,14 +27,19 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Requires: nvidia-xconfig
-Requires: nvidia-settings
+#Obsoletes: nvidia-xconfig < 1.0-30
+#Provides: nvidia-xconfig = %{version}-%{release}
+#Obsoletes: nvidia-settings < 1.0-34
+#Provides: nvidia-settings = %{version}-%{release}
+#Obsoletes: nvidia-settings-desktop < 1.0-34
+#Provides: nvidia-settings-desktop = %{version}-%{release}
Requires: nvidia-173xx-kmod >= %{version}
Requires(post): nvidia-173xx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
+BuildRequires: desktop-file-utils
Requires: which
#Requires: livna-config-display >= 0.0.22
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
@@ -63,12 +69,12 @@
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
-%filter_from_provides /^libGLCore\.so/d;
+%filter_from_provides /^libGLcore\.so/d;
%filter_from_provides /^libGL\.so/d;
%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_provides /^libglx\.so/d;
%filter_from_requires /^libnvidia/d;
-%filter_from_requires /^libGLCore\.so/d;
+%filter_from_requires /^libGLcore\.so/d;
%filter_from_requires /^libGL\.so/d;
%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_requires /^libglx\.so/d;
@@ -235,6 +241,12 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+#Restore desktop file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --mode 644 \
+ %{SOURCE99}
%clean
@@ -293,10 +305,11 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-173xx-xorg.conf
#{_initrddir}/nvidia-173xx
-%exclude %{_bindir}/nvidia-settings
-%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-settings
+%{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
+%{_datadir}/applications/*.desktop
#{_sbindir}/nvidia-173xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
@@ -304,8 +317,8 @@
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
%{_datadir}/pixmaps/*.png
-%exclude %{_mandir}/man1/nvidia-settings.*
-%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-settings.*
+%{_mandir}/man1/nvidia-xconfig.*
%files libs
%defattr(-,root,root,-)
@@ -327,6 +340,17 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-5
+- Avoid Obsoletes until rhbz#985944
+- Restore destop file
+
+* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-4
+- Avoid a Virtual Provides for legacy series
+- Fix typo with libGLcore filter
+
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-2
+- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
+
* Fri Apr 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-1
- Update to 173.14.37
10 years, 9 months
rpms/xorg-x11-drv-nvidia-173xx/F-18 nvidia-settings.desktop, 1.4, 1.5 xorg-x11-drv-nvidia-173xx.spec, 1.25, 1.26
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8973/F-18
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Added Files:
nvidia-settings.desktop
Log Message:
- Avoid Obsoletes until rhbz#985944
- Restore destop file
Index: nvidia-settings.desktop
===================================================================
RCS file: nvidia-settings.desktop
diff -N nvidia-settings.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-settings.desktop 21 Jul 2013 12:04:09 -0000 1.5
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=NVIDIA X Server Settings
+Comment=Configure NVIDIA X Server Settings
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
+
+# Translations provided by Sun Microsystems
+Name[de]=NVIDIA X-Server-Einstellungen
+Name[es]=Valores de configuración del servidor NVIDIA X
+Name[fr]=Paramètres du serveur X NVIDIA
+Name[it]=NVIDIA X Server Settings
+Name[ja]=NVIDIA X サーバー設定
+Name[ko]=NVIDIA X 서버 설정
+Name[pt_BR]=Configurações do NVIDIA X Server
+Name[zh_CN]=NVIDIA X 服务器设置
+Name[zh_HK]=NVIDIA X 伺服器設定
+Name[zh_TW]=NVIDIA X 伺服器設定
+Comment[de]=Konfigurieren der NVIDIA X-Server-Einstellungen
+Comment[es]=Establezca los valores de configuración del servidor NVIDIA X
+Comment[fr]=Configurer les paramètres du serveur X NVIDIA
+Comment[it]=Configura NVIDIA X Server Settings
+Comment[ja]=NVIDIA X サーバー設定を構成します
+Comment[ko]=NVIDIA X 서버 설정 구성
+Comment[pt_BR]=Definir &configurações de gerenciamento de usuário...
+Comment[zh_CN]=配置 NVIDIA X 服务器设置
+Comment[zh_HK]=配置 NVIDIA X 伺服器設定
+Comment[zh_TW]=配置 NVIDIA X 伺服器設定
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-nvidia-173xx.spec 18 Jul 2013 07:53:59 -0000 1.25
+++ xorg-x11-drv-nvidia-173xx.spec 21 Jul 2013 12:04:09 -0000 1.26
@@ -5,7 +5,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.37
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -17,6 +17,7 @@
Source3: nvidia-173xx-xorg.conf
Source6: blacklist-nouveau.conf
Source11: nvidia-173xx-README.Fedora
+Source99: nvidia-settings.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -26,11 +27,11 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Obsoletes: nvidia-xconfig < 1.0-30
+#Obsoletes: nvidia-xconfig < 1.0-30
#Provides: nvidia-xconfig = %{version}-%{release}
-Obsoletes: nvidia-settings < 1.0-34
+#Obsoletes: nvidia-settings < 1.0-34
#Provides: nvidia-settings = %{version}-%{release}
-Obsoletes: nvidia-settings-desktop < 1.0-34
+#Obsoletes: nvidia-settings-desktop < 1.0-34
#Provides: nvidia-settings-desktop = %{version}-%{release}
Requires: nvidia-173xx-kmod >= %{version}
@@ -38,6 +39,7 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
+BuildRequires: desktop-file-utils
Requires: which
#Requires: livna-config-display >= 0.0.22
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
@@ -239,6 +241,12 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+#Restore desktop file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --mode 644 \
+ %{SOURCE99}
%clean
@@ -301,6 +309,7 @@
%{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
+%{_datadir}/applications/*.desktop
#{_sbindir}/nvidia-173xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
@@ -331,6 +340,10 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-5
+- Avoid Obsoletes until rhbz#985944
+- Restore destop file
+
* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-4
- Avoid a Virtual Provides for legacy series
- Fix typo with libGLcore filter
10 years, 9 months
rpms/xorg-x11-drv-nvidia-173xx/F-19 nvidia-settings.desktop, 1.4, 1.5 xorg-x11-drv-nvidia-173xx.spec, 1.28, 1.29
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8973/F-19
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Added Files:
nvidia-settings.desktop
Log Message:
- Avoid Obsoletes until rhbz#985944
- Restore destop file
Index: nvidia-settings.desktop
===================================================================
RCS file: nvidia-settings.desktop
diff -N nvidia-settings.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-settings.desktop 21 Jul 2013 12:04:09 -0000 1.5
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=NVIDIA X Server Settings
+Comment=Configure NVIDIA X Server Settings
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
+
+# Translations provided by Sun Microsystems
+Name[de]=NVIDIA X-Server-Einstellungen
+Name[es]=Valores de configuración del servidor NVIDIA X
+Name[fr]=Paramètres du serveur X NVIDIA
+Name[it]=NVIDIA X Server Settings
+Name[ja]=NVIDIA X サーバー設定
+Name[ko]=NVIDIA X 서버 설정
+Name[pt_BR]=Configurações do NVIDIA X Server
+Name[zh_CN]=NVIDIA X 服务器设置
+Name[zh_HK]=NVIDIA X 伺服器設定
+Name[zh_TW]=NVIDIA X 伺服器設定
+Comment[de]=Konfigurieren der NVIDIA X-Server-Einstellungen
+Comment[es]=Establezca los valores de configuración del servidor NVIDIA X
+Comment[fr]=Configurer les paramètres du serveur X NVIDIA
+Comment[it]=Configura NVIDIA X Server Settings
+Comment[ja]=NVIDIA X サーバー設定を構成します
+Comment[ko]=NVIDIA X 서버 설정 구성
+Comment[pt_BR]=Definir &configurações de gerenciamento de usuário...
+Comment[zh_CN]=配置 NVIDIA X 服务器设置
+Comment[zh_HK]=配置 NVIDIA X 伺服器設定
+Comment[zh_TW]=配置 NVIDIA X 伺服器設定
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-19/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-drv-nvidia-173xx.spec 15 Jul 2013 08:35:11 -0000 1.28
+++ xorg-x11-drv-nvidia-173xx.spec 21 Jul 2013 12:04:09 -0000 1.29
@@ -5,7 +5,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.37
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -17,6 +17,7 @@
Source3: nvidia-173xx-xorg.conf
Source6: blacklist-nouveau.conf
Source11: nvidia-173xx-README.Fedora
+Source99: nvidia-settings.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -26,11 +27,11 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Obsoletes: nvidia-xconfig < 1.0-30
+#Obsoletes: nvidia-xconfig < 1.0-30
#Provides: nvidia-xconfig = %{version}-%{release}
-Obsoletes: nvidia-settings < 1.0-34
+#Obsoletes: nvidia-settings < 1.0-34
#Provides: nvidia-settings = %{version}-%{release}
-Obsoletes: nvidia-settings-desktop < 1.0-34
+#Obsoletes: nvidia-settings-desktop < 1.0-34
#Provides: nvidia-settings-desktop = %{version}-%{release}
Requires: nvidia-173xx-kmod >= %{version}
@@ -38,6 +39,7 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
+BuildRequires: desktop-file-utils
Requires: which
#Requires: livna-config-display >= 0.0.22
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
@@ -239,6 +241,12 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+#Restore desktop file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --mode 644 \
+ %{SOURCE99}
%clean
@@ -301,6 +309,7 @@
%{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
+%{_datadir}/applications/*.desktop
#{_sbindir}/nvidia-173xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
@@ -331,6 +340,10 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-5
+- Avoid Obsoletes until rhbz#985944
+- Restore destop file
+
* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-4
- Avoid a Virtual Provides for legacy series
- Fix typo with libGLcore filter
10 years, 9 months
rpms/xorg-x11-drv-nvidia-173xx/F-17 nvidia-settings.desktop, 1.4, 1.5 xorg-x11-drv-nvidia-173xx.spec, 1.27, 1.28
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8973/F-17
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Added Files:
nvidia-settings.desktop
Log Message:
- Avoid Obsoletes until rhbz#985944
- Restore destop file
Index: nvidia-settings.desktop
===================================================================
RCS file: nvidia-settings.desktop
diff -N nvidia-settings.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-settings.desktop 21 Jul 2013 12:04:09 -0000 1.5
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=NVIDIA X Server Settings
+Comment=Configure NVIDIA X Server Settings
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
+
+# Translations provided by Sun Microsystems
+Name[de]=NVIDIA X-Server-Einstellungen
+Name[es]=Valores de configuración del servidor NVIDIA X
+Name[fr]=Paramètres du serveur X NVIDIA
+Name[it]=NVIDIA X Server Settings
+Name[ja]=NVIDIA X サーバー設定
+Name[ko]=NVIDIA X 서버 설정
+Name[pt_BR]=Configurações do NVIDIA X Server
+Name[zh_CN]=NVIDIA X 服务器设置
+Name[zh_HK]=NVIDIA X 伺服器設定
+Name[zh_TW]=NVIDIA X 伺服器設定
+Comment[de]=Konfigurieren der NVIDIA X-Server-Einstellungen
+Comment[es]=Establezca los valores de configuración del servidor NVIDIA X
+Comment[fr]=Configurer les paramètres du serveur X NVIDIA
+Comment[it]=Configura NVIDIA X Server Settings
+Comment[ja]=NVIDIA X サーバー設定を構成します
+Comment[ko]=NVIDIA X 서버 설정 구성
+Comment[pt_BR]=Definir &configurações de gerenciamento de usuário...
+Comment[zh_CN]=配置 NVIDIA X 服务器设置
+Comment[zh_HK]=配置 NVIDIA X 伺服器設定
+Comment[zh_TW]=配置 NVIDIA X 伺服器設定
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-17/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-drv-nvidia-173xx.spec 18 Jul 2013 07:54:42 -0000 1.27
+++ xorg-x11-drv-nvidia-173xx.spec 21 Jul 2013 12:04:09 -0000 1.28
@@ -5,7 +5,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.37
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -17,6 +17,7 @@
Source3: nvidia-173xx-xorg.conf
Source6: blacklist-nouveau.conf
Source11: nvidia-173xx-README.Fedora
+Source99: nvidia-settings.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -26,11 +27,11 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Obsoletes: nvidia-xconfig < 1.0-30
+#Obsoletes: nvidia-xconfig < 1.0-30
#Provides: nvidia-xconfig = %{version}-%{release}
-Obsoletes: nvidia-settings < 1.0-34
+#Obsoletes: nvidia-settings < 1.0-34
#Provides: nvidia-settings = %{version}-%{release}
-Obsoletes: nvidia-settings-desktop < 1.0-34
+#Obsoletes: nvidia-settings-desktop < 1.0-34
#Provides: nvidia-settings-desktop = %{version}-%{release}
Requires: nvidia-173xx-kmod >= %{version}
@@ -38,6 +39,7 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
+BuildRequires: desktop-file-utils
Requires: which
#Requires: livna-config-display >= 0.0.22
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
@@ -239,6 +241,12 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+#Restore desktop file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --mode 644 \
+ %{SOURCE99}
%clean
@@ -301,6 +309,7 @@
%{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
+%{_datadir}/applications/*.desktop
#{_sbindir}/nvidia-173xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
@@ -331,6 +340,10 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-5
+- Avoid Obsoletes until rhbz#985944
+- Restore destop file
+
* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.37-4
- Avoid a Virtual Provides for legacy series
- Fix typo with libGLcore filter
10 years, 9 months