rpms/xorg-x11-drv-nvidia/F-13 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 xorg-x11-drv-nvidia.spec, 1.36, 1.37

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11144/F-13

Modified Files:
	.cvsignore sources xorg-x11-drv-nvidia.spec 
Log Message:
Update to 195.36.15



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	27 Feb 2010 17:37:16 -0000	1.17
+++ .cvsignore	27 Mar 2010 10:08:51 -0000	1.18
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-195.36.08-pkg0.run
-NVIDIA-Linux-x86_64-195.36.08-pkg0.run
+NVIDIA-Linux-x86-195.36.15-pkg0.run
+NVIDIA-Linux-x86_64-195.36.15-pkg0.run


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Feb 2010 17:37:16 -0000	1.17
+++ sources	27 Mar 2010 10:08:51 -0000	1.18
@@ -1,2 +1,2 @@
-7b78eed78b5f345af6dd1b2a83f5d44b  NVIDIA-Linux-x86-195.36.08-pkg0.run
-854852a02595eda776e7a67573304eeb  NVIDIA-Linux-x86_64-195.36.08-pkg0.run
+b09b45113585524b08b3b2acfdf4a290  NVIDIA-Linux-x86-195.36.15-pkg0.run
+82ff23e6d02b9f208c618ec17c60ca29  NVIDIA-Linux-x86_64-195.36.15-pkg0.run


Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-drv-nvidia.spec	27 Feb 2010 17:37:16 -0000	1.36
+++ xorg-x11-drv-nvidia.spec	27 Mar 2010 10:08:51 -0000	1.37
@@ -7,7 +7,8 @@
 %endif
 
 Name:            xorg-x11-drv-nvidia
-Version:         195.36.08
+Epoch:           1
+Version:         195.36.15
 Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
@@ -47,7 +48,7 @@
 Requires:        which
 Requires:        livna-config-display >= 0.0.21
 %if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires:        %{name}-libs%{_isa} = %{version}-%{release}
+Requires:        %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
 %else
 Requires:        %{name}-libs-%{_target_cpu} = %{version}-%{release}
 %endif
@@ -59,7 +60,7 @@
 Requires(preun): chkconfig
 
 
-Provides:        nvidia-kmod-common = %{version}
+Provides:        nvidia-kmod-common = %{?epoch}:%{version}
 Conflicts:       xorg-x11-drv-nvidia-beta
 Conflicts:       xorg-x11-drv-nvidia-legacy
 Conflicts:       xorg-x11-drv-nvidia-71xx
@@ -67,7 +68,7 @@
 Conflicts:       xorg-x11-drv-nvidia-173xx
 Conflicts:       xorg-x11-drv-fglrx
 Conflicts:       xorg-x11-drv-catalyst
-Obsoletes:       nvidia-kmod < %{version}
+Obsoletes:       nvidia-kmod < %{?epoch}:%{version}
 
 #Introduced in F10 for freshrpms compatibility
 Obsoletes:       nvidia-x11-drv < %{version}-%{release}
@@ -89,7 +90,7 @@
 %package devel
 Summary:         Development files for %{name}
 Group:           Development/Libraries
-Requires:        %{name}-libs-%{_target_cpu} = %{version}-%{release}
+Requires:        %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
 #Introduced in F10 when 173xx has forked to legacy serie
 Obsoletes:       xorg-x11-drv-nvidia-newest-devel < %{version}-100
 Provides:        xorg-x11-drv-nvidia-newest-devel = %{version}-101
@@ -101,12 +102,12 @@
 %package libs
 Summary:         Libraries for %{name}
 Group:           User Interface/X Hardware Support
-Requires:        %{name} = %{version}-%{release}
+Requires:        %{name} = %{?epoch}:%{version}-%{release}
 Requires:        libvdpau%{_isa} >= 0.3
-Provides:        %{name}-libs-%{_target_cpu} = %{version}-%{release}
+Provides:        %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
 %ifarch %{ix86}
-Provides:        %{name}-libs-32bit = %{version}-%{release}
-Obsoletes:       %{name}-libs-32bit <= %{version}-%{release}
+Provides:        %{name}-libs-32bit = %{?epoch}:%{version}-%{release}
+Obsoletes:       %{name}-libs-32bit <= %{?epoch}:%{version}-%{release}
 Obsoletes:       nvidia-x11-drv-32bit < %{version}-%{release}
 Provides:        nvidia-x11-drv-32bit = %{version}-%{release}
 %endif
@@ -350,6 +351,17 @@
 
 
 %changelog
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1:195.36.15-1
+- Update to 195.36.15
+- Use macro for Epoch
+
+* Sun Mar 14 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1:190.53-4
+- Fix multilibs requirements
+
+* Fri Mar 12 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1:190.53-2
+- Bump Epoch - Fan problem in recent release
+  http://www.nvnews.net/vbulletin/announcement.php?f=14
+
 * Sat Feb 27 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 195.36.08-1
 - Update to 195.36.08