Author: thl Update of /cvs/free/rpms/staging-kmod-addons/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13574 Modified Files: .cvsignore sources staging-kmod-addons.spec Log Message: update to 3.12 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/staging-kmod-addons/F-19/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Sep 2013 09:39:04 -0000 1.9 +++ .cvsignore 20 Dec 2013 21:12:25 -0000 1.10 @@ -1 +1 @@ -linux-staging-3.11.1.tar.bz2 +linux-staging-3.12.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/staging-kmod-addons/F-19/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Sep 2013 09:39:04 -0000 1.10 +++ sources 20 Dec 2013 21:12:25 -0000 1.11 @@ -1 +1 @@ -0a4ba4ac5c5f023d3c835f8dd598cc87 linux-staging-3.11.1.tar.bz2 +e3bdfe68ef360a896bdb8a476641f1bf linux-staging-3.12.6.tar.bz2 Index: staging-kmod-addons.spec =================================================================== RCS file: /cvs/free/rpms/staging-kmod-addons/F-19/staging-kmod-addons.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- staging-kmod-addons.spec 3 Oct 2013 09:49:05 -0000 1.14 +++ staging-kmod-addons.spec 20 Dec 2013 21:12:25 -0000 1.15 @@ -1,13 +1,13 @@ # drivers that we ship; to be synced with staging-kmod.spec -%global stgdrvs ASUS_OLED BCM_WIMAX DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB NET_VENDOR_SILICOM PRISM2_USB R8187SE RTL8192U RTS5139 SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2 ZCACHE ZRAM ZSMALLOC +%global stgdrvs BCM_WIMAX DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB LTE_GDM724X NET_VENDOR_SILICOM PRISM2_USB R8187SE R8188EU RTL8192U RTS5139 SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2 ZRAM ZSMALLOC # makes handling for rc kernels a whole lot easier: #global prever rc8 Name: staging-kmod-addons -Version: 3.11.1 -Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1 +Version: 3.12.6 +Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist} Summary: Documentation and shared parts for the kmod-staging packages Group: System Environment/Kernel @@ -24,7 +24,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel libtool pkgconfig BuildRequires: libsysfs-devel +%if 0%{?fedora} >= 20 +BuildRequires: %{_prefix}/lib/rpm/macros.d/macros.systemd +%else BuildRequires: %{_sysconfdir}/rpm/macros.systemd +%endif %description Documentation for some of the kernel modules from linux-staging. @@ -140,8 +144,11 @@ %changelog -* Thu Oct 03 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.11.1-1.1 -- Rebuilt +* Fri Dec 20 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.12.6-1 +- Update to 3.12.6 +- drop ASUS_OLED, dropped upstream +- enable LTE_GDM724X and R8188EU +- conditionalize BR, as macros.systemd is somewhere else in f20 * Fri Sep 20 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.11.1-1 - Update to 3.11.1