rpms/frogatto - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/frogatto
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsUi1420/rpms/frogatto
Log Message:
Directory /cvs/nonfree/rpms/frogatto added to the repository
13 years, 8 months
rpms/omnibook-kmod/F-13 omnibook-kmod-backlight-2.6.34.patch, NONE, 1.1 omnibook-kmod.spec, 1.19, 1.20
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/omnibook-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10393
Modified Files:
omnibook-kmod.spec
Added Files:
omnibook-kmod-backlight-2.6.34.patch
Log Message:
* Sun Sep 05 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.20090714-0.5.svn288
- fix build with kernel 2.6.34
omnibook-kmod-backlight-2.6.34.patch:
lcd.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
--- NEW FILE omnibook-kmod-backlight-2.6.34.patch ---
diff -ur omnibook-20090628/lcd.c omnibook-20090628-mod/lcd.c
--- omnibook-20090628/lcd.c 2009-06-28 13:24:21.000000000 +0100
+++ omnibook-20090628-mod/lcd.c 2010-03-27 13:09:16.540833150 +0000
@@ -146,8 +146,14 @@
}
#ifdef CONFIG_OMNIBOOK_BACKLIGHT
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+ struct backlight_properties props;
+ memset (&props, 0, sizeof(struct backlight_properties));
+ props.max_brightness = omnibook_max_brightness;
+ omnibook_backlight_device =
+ backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op,
+ &omnibookbl_ops, &props);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
omnibook_backlight_device =
backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op, &omnibookbl_ops);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
@@ -161,8 +167,9 @@
printk(O_ERR "Unable to register as backlight device.\n");
return -ENODEV;
}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+ backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
omnibook_backlight_device->props.max_brightness = omnibook_max_brightness;
backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness);
#else /* < 2.6.21 */
Index: omnibook-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/omnibook-kmod/F-13/omnibook-kmod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- omnibook-kmod.spec 28 Aug 2010 18:48:51 -0000 1.19
+++ omnibook-kmod.spec 5 Sep 2010 13:20:35 -0000 1.20
@@ -8,7 +8,7 @@
Name: omnibook-kmod
Version: 2.20090714
-Release: 0.4.svn288%{?dist}.14
+Release: 0.5.svn288%{?dist}
Summary: Kernel module for HP Omnibook/Pavillon, Toshiba Satellite and Compal laptops
Group: System Environment/Kernel
@@ -25,6 +25,8 @@
Patch0: %{name}-warnings.patch
# add support for Toshiba Satellite A300D: http://sourceforge.net/tracker/?func=detail&aid=2841062&group_id=174260&a...
Patch1: %{name}-a300d.patch
+# fix compilation with kernel-2.6.34: http://sourceforge.net/tracker/?func=detail&aid=2978676&group_id=174260&a...
+Patch2: %{name}-backlight-2.6.34.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# get the proper build-sysbuild package from the repo, which
@@ -55,6 +57,7 @@
pushd omnibook-%{version}
%patch0 -p1 -b .warn
%patch1 -p1 -b .a300d
+%patch2 -p1 -b .bl
popd
for kernel_version in %{?kernel_versions} ; do
@@ -82,6 +85,9 @@
%changelog
+* Sun Sep 05 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.20090714-0.5.svn288
+- fix build with kernel 2.6.34
+
* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.20090714-0.4.svn288.14
- rebuild for new kernel
13 years, 8 months
rpms/omnibook-kmod/devel omnibook-kmod-backlight-2.6.34.patch, NONE, 1.1 omnibook-kmod.spec, 1.4, 1.5
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/omnibook-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9954
Modified Files:
omnibook-kmod.spec
Added Files:
omnibook-kmod-backlight-2.6.34.patch
Log Message:
* Sun Sep 05 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.20090714-0.5.svn288
- fix build with kernel 2.6.34
omnibook-kmod-backlight-2.6.34.patch:
lcd.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
--- NEW FILE omnibook-kmod-backlight-2.6.34.patch ---
diff -ur omnibook-20090628/lcd.c omnibook-20090628-mod/lcd.c
--- omnibook-20090628/lcd.c 2009-06-28 13:24:21.000000000 +0100
+++ omnibook-20090628-mod/lcd.c 2010-03-27 13:09:16.540833150 +0000
@@ -146,8 +146,14 @@
}
#ifdef CONFIG_OMNIBOOK_BACKLIGHT
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+ struct backlight_properties props;
+ memset (&props, 0, sizeof(struct backlight_properties));
+ props.max_brightness = omnibook_max_brightness;
+ omnibook_backlight_device =
+ backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op,
+ &omnibookbl_ops, &props);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
omnibook_backlight_device =
backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op, &omnibookbl_ops);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
@@ -161,8 +167,9 @@
printk(O_ERR "Unable to register as backlight device.\n");
return -ENODEV;
}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+ backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
omnibook_backlight_device->props.max_brightness = omnibook_max_brightness;
backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness);
#else /* < 2.6.21 */
Index: omnibook-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/omnibook-kmod/devel/omnibook-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- omnibook-kmod.spec 9 Jan 2010 11:03:42 -0000 1.4
+++ omnibook-kmod.spec 5 Sep 2010 13:16:29 -0000 1.5
@@ -9,7 +9,7 @@
Name: omnibook-kmod
Version: 2.20090714
-Release: 0.4.svn288%{?dist}
+Release: 0.5.svn288%{?dist}
Summary: Kernel module for HP Omnibook/Pavillon, Toshiba Satellite and Compal laptops
Group: System Environment/Kernel
@@ -26,6 +26,8 @@
Patch0: %{name}-warnings.patch
# add support for Toshiba Satellite A300D: http://sourceforge.net/tracker/?func=detail&aid=2841062&group_id=174260&a...
Patch1: %{name}-a300d.patch
+# fix compilation with kernel-2.6.34: http://sourceforge.net/tracker/?func=detail&aid=2978676&group_id=174260&a...
+Patch2: %{name}-backlight-2.6.34.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# get the proper build-sysbuild package from the repo, which
@@ -56,6 +58,7 @@
pushd omnibook-%{version}
%patch0 -p1 -b .warn
%patch1 -p1 -b .a300d
+%patch2 -p1 -b .bl
popd
for kernel_version in %{?kernel_versions} ; do
@@ -83,6 +86,9 @@
%changelog
+* Sun Sep 05 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.20090714-0.5.svn288
+- fix build with kernel 2.6.34
+
* Sat Jan 09 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.20090714-0.4.svn288
- build only akmods in rawhide
13 years, 8 months
rpms/xorg-x11-drv-nvidia/F-13 xorg-x11-drv-nvidia.spec,1.42,1.43
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv606
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Update
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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xorg-x11-drv-nvidia.spec 5 Sep 2010 10:46:43 -0000 1.42
+++ xorg-x11-drv-nvidia.spec 5 Sep 2010 10:56:20 -0000 1.43
@@ -229,6 +229,9 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -pm 0644 nvidia-settings.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+# Remove duplicate install
+rm $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvidia-{cfg,tls}.so
+
# Remove execstack needs on F-12 and laters
%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';'
13 years, 8 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.42,1.43
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv460
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Update
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xorg-x11-drv-nvidia.spec 5 Sep 2010 10:27:30 -0000 1.42
+++ xorg-x11-drv-nvidia.spec 5 Sep 2010 10:55:17 -0000 1.43
@@ -229,6 +229,9 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -pm 0644 nvidia-settings.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+# Remove duplicate install
+rm $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvidia-{cfg,tls}.so
+
# Remove execstack needs on F-12 and laters
%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';'
13 years, 8 months
rpms/vlc/F-13 vlc.spec,1.82,1.83
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32484
Modified Files:
vlc.spec
Log Message:
- Adds support for vlc-cache-gen
- Drop support for vlc-handlers.schemas
(will be handled in .desktop file)
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/vlc.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- vlc.spec 28 Aug 2010 14:29:54 -0000 1.82
+++ vlc.spec 5 Sep 2010 10:50:07 -0000 1.83
@@ -21,7 +21,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 1.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -29,7 +29,6 @@
%if 0%{?live555_date:1}
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
-Source10: vlc-handlers.schemas
Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
Patch1: 0001-Libnotify-depends-on-a-gtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -354,10 +353,6 @@
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
-#Fix CGonf2 url-handler support
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
-install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/
-
%find_lang %{name}
@@ -366,22 +361,7 @@
rm -rf $RPM_BUILD_ROOT
-%pre
-if [ "$1" -gt 1 ] ; then
-if [ -x %{_bindir}/gconftool-2 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule \
- %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
-fi
-fi || :
-
-
%post
-if [ -x %{_bindir}/gconftool-2 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
-fi
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -390,15 +370,6 @@
%post core -p /sbin/ldconfig
-%preun
-if [ "$1" -eq 0 ]; then
-if [ -x %{_bindir}/gconftool-2 ] ; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_datadir}/vlc/utils/vlc-handlers.schemas >& /dev/null
-fi
-fi || :
-
%postun
%{_bindir}/update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
@@ -408,6 +379,34 @@
%postun core -p /sbin/ldconfig
+%posttrans core
+%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+
+%post nox
+if [ $1 == 1 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%post plugin-jack
+if [ $1 == 1 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%postun nox
+if [ $1 == 0 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%postun plugin-jack
+if [ $1 == 0 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%preun core
+if [ $1 == 0 ] ; then
+ rm -rf %{_libdir}/vlc/plugins-*-*.dat
+fi || :
+
%files
%defattr(-,root,root,-)
@@ -520,6 +519,11 @@
%changelog
+* Sun Sep 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.4-2
+- Adds support for vlc-cache-gen
+- Drop support for vlc-handlers.schemas
+ (will be handled in .desktop file)
+
* Sat Aug 28 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.4-1
- Update to 1.1.4
- Fix libnotify build on f14
13 years, 8 months
rpms/vlc/devel vlc.spec,1.92,1.93
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32075
Modified Files:
vlc.spec
Log Message:
- Adds support for vlc-cache-gen
- Drop support for vlc-handlers.schemas
(will be handled in .desktop file)
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- vlc.spec 28 Aug 2010 14:29:56 -0000 1.92
+++ vlc.spec 5 Sep 2010 10:49:21 -0000 1.93
@@ -21,7 +21,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 1.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -29,7 +29,6 @@
%if 0%{?live555_date:1}
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
-Source10: vlc-handlers.schemas
Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
Patch1: 0001-Libnotify-depends-on-a-gtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -354,10 +353,6 @@
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
-#Fix CGonf2 url-handler support
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
-install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/
-
%find_lang %{name}
@@ -366,22 +361,7 @@
rm -rf $RPM_BUILD_ROOT
-%pre
-if [ "$1" -gt 1 ] ; then
-if [ -x %{_bindir}/gconftool-2 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule \
- %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
-fi
-fi || :
-
-
%post
-if [ -x %{_bindir}/gconftool-2 ] ; then
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
-fi
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -390,15 +370,6 @@
%post core -p /sbin/ldconfig
-%preun
-if [ "$1" -eq 0 ]; then
-if [ -x %{_bindir}/gconftool-2 ] ; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_datadir}/vlc/utils/vlc-handlers.schemas >& /dev/null
-fi
-fi || :
-
%postun
%{_bindir}/update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
@@ -408,6 +379,34 @@
%postun core -p /sbin/ldconfig
+%posttrans core
+%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+
+%post nox
+if [ $1 == 1 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%post plugin-jack
+if [ $1 == 1 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%postun nox
+if [ $1 == 0 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%postun plugin-jack
+if [ $1 == 0 ] ; then
+ %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc || :
+fi
+
+%preun core
+if [ $1 == 0 ] ; then
+ rm -rf %{_libdir}/vlc/plugins-*-*.dat
+fi || :
+
%files
%defattr(-,root,root,-)
@@ -520,6 +519,11 @@
%changelog
+* Sun Sep 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.4-2
+- Adds support for vlc-cache-gen
+- Drop support for vlc-handlers.schemas
+ (will be handled in .desktop file)
+
* Sat Aug 28 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.4-1
- Update to 1.1.4
- Fix libnotify build on f14
13 years, 8 months
rpms/xorg-x11-drv-nvidia/F-13 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 xorg-x11-drv-nvidia.spec, 1.41, 1.42
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31911/F-13
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 256.53
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 21 Jun 2010 10:28:10 -0000 1.20
+++ .cvsignore 5 Sep 2010 10:46:43 -0000 1.21
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-195.36.31-pkg0.run
-NVIDIA-Linux-x86_64-195.36.31-pkg0.run
+NVIDIA-Linux-x86_64-256.53-no-compat32.run
+NVIDIA-Linux-x86-256.53.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Jun 2010 10:28:10 -0000 1.20
+++ sources 5 Sep 2010 10:46:43 -0000 1.21
@@ -1,2 +1,2 @@
-c30af5d776e3c71c6dd8e06c30e4bf1f NVIDIA-Linux-x86-195.36.31-pkg0.run
-91cd7502cb6ca3a5c0e79e33ae79881f NVIDIA-Linux-x86_64-195.36.31-pkg0.run
+73f08a19e00d05165cbbfc74e2fa4bdd NVIDIA-Linux-x86_64-256.53-no-compat32.run
+21fe3fe0afed7818b7adf383477b2155 NVIDIA-Linux-x86-256.53.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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-drv-nvidia.spec 8 Jul 2010 19:01:04 -0000 1.41
+++ xorg-x11-drv-nvidia.spec 5 Sep 2010 10:46:43 -0000 1.42
@@ -8,15 +8,15 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 195.36.31
-Release: 2%{?dist}
+Version: 256.53
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
-Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
-Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
+Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
+Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source5: nvidia-init
Source6: blacklist-nouveau.conf
Source10: nvidia-config-display
@@ -123,8 +123,7 @@
%setup -q -c -T
sh %{SOURCE0} --extract-only --target nvidiapkg-x86
sh %{SOURCE1} --extract-only --target nvidiapkg-x64
-tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
-
+tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel
# Tweak to have debuginfo - part 2/2
%if 0%{?fedora} >= 7
cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
@@ -136,11 +135,12 @@
%else
ln -s nvidiapkg-x64 nvidiapkg
%endif
-mv nvidiapkg/LICENSE nvidiapkg/usr/share/doc/
-# More docs
-cp %{SOURCE11} nvidiapkg/usr/share/doc/README.Fedora
-find nvidiapkg/usr/share/doc/ -type f | xargs chmod 0644
+# Tweak to have debuginfo - part 2/2
+%if 0%{?fedora} >= 7
+cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
+sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
+%endif
%build
# Nothing to build
@@ -150,127 +150,97 @@
%install
rm -rf $RPM_BUILD_ROOT
-set +x
-for file in $(cd nvidiapkg &> /dev/null; find . -type f | grep -v -e 'makeself.sh$' -e 'mkprecompiled$' -e 'tls_test$' -e 'tls_test_dso.so$' -e 'nvidia-settings.desktop$' -e '^./Makefile' -e '^./nvidia-installer' -e '^./pkg-history.txt' -e '^./.manifest' -e '/usr/share/doc/' -e 'libGL.la$' -e 'drivers/nvidia_drv.o$' -e 'nvidia-installer.1.gz$' -e '^./usr/src/')
-do
- if [[ ! "/${file##./usr/lib/vdpau}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/vdpau/${file##./usr/lib/vdpau}
- elif [[ ! "/${file##./etc/OpenCL/vendors}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/OpenCL/vendors/${file##./etc/OpenCL/vendors/}
- elif [[ ! "/${file##./usr/lib/}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/}
- elif [[ ! "/${file##./usr/X11R6/lib/modules/extensions}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/nvidia/${file##./usr/X11R6/lib/modules/extensions}
- elif [[ ! "/${file##./usr/X11R6/lib/modules}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/lib/modules}
- elif [[ ! "/${file##./usr/X11R6/lib/}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/X11R6/lib/}
- elif [[ ! "/${file##./usr/include/}" = "/${file}" ]]
- then
- install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_includedir}/nvidia/${file##./usr/include/}
- elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]]
- then
- if [[ ! "/${file##./usr/bin/nvidia-xconfig}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/sbin/${file##./usr/bin/}
- elif [[ ! "/${file##./usr/bin/nvidia-bug-report.sh}" = "/${file}" ]]
- then
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/bin/${file##./usr/bin/}
- else
- install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/${file}
- fi
- elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
- then
- install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
- gunzip $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
- elif [[ ! "/${file##./usr/share/pixmaps/}" = "/${file}" ]]
- then
- install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/${file##./usr/share/pixmaps/}
- else
- echo ${file} found -- don\'t know how to handle
- exit 1
- fi
-done
-set -x
+cd nvidiapkg
-# Move the libnvidia-wfb.so lib to the Nvidia xorg extension directory.
-mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.%{version}
+# The new 256.x version supplies all the files in a relatively flat structure
+# .. so explicitly deal out the files to the correct places
+# .. nvidia-installer looks too closely at the current machine, so it's hard
+# .. to generate rpm's unless a NVIDIA card is in the machine.
-# Fixme: should we do this directly in above for-loop? Yes, we should! No, please don't!
-ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so
-ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so.1
-ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so
-ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so.1
-ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-tls.so.1
-ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/libnvidia-tls.so.1
-ln -s libnvidia-cfg.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-cfg.so.1
-ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA.so
-ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA_dynamic.so.1
-ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
-
-
-# This is 97xx specific. libnvidia-wfb.so is a replacement of libwfb.so
-# It is used by card > NV30 but required by G80 and newer.
-%if 0%{?fedora} >= 9
-rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.%{version}
-%else
-ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1
-ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libwfb.so
-%endif
+rm -f nvidia-installer*
-# This is 169.04 adds - cuda libs and headers
-ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1
-ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
-
-# This is 180.xx adds - vdpau libs and headers
-ln -s libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1
-
-# This is 195.xx adds - OpenCL support
-ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so.1
-ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so
-ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so.1
-ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so
+install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
-# X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
+# ld.so.conf.d file
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+
+#Blacklist nouveau (since F-11)
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
-# ld.so.conf.d file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+# OpenCL config
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+
+# Simple wildcard install of libs
+install -m 0755 -d $RPM_BUILD_ROOT%{nvidialibdir}/tls/
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
+install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/
+install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/
+
+# .. but some in a different place
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
+install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
+rm -f $RPM_BUILD_ROOT%{nvidialibdir}/lib{nvidia-wfb,glx,vdpau*}.so.%{version}
+
+# Finish up the special case libs
+install -p -m 0755 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
+install -p -m 0755 libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
+install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
+install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/
+install -p -m 0644 libXvMCNVIDIA.a $RPM_BUILD_ROOT%{nvidialibdir}/
+
+# Deal out include files
+install -m 0755 -d $RPM_BUILD_ROOT%{_includedir}/nvidia/{CL,GL,cuda,vdpau}/
+install -p -m 0644 cl*.h $RPM_BUILD_ROOT%{_includedir}/nvidia/CL/
+install -p -m 0644 gl*.h $RPM_BUILD_ROOT%{_includedir}/nvidia/GL/
+install -p -m 0644 cuda*.h $RPM_BUILD_ROOT%{_includedir}/nvidia/cuda/
+install -p -m 0644 vdpau*.h $RPM_BUILD_ROOT%{_includedir}/nvidia/vdpau/
+
+# Install binaries
+install -p -m 0755 nvidia-{bug-report.sh,smi} $RPM_BUILD_ROOT%{_bindir}
+
+# Install man pages
+install -m 0755 -d $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 *.gz $RPM_BUILD_ROOT%{_mandir}/man1/
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{nvidia-settings,nvidia-xconfig}*
+
+# Make our documentation available for later
+cp -p %{SOURCE11} README.Fedora
+
+# Make unversioned links to dynamic libs
+for lib in $( find $RPM_BUILD_ROOT%{_libdir} -name lib\*.%{version} ) ; do
+ #ln -s libGL.so.256.52 $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so
+ ln -s ${lib##*/} ${lib%.%{version}}
+ ln -s ${lib##*/} ${lib%.%{version}}.1
+done
-#Blacklist nouveau by F-11
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
-install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
-
-# Change perms on static libs. Can't fathom how to do it nicely above.
-find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
-
-# Remove execstack needs on F-12 and laters - disabled
-%if 0
-find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
-execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
-execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+# OpenCL is really just a link to libcuda.so?
+ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so
+
+# X configuration script
+install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
+
+# Install nvidia icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -pm 0644 nvidia-settings.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+# Remove execstack needs on F-12 and laters
+%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';'
%ifarch x86_64
-execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-{settings,smi}
-execstack -c $RPM_BUILD_ROOT%{_sbindir}/nvidia-xconfig
+execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-smi
%endif
%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
-
%post
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
@@ -304,14 +274,16 @@
%files
%defattr(-,root,root,-)
-%doc nvidiapkg/usr/share/doc/*
+%doc nvidiapkg/LICENSE
+%doc nvidiapkg/NVIDIA_Changelog
+%doc nvidiapkg/README.txt
+%doc nvidiapkg/README.Fedora
+%doc nvidiapkg/html
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia
-%exclude %{_bindir}/nvidia-settings
-%exclude %{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
%{_sbindir}/nvidia-config-display
@@ -321,8 +293,6 @@
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
%{_datadir}/pixmaps/*.png
-%exclude %{_mandir}/man1/nvidia-settings.*
-%exclude %{_mandir}/man1/nvidia-xconfig.*
%{_mandir}/man1/nvidia-smi.*
%files libs
@@ -332,11 +302,10 @@
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{nvidialibdir}/*.so.*
%{nvidialibdir}/libcuda.so
-%{nvidialibdir}/libGLcore.so
-%{nvidialibdir}/tls/*.so.*
-%exclude %{nvidialibdir}/libvdpau.*
-%{_libdir}/vdpau/libvdpau_nvidia.so.%{version}
-%{_libdir}/vdpau/libvdpau_nvidia.so.1
+%{nvidialibdir}/libnvidia-glcore.so
+%{nvidialibdir}/tls/*.so*
+%exclude %{_libdir}/vdpau/libvdpau.*
+%{_libdir}/vdpau/libvdpau_nvidia.so*
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
%files devel
@@ -359,6 +328,16 @@
%changelog
+* Tue Aug 31 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.53-1
+- Update to 256.53
+
+* Sat Aug 28 2010 Bob Arendt <rda(a)rincon.com> - 1:256.52-1
+- Update to 265.52 (Adds support for xorg-server driver ABI ver 8, for xorg-server-1.9)
+
+* Mon Aug 16 2010 Bob Arendt <rda(a)rincon.com> - 1:256.44-1
+- Update to 265.44 (Cuda 3.1 compatible)
+- libGLcore.so becomes nvidia-libglcore.so
+
* Thu Jul 08 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-2
- Improve post script as reported in rfbz#1262
- Only blacklist nouveau with grubby on install.
13 years, 8 months
rpms/nvidia-kmod/F-13 .cvsignore, 1.20, 1.21 nvidia-kmod.spec, 1.78, 1.79 sources, 1.20, 1.21 NVIDIA_kernel-195.36.24-6120611.diff.txt, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30792/F-13
Modified Files:
.cvsignore nvidia-kmod.spec sources
Removed Files:
NVIDIA_kernel-195.36.24-6120611.diff.txt
Log Message:
Update to 256.53
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 21 Jun 2010 10:32:35 -0000 1.20
+++ .cvsignore 5 Sep 2010 10:32:54 -0000 1.21
@@ -1 +1 @@
-nvidia-kmod-data-195.36.31.tar.bz2
+nvidia-kmod-data-256.53.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/nvidia-kmod.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- nvidia-kmod.spec 28 Aug 2010 18:50:09 -0000 1.78
+++ nvidia-kmod.spec 5 Sep 2010 10:32:54 -0000 1.79
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 195.36.31
+Version: 256.53
# Taken over by kmodtool
-Release: 1%{?dist}.6
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,9 +25,6 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
-#http://www.nvnews.net/vbulletin/showthread.php?t=151791
-Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -49,16 +46,6 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
-# patch loop
-for arch in x86 x64
-do
- pushd nvidiapkg-${arch}
- pushd usr/src/nv
-%patch0 -p3 -b .iommu
- popd
- popd
-done
-
for kernel_version in %{?kernel_versions} ; do
%ifarch %{ix86}
@@ -71,7 +58,7 @@
%build
for kernel_version in %{?kernel_versions}; do
- pushd _kmod_build_${kernel_version%%___*}/usr/src/nv/
+ pushd _kmod_build_${kernel_version%%___*}/kernel/
ln -s -f Makefile.kbuild Makefile
if [[ "${kernel_version%%___*}" = *xen ]] ; then
CC="cc -D__XEN_TOOLS__ \
@@ -89,7 +76,7 @@
%install
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions}; do
- install -D -m 0755 _kmod_build_${kernel_version%%___*}/usr/src/nv/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/kernel/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
done
%{?akmod_install}
@@ -99,26 +86,19 @@
%changelog
-* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.31-1.6
-- rebuild for new kernel
-
-* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.31-1.5
-- rebuild for new kernel
-
-* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.31-1.4
-- rebuild for new kernel
+* Wed Sep 01 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.53-1
+- Update to 256.53
-* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.31-1.3
-- rebuild for new kernel
+* Thu Aug 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.44-1
+- Update to 256.44
-* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.31-1.2
-- rebuild for new kernel
-
-* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.31-1.1
-- rebuild for new kernel
+* Wed Jun 18 2010 Vallimar de Morieve <vallimar(a)gmail.com> - 1:256.35-1
+- update to 256.35
* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
+- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
+ http://bugs.gentoo.org/show_bug.cgi?id=301318
* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-13/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Jun 2010 10:32:35 -0000 1.20
+++ sources 5 Sep 2010 10:32:54 -0000 1.21
@@ -1 +1 @@
-013fe3ae0e449b22398a290aa13621dd nvidia-kmod-data-195.36.31.tar.bz2
+8199e0735acd30fecc111f67ecb59903 nvidia-kmod-data-256.53.tar.bz2
--- NVIDIA_kernel-195.36.24-6120611.diff.txt DELETED ---
13 years, 8 months
rpms/nvidia-kmod/devel .cvsignore, 1.20, 1.21 nvidia-kmod.spec, 1.64, 1.65 sources, 1.20, 1.21 NVIDIA_kernel-195.36.24-6120611.diff.txt, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30486/devel
Modified Files:
.cvsignore nvidia-kmod.spec sources
Removed Files:
NVIDIA_kernel-195.36.24-6120611.diff.txt
Log Message:
Update to 256.53
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 21 Jun 2010 10:31:35 -0000 1.20
+++ .cvsignore 5 Sep 2010 10:31:21 -0000 1.21
@@ -1 +1 @@
-nvidia-kmod-data-195.36.31.tar.bz2
+nvidia-kmod-data-256.53.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- nvidia-kmod.spec 21 Jun 2010 10:37:27 -0000 1.64
+++ nvidia-kmod.spec 5 Sep 2010 10:31:21 -0000 1.65
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 195.36.31
+Version: 256.53
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -25,9 +25,6 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
-#http://www.nvnews.net/vbulletin/showthread.php?t=151791
-Patch0: NVIDIA_kernel-195.36.24-6120611.diff.txt
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -49,16 +46,6 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
-# patch loop
-for arch in x86 x64
-do
- pushd nvidiapkg-${arch}
- pushd usr/src/nv
-%patch0 -p3 -b .iommu
- popd
- popd
-done
-
for kernel_version in %{?kernel_versions} ; do
%ifarch %{ix86}
@@ -71,7 +58,7 @@
%build
for kernel_version in %{?kernel_versions}; do
- pushd _kmod_build_${kernel_version%%___*}/usr/src/nv/
+ pushd _kmod_build_${kernel_version%%___*}/kernel/
ln -s -f Makefile.kbuild Makefile
if [[ "${kernel_version%%___*}" = *xen ]] ; then
CC="cc -D__XEN_TOOLS__ \
@@ -89,7 +76,7 @@
%install
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions}; do
- install -D -m 0755 _kmod_build_${kernel_version%%___*}/usr/src/nv/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/kernel/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
done
%{?akmod_install}
@@ -99,8 +86,19 @@
%changelog
+* Wed Sep 01 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.53-1
+- Update to 256.53
+
+* Thu Aug 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.44-1
+- Update to 256.44
+
+* Wed Jun 18 2010 Vallimar de Morieve <vallimar(a)gmail.com> - 1:256.35-1
+- update to 256.35
+
* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
+- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
+ http://bugs.gentoo.org/show_bug.cgi?id=301318
* Sun Jun 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.24-2
- Backport IOMMU - http://www.nvnews.net/vbulletin/showthread.php?t=151791
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Jun 2010 10:31:35 -0000 1.20
+++ sources 5 Sep 2010 10:31:21 -0000 1.21
@@ -1 +1 @@
-013fe3ae0e449b22398a290aa13621dd nvidia-kmod-data-195.36.31.tar.bz2
+8199e0735acd30fecc111f67ecb59903 nvidia-kmod-data-256.53.tar.bz2
--- NVIDIA_kernel-195.36.24-6120611.diff.txt DELETED ---
13 years, 8 months