rpms/rt2870-kmod/F-10 rt2870-additional-devices-support.patch, 1.5, 1.6 rt2870-kmod.spec, 1.50, 1.51
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16083
Modified Files:
rt2870-additional-devices-support.patch rt2870-kmod.spec
Log Message:
* Sat Nov 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-4
- Add support for bunch of other devices. The device ID's are taken from rt2x00
branch of kernel.
rt2870-additional-devices-support.patch:
Index: rt2870-additional-devices-support.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-10/rt2870-additional-devices-support.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rt2870-additional-devices-support.patch 22 Nov 2009 03:35:11 -0000 1.5
+++ rt2870-additional-devices-support.patch 28 Nov 2009 08:50:04 -0000 1.6
@@ -1,11 +1,77 @@
diff -rupN 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c
--- 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009-04-23 05:40:40.000000000 -0400
-+++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-21 22:12:09.000000000 -0500
-@@ -90,6 +90,7 @@ struct usb_device_id rtusb_usb_id[] = {
- {USB_DEVICE(0x15c5,0x0008)}, /* Amit */
- {USB_DEVICE(0x0E66,0x0001)}, /* Hawking */
- {USB_DEVICE(0x0E66,0x0003)}, /* Hawking */
-+ {USB_DEVICE(0x0E66,0x0015)}, /* Hawking HWDN2 REV-E*/
- {USB_DEVICE(0x129B,0x1828)}, /* Siemens */
- {USB_DEVICE(0x157E,0x300E)}, /* U-Media */
- {USB_DEVICE(0x050d,0x805c)},
++++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-28 03:22:23.000000000 -0500
+@@ -105,6 +105,73 @@ struct usb_device_id rtusb_usb_id[] = {
+ {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */
+ {USB_DEVICE(0x0411,0x00e8)}, /* Buffalo WLI-UC-G300N*/
+ {USB_DEVICE(0x050d,0x815c)}, /* Belkin F5D8053 */
++ /* The following were taken from drivers/net/wireless/rt2x00/rt2800usb.c
++ of SerialMonkey's kernel branch, which will be a part of mainstream kernel
++ soon. We will get rid of this kmod then. - Orcan Ogetbil */
++ /* Amigo */
++ { USB_DEVICE(0x0e0b, 0x9031) },
++ { USB_DEVICE(0x0e0b, 0x9041) },
++ /* ASUS */
++ { USB_DEVICE(0x0b05, 0x1760) },
++ { USB_DEVICE(0x0b05, 0x1761) },
++ /* AzureWave */
++ { USB_DEVICE(0x13d3, 0x3262) },
++ { USB_DEVICE(0x13d3, 0x3284) },
++ /* Belkin */
++ { USB_DEVICE(0x050d, 0x825a) },
++ /* Buffalo */
++ { USB_DEVICE(0x0411, 0x012e) },
++ /* Conceptronic */
++ { USB_DEVICE(0x14b2, 0x3c08) },
++ { USB_DEVICE(0x14b2, 0x3c11) },
++ /* Corega */
++ { USB_DEVICE(0x18c5, 0x0008) },
++ /* D-Link */
++ { USB_DEVICE(0x07d1, 0x3c0b) },
++ { USB_DEVICE(0x07d1, 0x3c13) },
++ /* EnGenius */
++ { USB_DEVICE(0x1740, 0x9801) },
++ /* Gemtek */
++ { USB_DEVICE(0x15a9, 0x0010) },
++ /* Gigabyte */
++ { USB_DEVICE(0x1044, 0x800c) },
++ /* Hawking */
++ { USB_DEVICE(0x0e66, 0x0009) },
++ { USB_DEVICE(0x0e66, 0x000b) },
++ { USB_DEVICE(0x0e66, 0x0015)}, /* Hawking HWDN2 REV-E*/
++ /* LevelOne */
++ { USB_DEVICE(0x1740, 0x0605) },
++ { USB_DEVICE(0x1740, 0x0615) },
++ /* Linksys */
++ { USB_DEVICE(0x1737, 0x0077) },
++ /* Motorola */
++ { USB_DEVICE(0x100d, 0x9031) },
++ { USB_DEVICE(0x100d, 0x9032) },
++ /* Ovislink */
++ { USB_DEVICE(0x1b75, 0x3072) },
++ /* Pegatron */
++ { USB_DEVICE(0x1d4d, 0x0002) },
++ /* Planex */
++ { USB_DEVICE(0x2019, 0xab24) },
++ /* Qcom */
++ { USB_DEVICE(0x18e8, 0x6259) },
++ /* Ralink */
++ { USB_DEVICE(0x0db0, 0x6899) },
++ { USB_DEVICE(0x148f, 0x2070) },
++ /* Sitecom */
++ { USB_DEVICE(0x0df6, 0x003b) },
++ { USB_DEVICE(0x0df6, 0x003c) },
++ { USB_DEVICE(0x0df6, 0x003d) },
++ { USB_DEVICE(0x0df6, 0x003f) },
++ { USB_DEVICE(0x0df6, 0x0040) },
++ /* SMC */
++ { USB_DEVICE(0x083a, 0xa512) },
++ { USB_DEVICE(0x083a, 0xc522) },
++ /* Sweex */
++ { USB_DEVICE(0x177f, 0x0153) },
++ { USB_DEVICE(0x177f, 0x0313) },
++ /* Zyxel */
++ { USB_DEVICE(0x0586, 0x341a) },
+ #endif // RT2870 //
+ { }/* Terminating entry */
+ };
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-10/rt2870-kmod.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- rt2870-kmod.spec 22 Nov 2009 03:35:11 -0000 1.50
+++ rt2870-kmod.spec 28 Nov 2009 08:50:04 -0000 1.51
@@ -7,7 +7,7 @@
Name: rt2870-kmod
Version: 2.1.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -27,7 +27,7 @@
BuildRequires: %{_bindir}/kmodtool
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i586 i686 x86_64 ppc ppc64
+ExclusiveArch: i586 i686 x86_64 ppc ppc64
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -83,6 +83,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-4
+- Add support for bunch of other devices. The device ID's are taken from rt2x00
+ branch of kernel.
+
* Sat Nov 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-3
- Add Hawking HWDN2 REV-E support
14 years, 12 months
rpms/rt2870-kmod/F-11 rt2870-additional-devices-support.patch, 1.5, 1.6 rt2870-kmod.spec, 1.61, 1.62
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15566
Modified Files:
rt2870-additional-devices-support.patch rt2870-kmod.spec
Log Message:
* Sat Nov 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-4
- Add support for bunch of other devices. The device ID's are taken from rt2x00
branch of kernel.
rt2870-additional-devices-support.patch:
Index: rt2870-additional-devices-support.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-11/rt2870-additional-devices-support.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rt2870-additional-devices-support.patch 22 Nov 2009 03:30:57 -0000 1.5
+++ rt2870-additional-devices-support.patch 28 Nov 2009 08:46:38 -0000 1.6
@@ -1,11 +1,77 @@
diff -rupN 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c
--- 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009-04-23 05:40:40.000000000 -0400
-+++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-21 22:12:09.000000000 -0500
-@@ -90,6 +90,7 @@ struct usb_device_id rtusb_usb_id[] = {
- {USB_DEVICE(0x15c5,0x0008)}, /* Amit */
- {USB_DEVICE(0x0E66,0x0001)}, /* Hawking */
- {USB_DEVICE(0x0E66,0x0003)}, /* Hawking */
-+ {USB_DEVICE(0x0E66,0x0015)}, /* Hawking HWDN2 REV-E*/
- {USB_DEVICE(0x129B,0x1828)}, /* Siemens */
- {USB_DEVICE(0x157E,0x300E)}, /* U-Media */
- {USB_DEVICE(0x050d,0x805c)},
++++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-28 03:22:23.000000000 -0500
+@@ -105,6 +105,73 @@ struct usb_device_id rtusb_usb_id[] = {
+ {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */
+ {USB_DEVICE(0x0411,0x00e8)}, /* Buffalo WLI-UC-G300N*/
+ {USB_DEVICE(0x050d,0x815c)}, /* Belkin F5D8053 */
++ /* The following were taken from drivers/net/wireless/rt2x00/rt2800usb.c
++ of SerialMonkey's kernel branch, which will be a part of mainstream kernel
++ soon. We will get rid of this kmod then. - Orcan Ogetbil */
++ /* Amigo */
++ { USB_DEVICE(0x0e0b, 0x9031) },
++ { USB_DEVICE(0x0e0b, 0x9041) },
++ /* ASUS */
++ { USB_DEVICE(0x0b05, 0x1760) },
++ { USB_DEVICE(0x0b05, 0x1761) },
++ /* AzureWave */
++ { USB_DEVICE(0x13d3, 0x3262) },
++ { USB_DEVICE(0x13d3, 0x3284) },
++ /* Belkin */
++ { USB_DEVICE(0x050d, 0x825a) },
++ /* Buffalo */
++ { USB_DEVICE(0x0411, 0x012e) },
++ /* Conceptronic */
++ { USB_DEVICE(0x14b2, 0x3c08) },
++ { USB_DEVICE(0x14b2, 0x3c11) },
++ /* Corega */
++ { USB_DEVICE(0x18c5, 0x0008) },
++ /* D-Link */
++ { USB_DEVICE(0x07d1, 0x3c0b) },
++ { USB_DEVICE(0x07d1, 0x3c13) },
++ /* EnGenius */
++ { USB_DEVICE(0x1740, 0x9801) },
++ /* Gemtek */
++ { USB_DEVICE(0x15a9, 0x0010) },
++ /* Gigabyte */
++ { USB_DEVICE(0x1044, 0x800c) },
++ /* Hawking */
++ { USB_DEVICE(0x0e66, 0x0009) },
++ { USB_DEVICE(0x0e66, 0x000b) },
++ { USB_DEVICE(0x0e66, 0x0015)}, /* Hawking HWDN2 REV-E*/
++ /* LevelOne */
++ { USB_DEVICE(0x1740, 0x0605) },
++ { USB_DEVICE(0x1740, 0x0615) },
++ /* Linksys */
++ { USB_DEVICE(0x1737, 0x0077) },
++ /* Motorola */
++ { USB_DEVICE(0x100d, 0x9031) },
++ { USB_DEVICE(0x100d, 0x9032) },
++ /* Ovislink */
++ { USB_DEVICE(0x1b75, 0x3072) },
++ /* Pegatron */
++ { USB_DEVICE(0x1d4d, 0x0002) },
++ /* Planex */
++ { USB_DEVICE(0x2019, 0xab24) },
++ /* Qcom */
++ { USB_DEVICE(0x18e8, 0x6259) },
++ /* Ralink */
++ { USB_DEVICE(0x0db0, 0x6899) },
++ { USB_DEVICE(0x148f, 0x2070) },
++ /* Sitecom */
++ { USB_DEVICE(0x0df6, 0x003b) },
++ { USB_DEVICE(0x0df6, 0x003c) },
++ { USB_DEVICE(0x0df6, 0x003d) },
++ { USB_DEVICE(0x0df6, 0x003f) },
++ { USB_DEVICE(0x0df6, 0x0040) },
++ /* SMC */
++ { USB_DEVICE(0x083a, 0xa512) },
++ { USB_DEVICE(0x083a, 0xc522) },
++ /* Sweex */
++ { USB_DEVICE(0x177f, 0x0153) },
++ { USB_DEVICE(0x177f, 0x0313) },
++ /* Zyxel */
++ { USB_DEVICE(0x0586, 0x341a) },
+ #endif // RT2870 //
+ { }/* Terminating entry */
+ };
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-11/rt2870-kmod.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- rt2870-kmod.spec 22 Nov 2009 21:39:31 -0000 1.61
+++ rt2870-kmod.spec 28 Nov 2009 08:46:38 -0000 1.62
@@ -3,11 +3,11 @@
# "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: rt2870-kmod
Version: 2.1.2.0
-Release: 3%{?dist}.1
+Release: 4%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -27,7 +27,7 @@
BuildRequires: %{_bindir}/kmodtool
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i586 i686 x86_64 ppc ppc64
+ExclusiveArch: i586 i686 x86_64 ppc ppc64
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -83,6 +83,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-4
+- Add support for bunch of other devices. The device ID's are taken from rt2x00
+ branch of kernel.
+
* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.2.0-3.1
- rebuild for new kernels
14 years, 12 months
rpms/rt2870-kmod/F-12 rt2870-additional-devices-support.patch, 1.5, 1.6 rt2870-kmod.spec, 1.59, 1.60
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14929
Modified Files:
rt2870-additional-devices-support.patch rt2870-kmod.spec
Log Message:
* Sat Nov 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-6
- Add support for bunch of other devices. The device ID's are taken from rt2x00
branch of kernel.
rt2870-additional-devices-support.patch:
Index: rt2870-additional-devices-support.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-12/rt2870-additional-devices-support.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rt2870-additional-devices-support.patch 22 Nov 2009 03:22:00 -0000 1.5
+++ rt2870-additional-devices-support.patch 28 Nov 2009 08:42:14 -0000 1.6
@@ -1,11 +1,77 @@
diff -rupN 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c
--- 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009-04-23 05:40:40.000000000 -0400
-+++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-21 22:12:09.000000000 -0500
-@@ -90,6 +90,7 @@ struct usb_device_id rtusb_usb_id[] = {
- {USB_DEVICE(0x15c5,0x0008)}, /* Amit */
- {USB_DEVICE(0x0E66,0x0001)}, /* Hawking */
- {USB_DEVICE(0x0E66,0x0003)}, /* Hawking */
-+ {USB_DEVICE(0x0E66,0x0015)}, /* Hawking HWDN2 REV-E*/
- {USB_DEVICE(0x129B,0x1828)}, /* Siemens */
- {USB_DEVICE(0x157E,0x300E)}, /* U-Media */
- {USB_DEVICE(0x050d,0x805c)},
++++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-28 03:22:23.000000000 -0500
+@@ -105,6 +105,73 @@ struct usb_device_id rtusb_usb_id[] = {
+ {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */
+ {USB_DEVICE(0x0411,0x00e8)}, /* Buffalo WLI-UC-G300N*/
+ {USB_DEVICE(0x050d,0x815c)}, /* Belkin F5D8053 */
++ /* The following were taken from drivers/net/wireless/rt2x00/rt2800usb.c
++ of SerialMonkey's kernel branch, which will be a part of mainstream kernel
++ soon. We will get rid of this kmod then. - Orcan Ogetbil */
++ /* Amigo */
++ { USB_DEVICE(0x0e0b, 0x9031) },
++ { USB_DEVICE(0x0e0b, 0x9041) },
++ /* ASUS */
++ { USB_DEVICE(0x0b05, 0x1760) },
++ { USB_DEVICE(0x0b05, 0x1761) },
++ /* AzureWave */
++ { USB_DEVICE(0x13d3, 0x3262) },
++ { USB_DEVICE(0x13d3, 0x3284) },
++ /* Belkin */
++ { USB_DEVICE(0x050d, 0x825a) },
++ /* Buffalo */
++ { USB_DEVICE(0x0411, 0x012e) },
++ /* Conceptronic */
++ { USB_DEVICE(0x14b2, 0x3c08) },
++ { USB_DEVICE(0x14b2, 0x3c11) },
++ /* Corega */
++ { USB_DEVICE(0x18c5, 0x0008) },
++ /* D-Link */
++ { USB_DEVICE(0x07d1, 0x3c0b) },
++ { USB_DEVICE(0x07d1, 0x3c13) },
++ /* EnGenius */
++ { USB_DEVICE(0x1740, 0x9801) },
++ /* Gemtek */
++ { USB_DEVICE(0x15a9, 0x0010) },
++ /* Gigabyte */
++ { USB_DEVICE(0x1044, 0x800c) },
++ /* Hawking */
++ { USB_DEVICE(0x0e66, 0x0009) },
++ { USB_DEVICE(0x0e66, 0x000b) },
++ { USB_DEVICE(0x0e66, 0x0015)}, /* Hawking HWDN2 REV-E*/
++ /* LevelOne */
++ { USB_DEVICE(0x1740, 0x0605) },
++ { USB_DEVICE(0x1740, 0x0615) },
++ /* Linksys */
++ { USB_DEVICE(0x1737, 0x0077) },
++ /* Motorola */
++ { USB_DEVICE(0x100d, 0x9031) },
++ { USB_DEVICE(0x100d, 0x9032) },
++ /* Ovislink */
++ { USB_DEVICE(0x1b75, 0x3072) },
++ /* Pegatron */
++ { USB_DEVICE(0x1d4d, 0x0002) },
++ /* Planex */
++ { USB_DEVICE(0x2019, 0xab24) },
++ /* Qcom */
++ { USB_DEVICE(0x18e8, 0x6259) },
++ /* Ralink */
++ { USB_DEVICE(0x0db0, 0x6899) },
++ { USB_DEVICE(0x148f, 0x2070) },
++ /* Sitecom */
++ { USB_DEVICE(0x0df6, 0x003b) },
++ { USB_DEVICE(0x0df6, 0x003c) },
++ { USB_DEVICE(0x0df6, 0x003d) },
++ { USB_DEVICE(0x0df6, 0x003f) },
++ { USB_DEVICE(0x0df6, 0x0040) },
++ /* SMC */
++ { USB_DEVICE(0x083a, 0xa512) },
++ { USB_DEVICE(0x083a, 0xc522) },
++ /* Sweex */
++ { USB_DEVICE(0x177f, 0x0153) },
++ { USB_DEVICE(0x177f, 0x0313) },
++ /* Zyxel */
++ { USB_DEVICE(0x0586, 0x341a) },
+ #endif // RT2870 //
+ { }/* Terminating entry */
+ };
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-12/rt2870-kmod.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- rt2870-kmod.spec 25 Nov 2009 16:57:27 -0000 1.59
+++ rt2870-kmod.spec 28 Nov 2009 08:42:14 -0000 1.60
@@ -3,11 +3,11 @@
# "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: rt2870-kmod
Version: 2.1.2.0
-Release: 5%{?dist}.2
+Release: 6%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -80,6 +80,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-6
+- Add support for bunch of other devices. The device ID's are taken from rt2x00
+ branch of kernel.
+
* Wed Nov 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.2.0-5.2
- rebuild for new kernel
14 years, 12 months
rpms/rt2870-kmod/devel rt2870-additional-devices-support.patch, 1.5, 1.6 rt2870-kmod.spec, 1.56, 1.57
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14684
Modified Files:
rt2870-additional-devices-support.patch rt2870-kmod.spec
Log Message:
* Sat Nov 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-6
- Add support for bunch of other devices. The device ID's are taken from rt2x00
branch of kernel.
rt2870-additional-devices-support.patch:
Index: rt2870-additional-devices-support.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-additional-devices-support.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rt2870-additional-devices-support.patch 22 Nov 2009 03:19:29 -0000 1.5
+++ rt2870-additional-devices-support.patch 28 Nov 2009 08:39:43 -0000 1.6
@@ -1,11 +1,77 @@
diff -rupN 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c
--- 2009_0521_RT2870_Linux_STA_V2.1.2.0.old/os/linux/usb_main_dev.c 2009-04-23 05:40:40.000000000 -0400
-+++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-21 22:12:09.000000000 -0500
-@@ -90,6 +90,7 @@ struct usb_device_id rtusb_usb_id[] = {
- {USB_DEVICE(0x15c5,0x0008)}, /* Amit */
- {USB_DEVICE(0x0E66,0x0001)}, /* Hawking */
- {USB_DEVICE(0x0E66,0x0003)}, /* Hawking */
-+ {USB_DEVICE(0x0E66,0x0015)}, /* Hawking HWDN2 REV-E*/
- {USB_DEVICE(0x129B,0x1828)}, /* Siemens */
- {USB_DEVICE(0x157E,0x300E)}, /* U-Media */
- {USB_DEVICE(0x050d,0x805c)},
++++ 2009_0521_RT2870_Linux_STA_V2.1.2.0/os/linux/usb_main_dev.c 2009-11-28 03:22:23.000000000 -0500
+@@ -105,6 +105,73 @@ struct usb_device_id rtusb_usb_id[] = {
+ {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */
+ {USB_DEVICE(0x0411,0x00e8)}, /* Buffalo WLI-UC-G300N*/
+ {USB_DEVICE(0x050d,0x815c)}, /* Belkin F5D8053 */
++ /* The following were taken from drivers/net/wireless/rt2x00/rt2800usb.c
++ of SerialMonkey's kernel branch, which will be a part of mainstream kernel
++ soon. We will get rid of this kmod then. - Orcan Ogetbil */
++ /* Amigo */
++ { USB_DEVICE(0x0e0b, 0x9031) },
++ { USB_DEVICE(0x0e0b, 0x9041) },
++ /* ASUS */
++ { USB_DEVICE(0x0b05, 0x1760) },
++ { USB_DEVICE(0x0b05, 0x1761) },
++ /* AzureWave */
++ { USB_DEVICE(0x13d3, 0x3262) },
++ { USB_DEVICE(0x13d3, 0x3284) },
++ /* Belkin */
++ { USB_DEVICE(0x050d, 0x825a) },
++ /* Buffalo */
++ { USB_DEVICE(0x0411, 0x012e) },
++ /* Conceptronic */
++ { USB_DEVICE(0x14b2, 0x3c08) },
++ { USB_DEVICE(0x14b2, 0x3c11) },
++ /* Corega */
++ { USB_DEVICE(0x18c5, 0x0008) },
++ /* D-Link */
++ { USB_DEVICE(0x07d1, 0x3c0b) },
++ { USB_DEVICE(0x07d1, 0x3c13) },
++ /* EnGenius */
++ { USB_DEVICE(0x1740, 0x9801) },
++ /* Gemtek */
++ { USB_DEVICE(0x15a9, 0x0010) },
++ /* Gigabyte */
++ { USB_DEVICE(0x1044, 0x800c) },
++ /* Hawking */
++ { USB_DEVICE(0x0e66, 0x0009) },
++ { USB_DEVICE(0x0e66, 0x000b) },
++ { USB_DEVICE(0x0e66, 0x0015)}, /* Hawking HWDN2 REV-E*/
++ /* LevelOne */
++ { USB_DEVICE(0x1740, 0x0605) },
++ { USB_DEVICE(0x1740, 0x0615) },
++ /* Linksys */
++ { USB_DEVICE(0x1737, 0x0077) },
++ /* Motorola */
++ { USB_DEVICE(0x100d, 0x9031) },
++ { USB_DEVICE(0x100d, 0x9032) },
++ /* Ovislink */
++ { USB_DEVICE(0x1b75, 0x3072) },
++ /* Pegatron */
++ { USB_DEVICE(0x1d4d, 0x0002) },
++ /* Planex */
++ { USB_DEVICE(0x2019, 0xab24) },
++ /* Qcom */
++ { USB_DEVICE(0x18e8, 0x6259) },
++ /* Ralink */
++ { USB_DEVICE(0x0db0, 0x6899) },
++ { USB_DEVICE(0x148f, 0x2070) },
++ /* Sitecom */
++ { USB_DEVICE(0x0df6, 0x003b) },
++ { USB_DEVICE(0x0df6, 0x003c) },
++ { USB_DEVICE(0x0df6, 0x003d) },
++ { USB_DEVICE(0x0df6, 0x003f) },
++ { USB_DEVICE(0x0df6, 0x0040) },
++ /* SMC */
++ { USB_DEVICE(0x083a, 0xa512) },
++ { USB_DEVICE(0x083a, 0xc522) },
++ /* Sweex */
++ { USB_DEVICE(0x177f, 0x0153) },
++ { USB_DEVICE(0x177f, 0x0313) },
++ /* Zyxel */
++ { USB_DEVICE(0x0586, 0x341a) },
+ #endif // RT2870 //
+ { }/* Terminating entry */
+ };
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- rt2870-kmod.spec 22 Nov 2009 04:01:22 -0000 1.56
+++ rt2870-kmod.spec 28 Nov 2009 08:39:43 -0000 1.57
@@ -7,7 +7,7 @@
Name: rt2870-kmod
Version: 2.1.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -80,6 +80,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-6
+- Add support for bunch of other devices. The device ID's are taken from rt2x00
+ branch of kernel.
+
* Sat Nov 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.2.0-5
- No need to build i586 kmod anymore
14 years, 12 months
rpms/xorg-x11-drv-nvidia-96xx/F-12 xorg-x11-drv-nvidia-96xx.spec, 1.16, 1.17 nvidia-settings.desktop, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9882
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Removed Files:
nvidia-settings.desktop
Log Message:
Remove duplicate desktop file
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nvidia-96xx.spec 24 Nov 2009 22:56:31 -0000 1.16
+++ xorg-x11-drv-nvidia-96xx.spec 27 Nov 2009 18:17:04 -0000 1.17
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,7 +16,6 @@
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...
-Source4: nvidia-settings.desktop
Source5: nvidia-96xx-init
Source6: blacklist-nouveau.conf
Source10: nvidia-96xx-config-display
@@ -44,7 +43,6 @@
Requires(post): nvidia-96xx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
BuildRequires: prelink
Requires: which
Requires: livna-config-display
@@ -196,11 +194,6 @@
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-config-display
-# Desktop entry for nvidia-settings
-desktop-file-install --vendor livna \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE4}
-
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
@@ -265,7 +258,6 @@
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
-%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%exclude %{_mandir}/man1/nvidia-settings.*
%exclude %{_mandir}/man1/nvidia-xconfig.*
@@ -288,6 +280,9 @@
%changelog
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-3
+- Remove duplicate desktop file
+
* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-2
- Use nvidia-xconfig and nvidia-settings built from sources.
--- nvidia-settings.desktop DELETED ---
14 years, 12 months
rpms/xorg-x11-drv-nvidia-96xx/devel xorg-x11-drv-nvidia-96xx.spec, 1.16, 1.17 nvidia-settings.desktop, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9755
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Removed Files:
nvidia-settings.desktop
Log Message:
Remove duplicate desktop file
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nvidia-96xx.spec 24 Nov 2009 22:56:31 -0000 1.16
+++ xorg-x11-drv-nvidia-96xx.spec 27 Nov 2009 18:16:00 -0000 1.17
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,7 +16,6 @@
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...
-Source4: nvidia-settings.desktop
Source5: nvidia-96xx-init
Source6: blacklist-nouveau.conf
Source10: nvidia-96xx-config-display
@@ -44,7 +43,6 @@
Requires(post): nvidia-96xx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
BuildRequires: prelink
Requires: which
Requires: livna-config-display
@@ -196,11 +194,6 @@
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-config-display
-# Desktop entry for nvidia-settings
-desktop-file-install --vendor livna \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE4}
-
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
@@ -265,7 +258,6 @@
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
-%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%exclude %{_mandir}/man1/nvidia-settings.*
%exclude %{_mandir}/man1/nvidia-xconfig.*
@@ -288,6 +280,9 @@
%changelog
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-3
+- Remove duplicate desktop file
+
* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-2
- Use nvidia-xconfig and nvidia-settings built from sources.
--- nvidia-settings.desktop DELETED ---
14 years, 12 months
rpms/xorg-x11-drv-nvidia-173xx/F-12 xorg-x11-drv-nvidia-173xx.spec, 1.14, 1.15 nvidia-settings.desktop, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9229
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Removed Files:
nvidia-settings.desktop
Log Message:
Remove duplicate desktop file
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-12/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-nvidia-173xx.spec 24 Nov 2009 23:19:00 -0000 1.14
+++ xorg-x11-drv-nvidia-173xx.spec 27 Nov 2009 18:10:54 -0000 1.15
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.22
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,7 +16,6 @@
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...
-Source4: nvidia-settings.desktop
Source5: nvidia-173xx-init
Source6: blacklist-nouveau.conf
Source10: nvidia-173xx-config-display
@@ -44,7 +43,6 @@
Requires(post): nvidia-173xx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
BuildRequires: prelink
Requires: which
Requires: livna-config-display >= 0.0.22
@@ -205,11 +203,6 @@
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-173xx-config-display
-# Desktop entry for nvidia-settings
-desktop-file-install --vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE4}
-
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-173xx
@@ -279,7 +272,6 @@
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
-%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%exclude %{_mandir}/man1/nvidia-settings.*
%exclude %{_mandir}/man1/nvidia-xconfig.*
@@ -304,6 +296,9 @@
%changelog
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.22-3
+- Remove duplicate desktop file
+
* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.22-2
- Use nvidia-xconfig and nvidia-settings built from sources.
--- nvidia-settings.desktop DELETED ---
14 years, 12 months
rpms/xorg-x11-drv-nvidia-173xx/devel xorg-x11-drv-nvidia-173xx.spec, 1.15, 1.16 nvidia-settings.desktop, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8997
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Removed Files:
nvidia-settings.desktop
Log Message:
Remove duplicate desktop file
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-nvidia-173xx.spec 24 Nov 2009 23:19:00 -0000 1.15
+++ xorg-x11-drv-nvidia-173xx.spec 27 Nov 2009 18:09:22 -0000 1.16
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.22
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,7 +16,6 @@
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...
-Source4: nvidia-settings.desktop
Source5: nvidia-173xx-init
Source6: blacklist-nouveau.conf
Source10: nvidia-173xx-config-display
@@ -44,7 +43,6 @@
Requires(post): nvidia-173xx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
BuildRequires: prelink
Requires: which
Requires: livna-config-display >= 0.0.22
@@ -205,11 +203,6 @@
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-173xx-config-display
-# Desktop entry for nvidia-settings
-desktop-file-install --vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE4}
-
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-173xx
@@ -279,7 +272,6 @@
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
-%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%exclude %{_mandir}/man1/nvidia-settings.*
%exclude %{_mandir}/man1/nvidia-xconfig.*
@@ -304,6 +296,9 @@
%changelog
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.22-3
+- Remove duplicate desktop file
+
* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.22-2
- Use nvidia-xconfig and nvidia-settings built from sources.
--- nvidia-settings.desktop DELETED ---
14 years, 12 months
rpms/xorg-x11-drv-nvidia/F-12 xorg-x11-drv-nvidia.spec, 1.33, 1.34 nvidia-settings.desktop, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8491
Modified Files:
xorg-x11-drv-nvidia.spec
Removed Files:
nvidia-settings.desktop
Log Message:
Remove nvidia desktop file
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-nvidia.spec 24 Nov 2009 21:41:43 -0000 1.33
+++ xorg-x11-drv-nvidia.spec 27 Nov 2009 18:04:35 -0000 1.34
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 190.42
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,7 +16,6 @@
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...
-Source4: nvidia-settings.desktop
Source5: nvidia-init
Source6: blacklist-nouveau.conf
Source10: nvidia-config-display
@@ -44,7 +43,6 @@
Requires(post): nvidia-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
BuildRequires: prelink
Requires: which
Requires: livna-config-display >= 0.0.21
@@ -224,11 +222,6 @@
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
-# Desktop entry for nvidia-settings
-desktop-file-install --vendor livna \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE4}
-
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
@@ -298,7 +291,6 @@
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
-%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%exclude %{_mandir}/man1/nvidia-settings.*
%exclude %{_mandir}/man1/nvidia-xconfig.*
@@ -333,6 +325,9 @@
%changelog
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-5
+- Remove duplicate desktop file.
+
* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-4
- Use nvidia-xconfig and nvidia-settings built from sources.
--- nvidia-settings.desktop DELETED ---
14 years, 12 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec, 1.33, 1.34 nvidia-settings.desktop, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8085
Modified Files:
xorg-x11-drv-nvidia.spec
Removed Files:
nvidia-settings.desktop
Log Message:
Remove desktop file
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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-nvidia.spec 24 Nov 2009 21:41:43 -0000 1.33
+++ xorg-x11-drv-nvidia.spec 27 Nov 2009 18:03:27 -0000 1.34
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 190.42
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,7 +16,6 @@
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...
-Source4: nvidia-settings.desktop
Source5: nvidia-init
Source6: blacklist-nouveau.conf
Source10: nvidia-config-display
@@ -44,7 +43,6 @@
Requires(post): nvidia-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
BuildRequires: prelink
Requires: which
Requires: livna-config-display >= 0.0.21
@@ -224,11 +222,6 @@
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
-# Desktop entry for nvidia-settings
-desktop-file-install --vendor livna \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE4}
-
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
@@ -298,7 +291,6 @@
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
-%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%exclude %{_mandir}/man1/nvidia-settings.*
%exclude %{_mandir}/man1/nvidia-xconfig.*
@@ -333,6 +325,9 @@
%changelog
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-5
+- Remove duplicate desktop file.
+
* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-4
- Use nvidia-xconfig and nvidia-settings built from sources.
--- nvidia-settings.desktop DELETED ---
14 years, 12 months