rpms/xtables-addons-kmod/devel .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 xtables-addons-kmod.spec, 1.5, 1.6
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17022
Modified Files:
.cvsignore sources xtables-addons-kmod.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Apr 2010 20:51:03 -0000 1.1
+++ .cvsignore 30 Aug 2010 02:43:16 -0000 1.2
@@ -0,0 +1 @@
+xtables-addons-1.28.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 28 Jun 2010 07:42:07 -0000 1.2
+++ sources 30 Aug 2010 02:43:17 -0000 1.3
@@ -1 +1 @@
-f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz
+b94fe23370a1294b985e9a06a0f9d129 xtables-addons-1.28.tar.xz
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xtables-addons-kmod.spec 28 Jun 2010 09:45:14 -0000 1.5
+++ xtables-addons-kmod.spec 30 Aug 2010 02:43:17 -0000 1.6
@@ -9,8 +9,8 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
-Version: 1.27
-Release: 2%{?dist}
+Version: 1.28
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -41,16 +41,17 @@
%setup -q -c -T -a 0
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
- if grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
- pushd _kmod_build_${kernel_version%%___*}
- sed -i 's/build_TEE=m/build_TEE=/' mconfig
- popd
- fi
done
%build
for kernel_version in %{?kernel_versions} ; do
+ if grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
+ sed -i 's/build_TEE=m/build_TEE=/' _kmod_build_${kernel_version%%___*}/mconfig
+ fi
+ if grep -q 'XT_TARGET_CHECKSUM=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
+ sed -i 's/build_CHECKSUM=m/build_CHECKSUM=/' _kmod_build_${kernel_version%%___*}/mconfig
+ fi
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
done
@@ -68,8 +69,10 @@
%clean
rm -rf %{buildroot}
-
%changelog
+* Sun Jul 25 2010 Chen Lei <supercyper(a)163.com> - 1.28-1
+- update to 1.28
+
* Mon Jun 28 2010 Chen Lei <supercyper(a)163.com> - 1.27-2
- rebuild for kernel 2.6.35
13 years, 7 months
rpms/mythtv/devel mythtv.spec, 1.73, 1.74 mythtv-version.patch, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv441
Modified Files:
mythtv.spec
Removed Files:
mythtv-version.patch
Log Message:
oops, pull package version insertion fix forward
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- mythtv.spec 29 Aug 2010 19:31:12 -0000 1.73
+++ mythtv.spec 29 Aug 2010 19:35:56 -0000 1.74
@@ -133,7 +133,6 @@
#Patch0: mythtv-%{version}-svnfixes.patch
Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
#Patch1: mythplugins-%{version}-svnfixes.patch
-Patch2: mythtv-version.patch
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig.in
Source102: mythbackend.init.in
@@ -857,7 +856,6 @@
cd mythtv-%{version}
#patch0 -p1
-%patch2 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -1010,7 +1008,7 @@
--enable-debug
# Insert rpm version-release for mythbackend --version output
- sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_svnrev),' version.sh
+ echo 'SOURCE_VERSION="%{version}-%{release} (%_svnrev)"' > VERSION
# Make
make %{?_smp_mflags}
--- mythtv-version.patch DELETED ---
13 years, 7 months
rpms/mythtv/devel mythtv.spec,1.72,1.73 sources,1.46,1.47
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32662
Modified Files:
mythtv.spec sources
Log Message:
* Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946
- Update to svn trunk, revision 25946
- Add new crystalhd dependency
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mythtv.spec 16 Aug 2010 03:36:50 -0000 1.72
+++ mythtv.spec 29 Aug 2010 19:31:12 -0000 1.73
@@ -36,6 +36,7 @@
# The following options are enabled by default. Use these options to disable:
#
# --without vdpau Disable VDPAU support
+# --without crystalhd Disable Crystal HD support
# --without xvmc Disable XvMC support
# --without perl Disable building of the perl bindings
# --without python Disable building of the python bindings
@@ -64,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r25695
+%define _svnrev r25946
%define branch trunk
#
@@ -101,6 +102,7 @@
# The following options are enabled by default. Use --without to disable them
%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
+%define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1}
%define with_xvmc %{?_without_xvmc: 0} %{?!_without_xvmc: 1}
%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
%define with_python %{?_without_python: 0} %{!?_without_python: 1}
@@ -192,7 +194,6 @@
%if %{with_faac}
BuildRequires: faac-devel
%endif
-BuildRequires: faad2-devel
BuildRequires: fftw-devel >= 3
BuildRequires: flac-devel >= 1.0.4
BuildRequires: gsm-devel
@@ -235,6 +236,10 @@
BuildRequires: libvdpau-devel
%endif
+%if %{with_crystalhd}
+BuildRequires: libcrystalhd-devel
+%endif
+
# API Build Requirements
%if %{with_perl}
@@ -422,7 +427,6 @@
%if %{with_faac}
Requires: faac-devel
%endif
-Requires: faad2-devel
Requires: fftw-devel >= 3
Requires: flac-devel >= 1.0.4
Requires: gsm-devel
@@ -464,6 +468,10 @@
Requires: libvdpau-devel
%endif
+%if %{with_crystalhd}
+Requires: libcrystalhd-devel
+%endif
+
%description devel
This package contains the header files and libraries for developing
add-ons for mythtv.
@@ -861,7 +869,7 @@
# Put perl bits in the right place and set opt flags
sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \
- bindings/perl/perl.pro
+ bindings/perl/Makefile
# Install other source files, and fix pathnames
cp -a %{SOURCE10} %{SOURCE101} %{SOURCE102} %{SOURCE103} .
@@ -958,13 +966,15 @@
%if %{with_faac}
--enable-libfaac --enable-nonfree \
%endif
- --enable-libfaad --enable-libfaadbin \
--enable-libmp3lame \
--enable-libtheora --enable-libvorbis \
--enable-libxvid \
%if %{with_vdpau}
--enable-vdpau \
%endif
+%if %{with_crystalhd}
+ --enable-crystalhd \
+%endif
%if !%{with_xvmc}
--disable-xvmcw \
%endif
@@ -1431,7 +1441,6 @@
%{_datadir}/mythtv/video_settings.xml
%{_datadir}/mythtv/videomenu.xml
%{_localstatedir}/lib/mythvideo
-%{_bindir}/mtd
%endif
%if %{with_mythweather}
@@ -1443,7 +1452,8 @@
%{_libdir}/mythtv/plugins/libmythweather.so
%{_datadir}/mythtv/i18n/mythweather_*.qm
%{_datadir}/mythtv/weather_settings.xml
-%{_datadir}/mythtv/mythweather
+%dir %{_datadir}/mythtv/mythweather
+%{_datadir}/mythtv/mythweather/*
%endif
%if %{with_mythweb}
@@ -1483,6 +1493,10 @@
################################################################################
%changelog
+* Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946
+- Update to svn trunk, revision 25946
+- Add new crystalhd dependency
+
* Sun Aug 15 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25695
- Update to svn trunk, revision 25695
- Account for qt/qt-webkit split on F14
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 16 Aug 2010 03:36:50 -0000 1.46
+++ sources 29 Aug 2010 19:31:12 -0000 1.47
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-feb4ee73863e51b7a1794f9cd5d3f6f4 mythplugins-0.24.tar.bz2
-2d3bd5384303bef3ac1a477562c4cf43 mythtv-0.24.tar.bz2
+41f4bee41d2bcb824cbc41c547c1c6b8 mythplugins-0.24.tar.bz2
+c0096d14c2012ab2bfe8fda06b13f7ef mythtv-0.24.tar.bz2
13 years, 7 months
rpms/audacious-plugins-freeworld/devel .cvsignore, 1.6, 1.7 audacious-plugins-freeworld.spec, 1.10, 1.11 sources, 1.6, 1.7
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23882
Modified Files:
.cvsignore audacious-plugins-freeworld.spec sources
Log Message:
* Sun Aug 29 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4.0-1
- Update to 2.4.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 24 Aug 2010 20:00:48 -0000 1.6
+++ .cvsignore 29 Aug 2010 08:55:21 -0000 1.7
@@ -1 +1 @@
-audacious-plugins-2.4-rc2.tgz
+audacious-plugins-2.4.0.tgz
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- audacious-plugins-freeworld.spec 25 Aug 2010 14:47:47 -0000 1.10
+++ audacious-plugins-freeworld.spec 29 Aug 2010 08:55:21 -0000 1.11
@@ -4,17 +4,16 @@
# plugin an alternative to Fedora's sidplay1 based sid.so
%global aud_ver 2.4
-%global extra_ver rc2
Name: audacious-plugins-freeworld
-Version: 2.4
-Release: 0.1.%{extra_ver}%{?dist}
+Version: 2.4.0
+Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
License: GPLv3
URL: http://audacious-media-player.org/
-Source0: http://distfiles.atheme.org/audacious-plugins-%{version}-%{extra_ver}.tgz
+Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
Source1: audacious-mp3.desktop
Source2: audacious-aac.desktop
Source3: audacious-ffaudio.desktop
@@ -130,7 +129,7 @@
%prep
-%setup -q -n audacious-plugins-%{version}-%{extra_ver}
+%setup -q -n audacious-plugins-%{version}
# We want to use the system mpg123
rm -r src/mpg123/libmpg123
%patch0 -p1
@@ -222,6 +221,9 @@
%changelog
+* Sun Aug 29 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4.0-1
+- Update to 2.4.0
+
* Tue Aug 24 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4-0.1.rc2
- Update to 2.4-rc2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 24 Aug 2010 20:00:48 -0000 1.6
+++ sources 29 Aug 2010 08:55:21 -0000 1.7
@@ -1 +1 @@
-216eca46679fcd9c6d217dd2e37202a9 audacious-plugins-2.4-rc2.tgz
+fdf7d4bb660d95e90044556f12213f42 audacious-plugins-2.4.0.tgz
13 years, 7 months
rpms/staging-kmod/F-13 staging-kmod.spec,1.32,1.33
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7533
Modified Files:
staging-kmod.spec
Log Message:
* Sun Aug 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.3
- rebuild for new kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/staging-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- staging-kmod.spec 29 Aug 2010 06:17:45 -0000 1.32
+++ staging-kmod.spec 29 Aug 2010 06:18:21 -0000 1.33
@@ -15,7 +15,7 @@
Name: staging-kmod
Version: 2.6.34.2
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.3
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -112,6 +112,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.3
+- rebuild for new kernel
+
* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.2
- rebuild for new kernel
13 years, 7 months
rpms/staging-kmod/F-13 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 staging-kmod.spec, 1.31, 1.32
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7469
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
reimport the version that matches 2.6.34
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 20 Aug 2010 15:08:06 -0000 1.6
+++ .cvsignore 29 Aug 2010 06:17:45 -0000 1.7
@@ -1 +1 @@
-linux-staging-2.6.33.2.tar.bz2
+linux-staging-2.6.34.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 20 Aug 2010 15:08:06 -0000 1.6
+++ sources 29 Aug 2010 06:17:45 -0000 1.7
@@ -1 +1 @@
-30b3429415fc1395911e52208b5db269 linux-staging-2.6.33.2.tar.bz2
+acb2cc2eb8280ce9dba4d2070a0a00d1 linux-staging-2.6.34.2.tar.bz2
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/staging-kmod.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- staging-kmod.spec 28 Aug 2010 18:50:37 -0000 1.31
+++ staging-kmod.spec 29 Aug 2010 06:17:45 -0000 1.32
@@ -6,15 +6,16 @@
%define buildforkernels newest
# which drivers to built
-%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
+%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL HECI HYPERV IDE_PHISON LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
+
# todo: VIDEO_CX25821
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod
-Version: 2.6.33.2
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.11
+Version: 2.6.34.2
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -43,8 +44,8 @@
# prepare
%setup -q -c -T -a 0
-# disable drivers that are enabled in Fedora's kernel, as those otherweise will get build
-sed -i 's|.*at76.*||; s|.*WAVELAN.*||; s|.*PCMCIA_NETWAVE.*||' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
+sed -i 's|.*at76.*||; s|.*WAVELAN.*||; s|.*PCMCIA_NETWAVE.*|| ; s|.CRYSTALH||' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -111,41 +112,12 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.11
-- rebuild for new kernel
-
-* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.10
-- rebuild for new kernel
-
-* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.8
-- rebuild for new kernel
-
-* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.7
-- rebuild for new kernel
-
-* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.6
-- rebuild for new kernel
-
-* Fri May 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.5
+* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.2
- rebuild for new kernel
-* Thu May 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.4
-- rebuild for new kernel
-
-* Fri May 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.3
-- rebuild for new kernel
-
-* Tue May 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.2
-- rebuild for new kernel
-
-* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2.1
-- rebuild for new kernel
-
-* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2
-- enable echo
-
-* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1.1
-- rebuild for new kernel
+* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.1
+- update to 2.6.34.2, which is hitting updates-testing for F13
+- enable phison (#1338)
* Fri Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1
- update to 2.6.33.2
13 years, 7 months
rpms/xbmc/devel xbmc.spec,1.5,1.6
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3854
Modified Files:
xbmc.spec
Log Message:
Resync with F-13 branch for now, postpone Dharma branch until
stable (10.x has never been build for devel/f14 in any case).
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xbmc.spec 29 Jul 2010 06:38:44 -0000 1.5
+++ xbmc.spec 29 Aug 2010 05:25:01 -0000 1.6
@@ -1,12 +1,9 @@
-%global SVNVERSION 32266
-%global DIRVERSION %{version}-%{SVNVERSION}
-
Name: xbmc
-Version: 10.5
-Release: 0.5.20100728svn%{SVNVERSION}%{?dist}
+Version: 9.11
+Release: 19%{?dist}
URL: http://www.xbmc.org/
-Source0: %{name}-%{DIRVERSION}-patched.tar.xz
+Source0: %{name}-%{version}-patched.tar.xz
# xbmc contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
# we use this script to remove the code before shipping it.
@@ -17,31 +14,60 @@
# where <version> is the particular version being used
Source1: xbmc-generate-tarball-xz.sh
-# new patches for bootstrap
-# no trac ticket filed as yet
-Patch1: xbmc-10-bootstrap.patch
-
-# filed ticket, but patch still needs work
-# http://trac.xbmc.org/ticket/9658
-Patch2: xbmc-10-dvdread.patch
-
-# and new problem with zlib in cximage
-# trac ticket filed: http://trac.xbmc.org/ticket/9659
-# but patch not attached because it needs work
-Patch3: xbmc-10-disable-zlib-in-cximage.patch
-
-# grrr, why if an external library is detected does it require that the
-# directory exist in the tarball?
-# need to file trac ticket
-Patch4: xbmc-10-remove-libmodplug-libmicrohttpd.patch
-
-# need to file trac ticket, this patch just forces external hdhomerun
-# functionality, needs to be able fallback internal version
-Patch5: xbmc-10-hdhomerun.patch
-
-# fix "@#" in Makefile which seem to screw things up no trac filed
-# yet, don't know why this isn't a problem on other Linux systems
-Patch6: xbmc-10-Makefile.patch
+# look for libdca, rather than libdts
+# http://xbmc.org/trac/ticket/8040
+Patch1: xbmc-9.11-libdca.patch
+
+# Needs work before being submitted upstream
+Patch2: xbmc-9.11-b1-dvdlibs-external.patch
+
+# http://xbmc.org/trac/ticket/8026 (this will be in next release)
+Patch3: xbmc-9.11-use_cdio_system_headers_on_non_win32.patch
+
+# Next 3 patches to use %{_libdir}
+# http://xbmc.org/trac/ticket/8590
+Patch4: xbmc-9.11-fix-Makefile.in.patch
+Patch5: xbmc-9.11-Makefile.include.in.diff
+Patch6: xbmc-9.11-xbmc.sh.diff
+
+# Next 2 patches submitted upstream
+# http://www.xbmc.org/trac/ticket/8629
+Patch7: xbmc-9.11-spyce.diff
+Patch8: xbmc-9.11-RandomNumberGenerators.hpp.diff
+
+# Needs work before being submitted upstream
+Patch9: xbmc-9.11-remlibass.patch
+
+# Fixes GCC warning: partial backport to 9.11
+# (should be fixed in next release)
+Patch10: xbmc-9.11-changeset-26191.diff
+
+# remove goahead completely from compilation, it's been replaced
+# by libmicrohttpd in SVN, so should add that BuildRequires for 10.5
+# and drop this patch
+Patch11: xbmc-9.11-remove-goahead.patch
+
+# Next 12 patches submitted upstream:
+# http://www.xbmc.org/trac/ticket/8629
+Patch12: xbmc-9.11-external-zlib.diff
+Patch13: xbmc-9.11-goom-missing.diff
+Patch14: xbmc-9.11-rsxs-0.9.diff
+Patch15: xbmc-9.11-Weather.diff
+Patch16: xbmc-9.11-XBMCProjectM-cmake.diff
+Patch17: xbmc-9.11-cflags.patch
+Patch18: xbmc-9.11-configure.patch
+Patch19: xbmc-9.11-gymcodec.patch
+Patch20: xbmc-9.11-macdll.patch
+Patch21: xbmc-9.11-maclib.patch
+Patch22: xbmc-9.11-libid3tag.patch
+Patch23: xbmc-9.11-librtv.patch
+
+# these next 2 are (hopefully temporary) hacks
+Patch24: xbmc-9.11-swscale.diff
+Patch25: xbmc-9.11-xext.diff
+
+# an attempt to force hdhomerun to be external
+Patch26: xbmc-9.11-hdhomerun.patch
ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
@@ -112,11 +138,8 @@
BuildRequires: libdca-devel
BuildRequires: libass-devel >= 0.9.7
BuildRequires: hdhomerun-devel
-BuildRequires: libcrystalhd-devel
-BuildRequires: libmodplug-devel
-BuildRequires: libmicrohttpd-devel
-BuildRequires: expat-devel
-BuildRequires: gettext-devel
+# add following BR in next release of XBMC to get support for crystalhd devices
+#BuildRequires: libcrystalhd-devel
%description
XBMC media center is a free cross-platform media-player jukebox and
@@ -126,14 +149,34 @@
%prep
-%setup -q -n %{name}-%{DIRVERSION}
+%setup -q -n %{name}-%{version}
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p1
-%patch6 -p0
+%patch1 -p1 -b .dtsdca
+%patch2 -p1 -b .dvdlibs
+%patch3 -p1 -b .cdio
+%patch4 -p0 -b .makefilein
+%patch5 -p1 -b .makefileincl
+%patch6 -p1 -b .xbmcsh
+%patch7 -p1
+%patch8 -p1 -b .rand
+%patch9 -p1 -b .remlibass
+%patch10 -p1 -b .gccwarning
+%patch11 -p0 -b .removegoahead
+%patch12 -p1 -b .zlib
+%patch13 -p1 -b .goom
+%patch14 -p1 -b .rsxs
+%patch15 -p1 -b .weather
+%patch16 -p1 -b .projectm
+%patch17 -p1 -b .cflags
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1 -b .hdhomerun
# Prevent rerunning the autotools.
touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \
@@ -148,12 +191,11 @@
./configure \
--prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \
--libdir=%{_libdir} --datadir=%{_datadir} \
---enable-goom \
---enable-external-ffmpeg --enable-external-python \
---disable-libdts --disable-liba52 \
---disable-dvdcss \
+--with-lirc-device=/var/run/lirc/lircd \
+--enable-external-libraries --enable-goom \
--disable-optimizations --disable-debug \
-SVN_REV=%{SVNVERSION} \
+--disable-webserver \
+SVN_REV=26017 \
CPPFLAGS="-I/usr/include/ffmpeg" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \
@@ -161,18 +203,22 @@
LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \
ASFLAGS=-fPIC
-# disable the following:
-# --enable-external-libraries
-# enumerate all the external libraries because the libdts/liba52 detection
-# is broken upstream: http://trac.xbmc.org/ticket/9277
-
make %{?_smp_mflags} VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
-rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
+# remove the doc files from libdir, they should be put in the docdir
+rm $RPM_BUILD_ROOT/%{_libdir}/xbmc/copying.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/keymapping.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/LICENSE.GPL $RPM_BUILD_ROOT/%{_libdir}/xbmc/README.linux
+# remove bogus header file
+rm -f $RPM_BUILD_ROOT%{_libdir}/xbmc/visualisations/xbmc_vis.h
+
+# make Python files executable to keep rpmlint quiet
+# (spyce to be dropped from next xbmc release, so this can be dropped then)
+for i in run_spyceCGI.py run_spyceCmd.py run_spyceModpy.py spyceCGI.py spyceCmd.py spyce.py verchk.py
+do
+ chmod +x $RPM_BUILD_ROOT%{_libdir}/xbmc/system/python/spyce/$i
+done
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -187,36 +233,13 @@
%{_bindir}/xbmc
%{_bindir}/xbmc-standalone
%{_libdir}/xbmc
-%{_datadir}/xbmc
%{_datadir}/xsessions/XBMC.desktop
%{_datadir}/applications/xbmc.desktop
-%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/pixmaps/xbmc.png
%changelog
-* Thu Jul 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.5.20100728svn32266
-- Add gettext-devel to BuildRequires for autopoint
-
-* Wed Jul 28 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.4.20100728svn32266
-- Sync with latest Dharma branch (r32266)
-
-* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.3.20100719svn31991
-- Remove 24 patches which have been applied upstream, yay!
-- Rebased 2 patches: libdvd patch and hdhomerun patch for Dharma
-- Add some new patches, some of which have upstream trac tickets,
- others need to
-- Renumber patches
-
-* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.2.20100719svn31991
-- Sync with Dharma branch
-
-* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.1.20100719svn31977
-- Major overhaul for 10.x version of XBMC
-- Fix file section for better FHS-compliance
-- Drop a lot of patches that have been upstreamed, and rebase others
-
-* Fri May 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-19
-- Add new BR for libmodplug-devel, expat-devel, libmicrohttpd-devel
- in preparation for 10.x
+* Wed Aug 25 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-19
+- Default to using /var/run/lirc/lircd (#1325)
* Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-18
- Exclude ppc64 (not available for F-13+ in any case)
13 years, 7 months
rpms/xtables-addons-kmod/F-13 xtables-addons-kmod.spec,1.21,1.22
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/xtables-addons-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7850
Modified Files:
xtables-addons-kmod.spec
Log Message:
* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.7
- rebuild for new kernel
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/xtables-addons-kmod.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xtables-addons-kmod.spec 20 Aug 2010 07:09:32 -0000 1.21
+++ xtables-addons-kmod.spec 28 Aug 2010 18:51:25 -0000 1.22
@@ -10,7 +10,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 1.27
-Release: 1%{?dist}.6
+Release: 1%{?dist}.7
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -65,6 +65,9 @@
%changelog
+* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.7
+- rebuild for new kernel
+
* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.27-1.6
- rebuild for new kernel
13 years, 7 months
rpms/west-chamber-kmod/F-13 west-chamber-kmod.spec,1.18,1.19
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/west-chamber-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7454
Modified Files:
west-chamber-kmod.spec
Log Message:
* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.5
- rebuild for new kernel
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-13/west-chamber-kmod.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- west-chamber-kmod.spec 20 Aug 2010 18:35:13 -0000 1.18
+++ west-chamber-kmod.spec 28 Aug 2010 18:51:07 -0000 1.19
@@ -3,7 +3,7 @@
# "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
#define buildforkernels current
#define buildforkernels akmods
@@ -13,7 +13,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 5.%{?svndate}svn%{?dist}.4
+Release: 5.%{?svndate}svn%{?dist}.5
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -85,6 +85,9 @@
%changelog
+* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.5
+- rebuild for new kernel
+
* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.1-5.20100405svn.3
- rebuild for new kernel with akmod
13 years, 7 months
rpms/VirtualBox-OSE-kmod/F-13 VirtualBox-OSE-kmod.spec,1.55,1.56
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7318
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.6-1.5
- rebuild for new kernel
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-13/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- VirtualBox-OSE-kmod.spec 20 Aug 2010 07:09:08 -0000 1.55
+++ VirtualBox-OSE-kmod.spec 28 Aug 2010 18:50:52 -0000 1.56
@@ -19,7 +19,7 @@
Name: VirtualBox-OSE-kmod
Version: 3.2.6
-Release: 1%{?dist}.4
+Release: 1%{?dist}.5
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.6-1.5
+- rebuild for new kernel
+
* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.6-1.4
- rebuild for new kernel
13 years, 7 months