rpms/staging-kmod/F-15 staging-kmod.spec,1.22,1.23
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11255
Modified Files:
staging-kmod.spec
Log Message:
make it obvious that akmods are not supported and remove buildforkernels variable to avoid mistakes
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/staging-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- staging-kmod.spec 1 Aug 2011 18:02:17 -0000 1.22
+++ staging-kmod.spec 1 Aug 2011 18:28:39 -0000 1.23
@@ -33,8 +33,8 @@
BuildRequires: %{_bindir}/kmodtool
# kmodtool does its magic here
-%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-newest-%{_target_cpu} }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --newest %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
@@ -44,7 +44,7 @@
%prep
# kmodtool check and debug output:
%{?kmodtool_check}
-kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --newest %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
# prepare
%setup -q -c -T -a 0
@@ -139,6 +139,8 @@
%changelog
* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-3
- bump release to 3 to avoid tagging problems in cvs
+- make it obvious that akmods are not supported and remove buildforkernels
+ variable to avoid mistakes
* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-1
- update to 3.0 aka 2.6.40
12 years, 8 months
rpms/staging-kmod-addons/F-15 .cvsignore,1.4,1.5 sources,1.4,1.5
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7412
Modified Files:
.cvsignore sources
Log Message:
update sources
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 26 May 2011 12:52:41 -0000 1.4
+++ .cvsignore 1 Aug 2011 18:05:30 -0000 1.5
@@ -1 +1 @@
-linux-staging-2.6.38.7.tar.bz2
+linux-staging-2.6.40.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 26 May 2011 12:52:41 -0000 1.4
+++ sources 1 Aug 2011 18:05:30 -0000 1.5
@@ -1 +1 @@
-f5a1d18578d0931dd21d2be6f969ecda linux-staging-2.6.38.7.tar.bz2
+11e75c74635ef4862d1b126a77583dde linux-staging-2.6.40.tar.bz2
12 years, 8 months
rpms/staging-kmod-addons/F-15 staging-kmod-addons.spec,1.5,1.6
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7233
Modified Files:
staging-kmod-addons.spec
Log Message:
* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-3
- update to 3.0 aka 2.6.40
- Enable BRCMSMAC, BRCMFMAC, DRM_PSB, INTEL_MEI, RTS_PSTOR, XVMALLOC, ZCACHE
- Drop RT2860, RT2870, RT3070, RT3090, SAMSUNG_LAPTOP dropped upstream
- bump release to 3 to avoid tagging problems in cvs
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/staging-kmod-addons.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- staging-kmod-addons.spec 29 May 2011 12:55:42 -0000 1.5
+++ staging-kmod-addons.spec 1 Aug 2011 18:03:17 -0000 1.6
@@ -1,13 +1,12 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BCM_WIMAX BRCM80211 EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI HYPERV IDE_PHISON LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 ZRAM
-
+%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BRCMSMAC BRCMFMAC BCM_WIMAX DRM_PSB EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI HYPERV IDE_PHISON INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC ZRAM ZCACHE
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod-addons
-Version: 2.6.38.7
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}
+Version: 2.6.40
+Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
Group: System Environment/Kernel
@@ -59,6 +58,12 @@
%changelog
+* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-3
+- update to 3.0 aka 2.6.40
+- Enable BRCMSMAC, BRCMFMAC, DRM_PSB, INTEL_MEI, RTS_PSTOR, XVMALLOC, ZCACHE
+- Drop RT2860, RT2870, RT3070, RT3090, SAMSUNG_LAPTOP dropped upstream
+- bump release to 3 to avoid tagging problems in cvs
+
* Sun May 29 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.38.7-2.1
- Enable ATH6K_LEGACY BCM_WIMAX BRCM80211 EASYCAP FT1000_USB R8712U SBE_2T3E3
SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4
12 years, 8 months
rpms/staging-kmod/F-15 staging-kmod.spec,1.21,1.22
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7067
Modified Files:
staging-kmod.spec
Log Message:
* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-3
- bump release to 3 to avoid tagging problems in cvs
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/staging-kmod.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- staging-kmod.spec 1 Aug 2011 17:59:53 -0000 1.21
+++ staging-kmod.spec 1 Aug 2011 18:02:17 -0000 1.22
@@ -20,7 +20,7 @@
Name: staging-kmod
Version: 2.6.40
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.5
+Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -137,6 +137,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-3
+- bump release to 3 to avoid tagging problems in cvs
+
* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-1
- update to 3.0 aka 2.6.40
- Enable BRCMSMAC, BRCMFMAC, DRM_PSB, INTEL_MEI, RTS_PSTOR, XVMALLOC, ZCACHE
12 years, 8 months
rpms/staging-kmod/F-15 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 staging-kmod.spec, 1.20, 1.21
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6388
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-1
- update to 3.0 aka 2.6.40
- Enable BRCMSMAC, BRCMFMAC, DRM_PSB, INTEL_MEI, RTS_PSTOR, XVMALLOC, ZCACHE
- Drop RT2860, RT2870, RT3070, RT3090, SAMSUNG_LAPTOP dropped upstream
- some adjustments for stupid brcm drivers that were renamed
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 26 May 2011 12:51:37 -0000 1.4
+++ .cvsignore 1 Aug 2011 17:59:53 -0000 1.5
@@ -1 +1 @@
-linux-staging-2.6.38.7.tar.bz2
+linux-staging-2.6.40.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 26 May 2011 12:51:37 -0000 1.4
+++ sources 1 Aug 2011 17:59:53 -0000 1.5
@@ -1 +1 @@
-f5a1d18578d0931dd21d2be6f969ecda linux-staging-2.6.38.7.tar.bz2
+11e75c74635ef4862d1b126a77583dde linux-staging-2.6.40.tar.bz2
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/staging-kmod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- staging-kmod.spec 31 Jul 2011 10:04:48 -0000 1.20
+++ staging-kmod.spec 1 Aug 2011 17:59:53 -0000 1.21
@@ -1,28 +1,25 @@
-# buildforkernels macro hint: when you build a new version or a new release
-# that contains bugfixes or other improvements then you must disable the
-# "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
+# akmods not supported
# which drivers to built
-%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BCM_WIMAX BRCM80211 EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI HYPERV IDE_PHISON LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 ZRAM
+%global stgdrvs ASUS_OLED ATH6K_LEGACY BATMAN_ADV BRCMSMAC BRCMFMAC BCM_WIMAX DRM_PSB EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI HYPERV IDE_PHISON INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE R8712U RTL8192SU RTL8192E RTL8192U SBE_2T3E3 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC ZRAM ZCACHE
# avoid this error:
# /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
%define debug_package %{nil}
-# todo:
-# VIDEO_CX25821 cx25821/
-# VIDEO_TM6000 tm6000/
-# VIDEO_DT3155 dt3155v4l/
-# CXT1E1 cxt1e1/
+# todo?
+# VIDEO_CX25821
+# VIDEO_TM6000
+# VIDEO_DT3155
+# CXT1E1
+# USBIP_CORE
+# DVB_CXD2099
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod
-Version: 2.6.38.7
+Version: 2.6.40
Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.5
Summary: Selected kernel modules from linux-staging
@@ -56,7 +53,7 @@
sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||;' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
# fix include for BRCM80211
-sed -i 's!-Idrivers/staging/brcm80211/!-I$(obj)/!' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/brcm80211/Makefile
+sed -i 's!-Idrivers/staging/brcm80211/!-I$(obj)/../!' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/brcm80211/*/Makefile
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -69,8 +66,8 @@
for module in %{stgdrvs} ; do
configops="CONFIG_${module}=m"
case "${module}" in
- BRCM80211)
- configops="${configops} CONFIG_BRCM80211_PCI=y V=1"
+ BRCM?MAC)
+ configops="${configops} CONFIG_BRCMUTIL=y "
;;
CX25821)
configops="${configops} CONFIG_CX25821_ALSA=m"
@@ -110,7 +107,15 @@
configops="${configops} CONFIG_${module}_ALSA=m"
;;
esac
+
make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/ modules ${configops}
+
+ case "${module}" in
+ BRCM?MAC)
+ # move modules down one level to catch them during install
+ mv ${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/brcm80211/*/*.ko ${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/brcm80211/
+ ;;
+ esac
done
done
@@ -132,6 +137,12 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 01 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.40-1
+- update to 3.0 aka 2.6.40
+- Enable BRCMSMAC, BRCMFMAC, DRM_PSB, INTEL_MEI, RTS_PSTOR, XVMALLOC, ZCACHE
+- Drop RT2860, RT2870, RT3070, RT3090, SAMSUNG_LAPTOP dropped upstream
+- some adjustments for stupid brcm drivers that were renamed
+
* Sun Jul 31 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.38.7-2.5
- rebuild for updated kernel
12 years, 8 months
rpms/phonon-backend-vlc/devel .cvsignore, 1.5, 1.6 phonon-backend-vlc.spec, 1.6, 1.7 sources, 1.5, 1.6
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25898
Modified Files:
.cvsignore phonon-backend-vlc.spec sources
Log Message:
* Mon Aug 01 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.4.1-1
- 0.4.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 26 Apr 2011 17:13:34 -0000 1.5
+++ .cvsignore 1 Aug 2011 16:15:55 -0000 1.6
@@ -1 +1 @@
-phonon-backend-vlc-0.4.0.tar.bz2
+phonon-backend-vlc-0.4.1.tar.xz
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- phonon-backend-vlc.spec 26 Apr 2011 17:14:45 -0000 1.6
+++ phonon-backend-vlc.spec 1 Aug 2011 16:15:55 -0000 1.7
@@ -1,17 +1,17 @@
name: phonon-backend-vlc
Summary: VLC phonon backend
-Version: 0.4.0
+Version: 0.4.1
Release: 1%{?dist}
Group: Applications/Multimedia
License: LGPLv2+
URL: http://phonon.kde.org/
%if 0%{?snap}
# git clone git://gitorious.org/phonon/phonon-vlc.git
-# git archive --prefix=phonon-backend-vlc-%{version}/ master | bzip2 > phonon-vlc-%{version}-%{snap}.tar.bz2
-Source0: phonon-vlc-%{version}-%{snap}.tar.bz2
+# git archive --prefix=phonon-backend-vlc-%{version}/ master | xz > phonon-vlc-%{version}-%{snap}.tar.xz
+Source0: phonon-vlc-%{version}-%{snap}.tar.xz
%else
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-vlc/%{version}/src...
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-vlc/%{version}/pho...
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +72,9 @@
%changelog
+* Mon Aug 01 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.4.1-1
+- 0.4.1
+
* Tue Apr 26 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0.4.0-1
- 0.4.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 26 Apr 2011 17:13:35 -0000 1.5
+++ sources 1 Aug 2011 16:15:55 -0000 1.6
@@ -1 +1 @@
-e6ef8c5b54a49610d4dad67754392420 phonon-backend-vlc-0.4.0.tar.bz2
+3adc566c8b24fb2374697b8b14309d26 phonon-backend-vlc-0.4.1.tar.xz
12 years, 8 months