rpms/VirtualBox/devel VirtualBox.spec,1.30,1.31
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23151
Modified Files:
VirtualBox.spec
Log Message:
* Mon Oct 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-2
- Try load new vbox modules right after install or upgrade.
- Try better reload of vboxservice.service when as guest system.
- Minor improves on systemd upgrade.
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- VirtualBox.spec 27 Oct 2012 22:11:29 -0000 1.30
+++ VirtualBox.spec 29 Oct 2012 05:22:27 -0000 1.31
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.2.4
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -440,11 +440,6 @@
/usr/bin/update-desktop-database &>/dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
-# Web service
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
then
@@ -453,7 +448,7 @@
systemctl restart udev-trigger.service
systemctl restart udev-settle.service
fi
-
+/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ] ; then
@@ -462,8 +457,14 @@
/bin/systemctl stop vboxweb.service > /dev/null 2>&1 || :
fi
-
%postun
+if [ $1 -eq 0 ] ; then
+ # Package upgrade, not uninstall
+ # Web service
+ # Run these because the SysV package being removed won't do them
+ /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+fi
+
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
/usr/bin/update-desktop-database &>/dev/null || :
@@ -472,12 +473,13 @@
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-# Guest additions install the OGL libraries
+# Guest additions install
%post guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
+/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
%preun guest
if [ $1 -eq 0 ] ; then
@@ -489,11 +491,6 @@
%postun guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart vboxservice.service >/dev/null 2>&1 || :
-fi
-
%files
%{_bindir}/VBox
@@ -584,6 +581,11 @@
%changelog
+* Mon Oct 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-2
+- Try load new vbox modules right after install or upgrade.
+- Try better reload of vboxservice.service when as guest system.
+- Minor improves on systemd upgrade.
+
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
12 years
rpms/VirtualBox/F-16 .cvsignore, 1.38, 1.39 VirtualBox-4.2.0-mesa.patch, 1.1, 1.2 VirtualBox-4.2.0-xorg17.patch, 1.1, 1.2 VirtualBox.spec, 1.9, 1.10 sources, 1.38, 1.39
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21451
Modified Files:
.cvsignore VirtualBox-4.2.0-mesa.patch
VirtualBox-4.2.0-xorg17.patch VirtualBox.spec sources
Log Message:
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system headers, and
"As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build it".
- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't buid it
on F18 and rawhide, new libxslt and new pdflatex problems.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 30 Sep 2012 19:37:20 -0000 1.38
+++ .cvsignore 29 Oct 2012 04:39:49 -0000 1.39
@@ -1 +1 @@
-VirtualBox-4.2.0.tar.bz2
+VirtualBox-4.2.4.tar.bz2
VirtualBox-4.2.0-mesa.patch:
Config.kmk | 10 ---
src/VBox/Additions/common/crOpenGL/Makefile.kmk | 21 +-----
src/VBox/Additions/common/crOpenGL/fakedri_drv.c | 72 +++++++++++++++++------
src/VBox/Additions/common/crOpenGL/fakedri_drv.h | 21 ++++--
src/VBox/Additions/x11/Makefile.kmk | 1
5 files changed, 74 insertions(+), 51 deletions(-)
Index: VirtualBox-4.2.0-mesa.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox-4.2.0-mesa.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-mesa.patch 30 Sep 2012 19:37:20 -0000 1.1
+++ VirtualBox-4.2.0-mesa.patch 29 Oct 2012 04:39:49 -0000 1.2
@@ -1,6 +1,25 @@
fakedri_drv.c,h:
Just compile with X11 system source and we may remove bundle X11 source code.
+--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
++++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
+@@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL
+ endif
+
+ if1of ($(KBUILD_TARGET), freebsd linux solaris)
+- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
+- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
+- VBOX_MESA_INCS = \
+- $(VBOX_PATH_MESA_SOURCE) \
+- $(VBOX_PATH_MESA_SOURCE)/include \
+- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
+- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
+- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
+- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
++ VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1
+ endif
+
+ VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
--- ./src/VBox/Additions/x11/Makefile.kmk.orig 2012-09-23 01:00:38.301286632 +0100
+++ ./src/VBox/Additions/x11/Makefile.kmk 2012-09-23 01:00:45.135370696 +0100
@@ -24,7 +24,6 @@ if1of ($(KBUILD_TARGET), freebsd linux n
VirtualBox-4.2.0-xorg17.patch:
vboxmouse/Makefile.kmk | 40 +++++++-------
vboxmouse/vboxmouse.c | 10 +--
vboxvideo/Makefile.kmk | 108 +++++++++++++++++++++++++---------------
vboxvideo/testcase/Makefile.kmk | 4 -
4 files changed, 93 insertions(+), 69 deletions(-)
Index: VirtualBox-4.2.0-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox-4.2.0-xorg17.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-xorg17.patch 30 Sep 2012 19:37:20 -0000 1.1
+++ VirtualBox-4.2.0-xorg17.patch 29 Oct 2012 04:39:49 -0000 1.2
@@ -2,25 +2,6 @@
Based on scripts by Michael Meskes <meskes(a)debian.org>, Felix Geyer <debfx-pkg(a)fobos.de>
Author: Sérgio Basto <sergio(a)serjux.com>
---- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
-+++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
-@@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL
- endif
-
- if1of ($(KBUILD_TARGET), freebsd linux solaris)
-- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
-- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
-- VBOX_MESA_INCS = \
-- $(VBOX_PATH_MESA_SOURCE) \
-- $(VBOX_PATH_MESA_SOURCE)/include \
-- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
-- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
-- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
-- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
-+ VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1
- endif
-
- VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
--- ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-07 03:18:17.460463185 +0100
@@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux)
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VirtualBox.spec 30 Sep 2012 19:41:48 -0000 1.9
+++ VirtualBox.spec 29 Oct 2012 04:39:49 -0000 1.10
@@ -14,8 +14,8 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox
-Version: 4.2.0
-Release: 4%{?prerel:.%{prerel}}%{?dist}
+Version: 4.2.4
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -33,7 +33,6 @@
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-4.1.18-strings.patch
Patch3: VirtualBox-4.2.0-libcxx.patch
-Patch5: VirtualBox-4.2.0-xorg17.patch
%ifarch x86_64
Patch10: VirtualBox-4.2.0-32bit.patch
%endif
@@ -181,7 +180,6 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
-%patch5 -p1 -b .xorg17
%patch15 -p1 -b .makeself
%ifarch x86_64
%patch10 -p1 -b .32bit
@@ -212,9 +210,15 @@
%build
-./configure --disable-kmods
+./configure --disable-kmods \
+%if 0%{?fedora} > 17
+ --disable-docs
+%endif
+%if 0%{?fedora} < 18
+ --enable-webservice
+%endif
+
#--disable-java
-#--enable-webservice
#--disable-xpcom
. ./env.sh
@@ -230,6 +234,7 @@
VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \
VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+ VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_BUILD_PUBLISHER=_%{?vendor:%(echo %{vendor} \
| sed -e 's/ //g' | cut -c 1-9)}%{?!vendor:custom}
@@ -269,7 +274,9 @@
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-#ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+%if 0%{?fedora} < 18
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+%endif
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe
@@ -290,8 +297,11 @@
obj/bin/VBoxEFI*.fd
# Documentation
+%if 0%{?fedora} < 18
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/UserManual.pdf
+%endif
+
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
@@ -308,10 +318,12 @@
obj/bin/VBoxTestOGL \
obj/bin/VBoxExtPackHelperApp \
obj/bin/VBoxBalloonCtrl \
+%if 0%{?fedora} < 18
+ obj/bin/vboxwebsrv \
+ obj/bin/webtest \
+%endif
obj/bin/VBoxBFE
-# obj/bin/vboxwebsrv \
-# obj/bin/webtest \
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
obj/bin/nls/*
@@ -327,7 +339,6 @@
# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
-#ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
for S in obj/bin/icons/*
do
SIZE=$(basename $S)
@@ -340,14 +351,18 @@
install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
# Guest X.Org drivers
-# With the xorg17 patch, the _17 driver builds against what's
-# actually available for the system, so would probably be a 1.6
-# driver when compiled on Fedora 10, despite its name
-%global x11_api 17
-
-install -m 0755 -D obj/bin/additions/vboxmouse_drv_%{x11_api}.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
-install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
+# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you
+# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only
+# build the X.Org drivers against the installed system headers.
+# also wrote:
+# As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not
+# build it in this case.
+# and
+# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
+#
+# [1] https://www.virtualbox.org/changeset/43588/vbox
+
+install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
# Guest tools
@@ -495,10 +510,14 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-#{_bindir}/vboxwebsrv
+%if 0%{?fedora} < 18
+%{_bindir}/vboxwebsrv
+%endif
%{_bindir}/VBoxVRDP
+%if 0%{?fedora} < 18
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
+%endif
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
@@ -509,8 +528,10 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-#{_libdir}/virtualbox/vboxwebsrv
-#{_libdir}/virtualbox/webtest
+%if 0%{?fedora} < 18
+%{_libdir}/virtualbox/vboxwebsrv
+%{_libdir}/virtualbox/webtest
+%endif
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE
@@ -563,6 +584,14 @@
%changelog
+* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
+- New upstream release.
+- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
+https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system headers, and
+"As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build it".
+- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't buid it
+ on F18 and rawhide, new libxslt and new pdflatex problems.
+
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
- On F16, need add one xorg header for xorg-x11-server 1.11.x
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 30 Sep 2012 19:37:20 -0000 1.38
+++ sources 29 Oct 2012 04:39:49 -0000 1.39
@@ -1 +1 @@
-691b4134983ce7d89b9fb683305cb647 VirtualBox-4.2.0.tar.bz2
+d1ec2d2a3f2f3f0b277dfe2c520c2e33 VirtualBox-4.2.4.tar.bz2
12 years
rpms/mythtv/devel mythtv-0.26-fixes.patch,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31548
Added Files:
mythtv-0.26-fixes.patch
Log Message:
Add fixes patch.
mythtv-0.26-fixes.patch:
README.rst | 1
mythplugins/mytharchive/i18n/mytharchive_es_es.qm |binary
mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45
mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4
mythplugins/mythgame/i18n/mythgame_es_es.ts | 4
mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68
mythplugins/mythmusic/i18n/mythmusic_it.qm |binary
mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++---
mythplugins/mythweather/i18n/mythweather_es_es.qm |binary
mythplugins/mythweather/i18n/mythweather_es_es.ts | 3
mythplugins/mythweather/i18n/mythweather_pl.qm |binary
mythplugins/mythweather/i18n/mythweather_pl.ts | 3
mythtv/bindings/python/MythTV/altdict.py | 2
mythtv/bindings/python/MythTV/dataheap.py | 58
mythtv/bindings/python/MythTV/system.py | 4
mythtv/contrib/imports/mirobridge/mirobridge.py | 96
mythtv/i18n/mythfrontend_es_es.qm |binary
mythtv/i18n/mythfrontend_es_es.ts | 2180 +++--
mythtv/i18n/mythfrontend_pl.qm |binary
mythtv/i18n/mythfrontend_pl.ts | 2733 +++----
mythtv/libs/libmyth/mythcontext.cpp | 2
mythtv/libs/libmythbase/signalhandling.cpp | 8
mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 4
mythtv/libs/libmythui/mythscreenstack.cpp | 2
mythtv/libs/libmythui/mythuiimage.cpp | 3
mythtv/libs/libmythui/mythuitype.cpp | 7
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10
mythtv/programs/mythavtest/main.cpp | 5
mythtv/programs/mythbackend/main.cpp | 5
mythtv/programs/mythbackend/main_helpers.cpp | 4
mythtv/programs/mythbackend/mainserver.cpp | 16
mythtv/programs/mythccextractor/main.cpp | 5
mythtv/programs/mythcommflag/main.cpp | 5
mythtv/programs/mythfilldatabase/main.cpp | 5
mythtv/programs/mythfrontend/guidegrid.cpp | 17
mythtv/programs/mythfrontend/main.cpp | 5
mythtv/programs/mythjobqueue/main.cpp | 5
mythtv/programs/mythlcdserver/main.cpp | 5
mythtv/programs/mythlogserver/main.cpp | 5
mythtv/programs/mythmediaserver/main.cpp | 5
mythtv/programs/mythmetadatalookup/main.cpp | 5
mythtv/programs/mythpreviewgen/main.cpp | 5
mythtv/programs/mythshutdown/main.cpp | 5
mythtv/programs/mythtranscode/main.cpp | 5
mythtv/programs/mythtv-setup/backendsettings.cpp | 6
mythtv/programs/mythtv-setup/main.cpp | 5
mythtv/programs/mythutil/main.cpp | 6
mythtv/programs/mythwelcome/main.cpp | 5
mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 20
mythtv/programs/scripts/metadata/Movie/tmdb3.py | 103
51 files changed, 5902 insertions(+), 3379 deletions(-)
--- NEW FILE mythtv-0.26-fixes.patch ---
README.rst | 1 +
mythplugins/mytharchive/i18n/mytharchive_es_es.qm | Bin 36188 -> 36136 bytes
mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45 +-
mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4 +-
mythplugins/mythgame/i18n/mythgame_es_es.ts | 4 +-
mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68 +-
mythplugins/mythmusic/i18n/mythmusic_it.qm | Bin 55341 -> 67158 bytes
mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++++++++++-----
mythplugins/mythweather/i18n/mythweather_es_es.qm | Bin 23630 -> 23631 bytes
mythplugins/mythweather/i18n/mythweather_es_es.ts | 3 +-
mythplugins/mythweather/i18n/mythweather_pl.qm | Bin 23846 -> 23847 bytes
mythplugins/mythweather/i18n/mythweather_pl.ts | 3 +-
mythtv/bindings/python/MythTV/altdict.py | 2 +-
mythtv/bindings/python/MythTV/dataheap.py | 58 +-
mythtv/bindings/python/MythTV/system.py | 4 +-
mythtv/contrib/imports/mirobridge/mirobridge.py | 96 +-
mythtv/i18n/mythfrontend_es_es.qm | Bin 669897 -> 672530 bytes
mythtv/i18n/mythfrontend_es_es.ts | 2180 ++++++------
mythtv/i18n/mythfrontend_pl.qm | Bin 350611 -> 354449 bytes
mythtv/i18n/mythfrontend_pl.ts | 2733 ++++++++-------
mythtv/libs/libmyth/mythcontext.cpp | 2 +-
mythtv/libs/libmythbase/signalhandling.cpp | 8 +-
mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2 +-
mythtv/libs/libmythtv/mythplayer.cpp | 4 +-
mythtv/libs/libmythui/mythscreenstack.cpp | 2 +-
mythtv/libs/libmythui/mythuiimage.cpp | 3 +-
mythtv/libs/libmythui/mythuitype.cpp | 7 +-
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10 +-
mythtv/programs/mythavtest/main.cpp | 5 +-
mythtv/programs/mythbackend/main.cpp | 5 +-
mythtv/programs/mythbackend/main_helpers.cpp | 4 +-
mythtv/programs/mythbackend/mainserver.cpp | 16 +-
mythtv/programs/mythccextractor/main.cpp | 5 +-
mythtv/programs/mythcommflag/main.cpp | 5 +-
mythtv/programs/mythfilldatabase/main.cpp | 5 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 17 +-
mythtv/programs/mythfrontend/main.cpp | 5 +-
mythtv/programs/mythjobqueue/main.cpp | 5 +-
mythtv/programs/mythlcdserver/main.cpp | 5 +-
mythtv/programs/mythlogserver/main.cpp | 5 +-
mythtv/programs/mythmediaserver/main.cpp | 5 +-
mythtv/programs/mythmetadatalookup/main.cpp | 5 +-
mythtv/programs/mythpreviewgen/main.cpp | 5 +-
mythtv/programs/mythshutdown/main.cpp | 5 +-
mythtv/programs/mythtranscode/main.cpp | 5 +-
mythtv/programs/mythtv-setup/backendsettings.cpp | 6 +-
mythtv/programs/mythtv-setup/main.cpp | 5 +-
mythtv/programs/mythutil/main.cpp | 6 +-
mythtv/programs/mythwelcome/main.cpp | 5 +-
.../distros/mythtv_data/data_mythtv.py | 20 +-
mythtv/programs/scripts/metadata/Movie/tmdb3.py | 103 +-
51 files changed, 5902 insertions(+), 3379 deletions(-)
diff --git a/README.rst b/README.rst
index a151d89..576e0dc 100644
--- a/README.rst
+++ b/README.rst
@@ -20,3 +20,4 @@ Useful project links
- `Mailing lists <http://www.mythtv.org/mailman/listinfo>`_
- `IRC <irc://freenode.net/mythtv-users>`_ at Freenode.net, #mythtv-users
+
diff --git a/mythplugins/mytharchive/i18n/mytharchive_es_es.qm b/mythplugins/mytharchive/i18n/mytharchive_es_es.qm
index 362945a..9bc0687 100644
Binary files a/mythplugins/mytharchive/i18n/mytharchive_es_es.qm and b/mythplugins/mytharchive/i18n/mytharchive_es_es.qm differ
diff --git a/mythplugins/mytharchive/i18n/mytharchive_es_es.ts b/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
index 51f654c..9387d6d 100644
--- a/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
+++ b/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
@@ -829,7 +829,7 @@ Por Favor, Espere...</translation>
<translation>el título va aquí</translation>
</message>
<message>
- <location filename="themestrings.h" line="94"/>
+ <location filename="themestrings.h" line="93"/>
<source>x.xx Gb</source>
<translation>x,xx Gb</translation>
</message>
@@ -1209,52 +1209,47 @@ Por Favor, Espere...</translation>
<translation>x,xx GB</translation>
</message>
<message>
- <location filename="themestrings.h" line="93"/>
- <source>Ok</source>
- <translation>Aceptar</translation>
- </message>
- <message>
- <location filename="themestrings.h" line="95"/>
+ <location filename="themestrings.h" line="94"/>
<source>Select Destination:</source>
<translation>Seleccionar Destino:</translation>
</message>
<message>
- <location filename="themestrings.h" line="96"/>
+ <location filename="themestrings.h" line="95"/>
<source>Parental level: %1</source>
<translation>Nivel parental: %1</translation>
</message>
<message>
- <location filename="themestrings.h" line="97"/>
+ <location filename="themestrings.h" line="96"/>
<source>Old size:</source>
<translation>Tamaño anterior:</translation>
</message>
<message>
- <location filename="themestrings.h" line="98"/>
+ <location filename="themestrings.h" line="97"/>
<source>New size:</source>
<translation>Tamaño nuevo:</translation>
</message>
<message>
- <location filename="themestrings.h" line="99"/>
+ <location filename="themestrings.h" line="98"/>
<source>Select a theme:</source>
<translation>Seleccione un tema:</translation>
</message>
<message>
- <location filename="themestrings.h" line="100"/>
+ <location filename="themestrings.h" line="99"/>
<source>Menu</source>
<translation>Menú</translation>
</message>
<message>
- <location filename="themestrings.h" line="101"/>
+ <location filename="themestrings.h" line="100"/>
<source>Chapter</source>
<translation>Capítulo</translation>
</message>
<message>
- <location filename="themestrings.h" line="102"/>
+ <location filename="themestrings.h" line="101"/>
<source>Detail</source>
<translation>Detalles</translation>
</message>
<message>
- <location filename="themestrings.h" line="103"/>
+ <location filename="themestrings.h" line="102"/>
<source>Select File to Import</source>
<translation>Seleccionar Archivo a Importar</translation>
</message>
@@ -1264,52 +1259,52 @@ Por Favor, Espere...</translation>
<translation>Añadir vídeo</translation>
</message>
<message>
- <location filename="themestrings.h" line="104"/>
+ <location filename="themestrings.h" line="103"/>
<source>Channel ID:</source>
<translation>ID de Canal:</translation>
</message>
<message>
- <location filename="themestrings.h" line="105"/>
+ <location filename="themestrings.h" line="104"/>
<source>Channel Number:</source>
<translation>Número de Canal:</translation>
</message>
<message>
- <location filename="themestrings.h" line="106"/>
+ <location filename="themestrings.h" line="105"/>
<source>Create DVD</source>
<translation>Crear DVD</translation>
</message>
<message>
- <location filename="themestrings.h" line="107"/>
+ <location filename="themestrings.h" line="106"/>
<source>Create Archive</source>
<translation>Crear Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="108"/>
+ <location filename="themestrings.h" line="107"/>
<source>Encode Video File</source>
<translation>Codificar Archivo de Vídeo</translation>
</message>
<message>
- <location filename="themestrings.h" line="109"/>
+ <location filename="themestrings.h" line="108"/>
<source>Import Archive</source>
<translation>Importar Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="110"/>
+ <location filename="themestrings.h" line="109"/>
<source>Archive Utilities</source>
<translation>Aplicaciones de Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="111"/>
+ <location filename="themestrings.h" line="110"/>
<source>Show Log Viewer</source>
<translation>Mostrar Visor del Registro</translation>
</message>
<message>
- <location filename="themestrings.h" line="112"/>
+ <location filename="themestrings.h" line="111"/>
<source>Play Created DVD</source>
<translation>Reproducir el DVD Creado</translation>
</message>
<message>
- <location filename="themestrings.h" line="113"/>
[...20776 lines suppressed...]
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
index 6a133f5..853fbe4 100755
--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py
+++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
@@ -11,19 +11,21 @@
#-----------------------
__title__ = "TheMovieDB.org V3"
__author__ = "Raymond Wagner"
-__version__ = "0.3.0"
+__version__ = "0.3.2"
# 0.1.0 Initial version
# 0.2.0 Add language support, move cache to home directory
# 0.3.0 Enable version detection to allow use in MythTV
-
-from MythTV.tmdb3 import searchMovie, Movie, Collection, set_key, set_cache, set_locale
-from MythTV import VideoMetadata
+# 0.3.1 Add --test parameter for proper compatibility with mythmetadatalookup
+# 0.3.2 Add --area parameter to allow country selection for release date and
+# parental ratings
from optparse import OptionParser
-from lxml import etree
import sys
-def buildSingle(inetref):
+def buildSingle(inetref, opts):
+ from MythTV.tmdb3 import Movie
+ from MythTV import VideoMetadata
+ from lxml import etree
movie = Movie(inetref)
tree = etree.XML(u'<metadata></metadata>')
mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
@@ -35,12 +37,30 @@ def buildSingle(inetref):
for i,j in mapping:
if getattr(movie, j):
setattr(m, i, getattr(movie, j))
+
+ releases = movie.releases.items()
+
+ if opts.country:
+ for alt in movie.alternate_titles:
+ if alt.country == opts.country:
+ m.title = alt.title
+ break
+ try:
+ # resort releases with selected country at top to ensure it
+ # is selected by the metadata libraries
+ index = zip(*releases)[0].index(opts.country)
+ releases.insert(0, releases.pop(index))
+ except ValueError:
+ pass
+ else:
+ m.releasedate = releases[0][1].releasedate
+
m.inetref = str(movie.id)
- if movie.releasedate:
- m.year = movie.releasedate.year
if movie.collection:
m.collectionref = str(movie.collection.id)
- for country, release in movie.releases.items():
+ if movie.releasedate:
+ m.year = movie.releasedate.year
+ for country, release in releases:
if release.certification:
m.certifications[country] = release.certification
for genre in movie.genres:
@@ -70,11 +90,15 @@ def buildSingle(inetref):
xml_declaration=True))
sys.exit()
-def buildList(query):
+def buildList(query, opts):
# TEMPORARY FIX:
# replace all dashes from queries to work around search behavior
# as negative to all text that comes afterwards
query = query.replace('-',' ')
+
+ from MythTV.tmdb3 import searchMovie
+ from MythTV import VideoMetadata
+ from lxml import etree
results = searchMovie(query)
tree = etree.XML(u'<metadata></metadata>')
mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
@@ -89,6 +113,10 @@ def buildList(query):
if getattr(res, j):
setattr(m, i, getattr(res, j))
m.inetref = str(res.id)
+ #TODO:
+ # should releasedate and year be pulled from the country-specific data
+ # or should it be left to the default information to cut down on
+ # traffic from searches
if res.releasedate:
m.year = res.releasedate.year
if res.backdrop:
@@ -109,7 +137,10 @@ def buildList(query):
xml_declaration=True))
sys.exit(0)
-def buildCollection(inetref):
+def buildCollection(inetref, opts):
+ from MythTV.tmdb3 import Collection
+ from MythTV import VideoMetadata
+ from lxml import etree
collection = Collection(inetref)
tree = etree.XML(u'<metadata></metadata>')
m = VideoMetadata()
@@ -129,6 +160,7 @@ def buildCollection(inetref):
sys.exit()
def buildVersion():
+ from lxml import etree
version = etree.XML(u'<grabber></grabber>')
etree.SubElement(version, "name").text = __title__
etree.SubElement(version, "author").text = __author__
@@ -142,43 +174,78 @@ def buildVersion():
xml_declaration=True))
sys.exit(0)
-def main():
- set_key('c27cb71cff5bd76e1a7a009380562c62')
- set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
+def performSelfTest():
+ err = 0
+ try:
+ import MythTV
+ except:
+ err = 1
+ print ("Failed to import MythTV bindings. Check your `configure` output "
+ "to make sure installation was not disabled due to external "
+ "dependencies")
+ try:
+ import MythTV.tmdb3
+ except:
+ err = 1
+ print ("Failed to import PyTMDB3 library. This should have been included "
+ "with the python MythTV bindings.")
+ try:
+ import lxml
+ except:
+ err = 1
+ print "Failed to import python lxml library."
+
+ if not err:
+ print "Everything appears in order."
+ sys.exit(err)
+def main():
parser = OptionParser()
parser.add_option('-v', "--version", action="store_true", default=False,
dest="version", help="Display version and author")
+ parser.add_option('-t', "--test", action="store_true", default=False,
+ dest="test", help="Perform self-test for dependencies.")
parser.add_option('-M', "--movielist", action="store_true", default=False,
dest="movielist", help="Get Movies matching search.")
parser.add_option('-D', "--moviedata", action="store_true", default=False,
dest="moviedata", help="Get Movie data.")
parser.add_option('-C', "--collection", action="store_true", default=False,
dest="collectiondata", help="Get Collection data.")
- parser.add_option( "-l", "--language", metavar="LANGUAGE", default=u'en',
+ parser.add_option('-l', "--language", metavar="LANGUAGE", default=u'en',
dest="language", help="Specify language for filtering.")
+ parser.add_option('-a', "--area", metavar="COUNTRY", default=None,
+ dest="country", help="Specify country for custom data.")
opts, args = parser.parse_args()
if opts.version:
buildVersion()
+ if opts.test:
+ performSelfTest()
+
+ from MythTV.tmdb3 import set_key, set_cache, set_locale
+ set_key('c27cb71cff5bd76e1a7a009380562c62')
+ set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
+
if opts.language:
set_locale(language=opts.language, fallthrough=True)
+ if opts.country:
+ set_locale(country=opts.country, fallthrough=True)
if (len(args) != 1) or (args[0] == ''):
sys.stdout.write('ERROR: tmdb3.py requires exactly one non-empty argument')
sys.exit(1)
if opts.movielist:
- buildList(args[0])
+ buildList(args[0], opts)
if opts.moviedata:
- buildSingle(args[0])
+ buildSingle(args[0], opts)
if opts.collectiondata:
- buildCollection(args[0])
+ buildCollection(args[0], opts)
if __name__ == '__main__':
main()
12 years
rpms/mythtv/devel .cvsignore, 1.10, 1.11 ChangeLog, 1.3, 1.4 mythtv.spec, 1.107, 1.108 sources, 1.55, 1.56 mysql.txt, 1.1, NONE mythtv-0.25.1-hls_profile.patch, 1.1, NONE mythtv-0.25.1-php54.patch, 1.1, NONE mythtv-0.25.2-fixes.patch, 1.2, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31375
Modified Files:
.cvsignore ChangeLog mythtv.spec sources
Removed Files:
mysql.txt mythtv-0.25.1-hls_profile.patch
mythtv-0.25.1-php54.patch mythtv-0.25.2-fixes.patch
Log Message:
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
- Update to latest upstream release.
- Remove mysql.txt as it is no longer used.
- Fix lib -> lib64 replacement command to be more accurate and support mythzmq
- Add mythzmq stuff
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 22 Jul 2012 18:42:46 -0000 1.10
+++ .cvsignore 29 Oct 2012 02:04:24 -0000 1.11
@@ -1 +1 @@
-MythTV-mythtv-v0.25.2-0-g4e44650.tar.gz
+MythTV-mythtv-v0.26.0-0-g6c3ae81.tar.gz
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 25 Aug 2012 16:55:34 -0000 1.3
+++ ChangeLog 29 Oct 2012 02:04:24 -0000 1.4
@@ -1,3 +1,242 @@
+commit 117b611ebdaf1c1710a1ccbcb2ffdeee06c92057
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Oct 25 15:16:38 2012 -0400
+
+ Tweak DictData behavior to properly function with Properties.
+ (cherry picked from commit 662b5e83cfa103fc3aed86c194b2fa2c6b9424d8)
+
+commit d0c153bcc0567dd9ac97856563f05ba368654077
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Oct 25 15:14:27 2012 -0400
+
+ Correct handling of Artwork when database field is set to NULL.
+ (cherry picked from commit 4646e7f56fc97f62d05d42b5896e8eceb361492e)
+
+commit fe9f6fab3b9c43c98067ff0c3d62f136f2858d60
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Oct 23 15:51:05 2012 -0400
+
+ Use 'unicode' rather than 'str' for UTF8 compatibility.
+ (cherry picked from commit 0bc83db48ec08b8df576c6ecbf1049567d34ab7a)
+
+commit 175b741f2d66eb8e795e9be65686c1141aec6efa
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Oct 23 15:42:31 2012 -0400
+
+ Fix immutable methods in Artwork class.
+
+ This fixes an issue with several immutable methods in the Artwork class,
+ inherited from the parent UserString class. As the Artwork class is
+ modified for use as a property, and not intended to be called directly
+ for storage of a string, the inherited UserString methods that returned
+ a new instance using the __class__ attribute would fail. This adds a
+ __new__ method that detects such uses and forces the call to return a
+ standard str type instead.
+ (cherry picked from commit 9f66fa0f9a4d9d759b9fdb44f411a4dc1a0748cb)
+
+commit 4176baab0a6371be7d21b8ad3500ce663391dfd7
+Author: Bill <billstuff2001(a)sbcglobal.net>
+Date: Fri Oct 12 13:47:27 2012 -0400
+
+ Fixes #11061. Speed up TFW recovery after falling behind on writes.
+
+ Signed-off-by: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
+
+commit 2103465e70f0eda760d4cd25abd49078add273d3
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Sun Oct 21 14:07:49 2012 +0200
+
+ MythUI: Fix potential use after free when leaving a web page
+
+ It's not safe to delete a QNetworkAccessManager before the QWebPage it is being
+ used with since any outstanding QNetworkReplys will be deleted, causing
+ QWebPage to potentially access free memory.
+
+ Fixes #11168.
+ (cherry picked from commit 83e88bc0abe21f54daace479ac921c352710c9de)
+
+commit 1fa9479b11791c60860d88eb37ad2033251d8957
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Oct 18 15:20:35 2012 -0400
+
+ Fix setting of values to Artwork property.
+
+ This makes the Artwork property derived from a MutableString rather than
+ a unicode type, allowing the setting of values to work properly, rather
+ than merely by chance, and correcting an issue where importMetadata
+ would not apply a coverart value to Video Library entries.
+ (cherry picked from commit e4b46f0cdc1a18ee5dca94e29229531d928a6dc1)
+
+commit 84431ca786a4543623fb3a293b0ec18d49194338
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Wed Oct 10 10:52:24 2012 -0400
+
+ Add reporting of logging volume to Smolt.
+
+ This reports the logging volume as a percentage of the total amount
+ stored in the database, for each urgency level. This is intended as a
+ simple metric to determine stability of MythTV, as higher counts of
+ higher urgency levels will indicate an increase in problems seen by the
+ user base.
+
+ (cherry picked from commit 5f90b1d62c4d692a6c23ae22ab2047db85e6572e)
+
+commit 380076192d0a0945c8489cba851537fde75b21e4
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Sat Oct 6 04:28:48 2012 -0400
+
+ Fix single episode grabber for season 0 specials.
+
+ This makes the check for arguments to grabInetref() look specifically
+ for None, rather than boolean False, to prevent false positives when
+ dealing with specials that have a season of 0.
+ (cherry picked from commit 7da754ad0d350988f324c239477a6587bf88ba1c)
+
+commit 139bd59f435974cf0f19934b8feafb1e742aea65
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Mon Oct 1 17:56:38 2012 +0100
+
+ Setting VERSION to v0.25.3
+
+commit f86a6c6466826baf6aa6fe7a7b778a4c4b6d0c05
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Mon Oct 1 17:54:18 2012 +0100
+
+ Setting VERSION to vv0.25.3
+
+commit 957c7e20c8b9e2f2bb50a5fc826810c39689db4b
+Author: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
+Date: Mon Jul 30 15:40:10 2012 -0400
+
+ Refs #10948. Fully randomize EIT crawl start time.
+
+ The deadlocks we've been seeing here should be fixed now, but they
+ should have been rare to begin with due to randomization of the
+ EIT Scanning start time. But they were occurring at fairly high
+ frequency. It turns out we were not applying enough randomness when
+ there were multiple cards and we were also losing randomness after
+ the first recording on a tuner finished and we reset the clock.
+ (cherry picked from commit 0e5d159c6bc98ef29a7b6bb225b43492b45c37ac)
+
+commit eb52783e9f7ad232cbf4afb22dbc604898514e45
+Author: Daniel Kristjansson <danielk(a)cuymedia.net>
+Date: Fri Aug 3 17:47:39 2012 -0400
+
+ Fixes #10970. Fix StreamHandler restart race.
+
+ We wait for _running to be set to false, but we need the thread to be
+ in the finish state or QThread::start() will exit silently without
+ starting the thread. Since we're calling QThread::wait() we don't
+ really need the while (_running) loop at all in either Start() or
+ Stop(), so I've removed it. This race probably dates back to the
+ pthread->QThread porting.
+ (cherry picked from commit 7d01e691d2bb58ed7dcbbdcca93ec06dc3a7381b)
+
+commit 0817eb2a6d5663c5dce770105b8350688f09e97e
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Sep 21 13:05:14 2012 -0400
+
+ Fix argument count error in MythBE.getConflictedRecordings().
+ (cherry picked from commit 272fb61b88522be3bf9d51510d3e0aaa882b36a2)
+
+commit d8ca64e65f99c628571cfc09ce88f70228b165b7
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Sep 20 13:29:10 2012 -0400
+
+ Add 'releasedate' to properties handled by Video.importMetadata()
+ (cherry picked from commit dbd7a9e47f1ffa003f0011cbf76359829eab2122)
+
+commit c93373060d0053782a9033a0fce2d784e51f95a0
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Sep 20 12:15:03 2012 -0400
+
+ Add error handling for Frontend UPnP autodetection.
+
+ This adds an error handling block to UPnP detection of the Frontend
+ connection class, to allow the remainder of the list to be returned if
+ one machine responding to the query cannot be connected to.
+ (cherry picked from commit 8c9fc7a1d3e4730c06bc0abac66be548aacbc11b)
+
+commit bd0f9eba93b37471bb6c3d0867b7470f6a116248
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Sep 20 13:11:23 2012 -0400
+
+ Add check for 'No Cover' when applying coverart to videos.
+
+ This considers a 'No Cover' value properly as non-existent, when
+ importing data from a VideoGrabber search result, to allow a new
+ cover to be downloaded in it's place, rather than refusing to
+ overwrite an existing image.
+ (cherry picked from commit 2076d12a565e120b67ed25eb68181250cd2ffe59)
+
+commit 099533dacc0faef47aadfbe7b45ab93ff57f5125
+Author: David Engel <dengel(a)mythtv.org>
+Date: Tue Sep 18 19:53:33 2012 -0500
+
+ Calculate current playback position using frame count and frame rate.
+
+ According to Taylor Ralph, the code which uses timestamps is not
+ finished and shouldn't be used yet. For one thing, it doesn't handle
+ discontinuities in the timestamps.
+
+ Note: timestamps are still used sometimes to calculate recording
+ lengths. That will need to be fixed in a future commit.
+
+ (cherry picked from commit 286186281dcca4a3f25f591e6658310bc9d375fb)
+
+commit 96af9b06b00b749cb80589486eab6eb3d01da358
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sun Sep 16 23:17:57 2012 +0100
+
+ Add three missing SAR values defined in the H.264 spec to H264Parser::aspectRatio() fixes incorrect display aspect ratio for some videos and recordings.
[...2025 lines suppressed...]
+Date: Tue Apr 17 00:03:07 2012 +1000
+
+ Make services running on the frontend and advertised through Bonjour to listen to all interfaces
+
+ It was previously only listening on the address used to communicate with the backend
+
+ [cherry-picked from da49b57ac4a07da69b558b8b2660fa7963c9e238]
+
+commit 682e6f514bf7a69338c29959dbd746d9cea590ab
+Author: Michael T. Dean <mdean(a)mythtv.org>
+Date: Sun Apr 15 22:14:00 2012 -0400
+
+ Fix metadata options editor for multiple results.
+
+ Thanks to lomion for the patch (and apologies for the delay in applying
+ it).
+
+ Fixes #10383
+ (cherry picked from commit ea5aa87578e857e205291b0d95a42ceef70f6c21)
+
+commit 446e30b02e87458b50a3fbedf5ba18b77671fb9f
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Sun Apr 15 10:13:51 2012 -0700
+
+ Fix a compiler warning.
+ (cherry picked from commit d5f22eb940dca052949bfa8e3477e35e83054e1b)
+
+commit 8bbccaa865cd96aaecd685d815ebec9f22673666
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Sun Apr 15 09:55:57 2012 -0700
+
+ This should really fix the osx build. Give up on QVector for now.
+ (cherry picked from commit 04e0d942ea0a1ccb14242084d3638e2ed4af5b7f)
+
+commit 108b52b605043324b56b7f8f5dd5049491d94954
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Sun Apr 15 07:36:02 2012 -0700
+
+ Fix Live TV channel changing when using Input Groups.
+
+ When trying to change channels (either directly or through the program
+ guide), an idle tuner in the same input group as the current tuner
+ would not be considered available.
+
+ This is fixed by adding the excluded_cardids argument to
+ RemoteRequestFreeRecorderList() and
+ RemoteRequestFreeRecorderFromList().
+
+ Doing this the "right" way would require a protocol change for the
+ GET_FREE_RECORDER_LIST command. This is better done closer to the end
+ of the 0.26 release cycle, so the current implementation is less
+ efficient and makes multiple queries.
+
+ There is also a lot of vector<> code here that could stand to be
+ converted to QVector<>.
+ (cherry picked from commit dc6a18af542c9de80f06cc22485d6ac8b932dfeb)
+
+commit d11128aff44c176885db90a3d8b0e1ee782fc03e
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Sun Apr 15 12:31:04 2012 +0200
+
+ MythNetvision: Fix segmentation fault in NetTree::showMenu
+
+ Fixes #10603
+
+ Also removed some unused code.
+ (cherry picked from commit ba9bcba84c386adc68815c5301f32990872e8e1f)
+
+commit 76df8e6c8f7b84a157607d8c25fd19f39d8dc830
+Author: Rune Evjen <rune.evjen(a)gmail.com>
+Date: Sat Apr 14 17:37:29 2012 -0400
+
+ Updated Norwegian Bokmal translation update
+
+ Thank you Rune!
+
+ Closes #10599
+
+ Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
+
+commit 2e7722d436dd8348d9131b069bf963a96b04a1dd
+Author: Daniel Kristjansson <danielk(a)cuymedia.net>
+Date: Fri Apr 13 15:33:46 2012 -0400
+
+ Disable picture controls with Intel XVideo overlay adaptor.
+
+ This adaptor uses defaults that vary from the norm on more than just the hue value.
+ Hue variance is the only thing we allow non-standard defaults on so just disable
+ picture controls with this adaptor.
+
+ [cherry-picked from 0c00c0ac960df077d558959b1726c4b9801852c3]
+
+ Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+
+commit 0f8476995fe6a297ef6bae606e1600a967a4b965
+Author: Daniel Kristjansson <danielk(a)cuymedia.net>
+Date: Fri Apr 13 13:46:43 2012 -0400
+
+ Changes VideoOutput::CalcHueBase() to return 50% by default.
+
+ This also adds some adaptors to the known list from jya.
+
+ Thanks to skd5aner, anykey and jya on IRC for their assistance with this problem.
+
+ [cherry-picked from b2657a1a3f8aa7210885a9699b620634e4043363]
+
+ Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+
+commit efada3f90132b3a9155b1adc07831161f4893aa4
+Author: Daniel Kristjansson <danielk(a)cuymedia.net>
+Date: Fri Apr 13 08:32:09 2012 -0400
+
+ Update PROJECT_NUMBER to 0.25
+
+commit 77004d9f07c4cd90308dad87e4cdb018540460af
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Fri Apr 13 12:38:24 2012 +0100
+
+ Fix #10590. 'Record This' and 'Change to Channel' options not working in Guide menu.
+ (cherry picked from commit 19efff933a2c5f91cc3961ec8a523cc1513d9c20)
+
+commit 13bc14c8699bfb6077efb11d5e68623dcee7ba76
+Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
+Date: Thu Apr 12 20:54:20 2012 -0700
+
+ Fixed the version file
+
+commit 6967025c4f28ba564d0bb2928673310624c52470
+Author: Ilkka Tengvall <ikke(a)iki.fi>
+Date: Thu Apr 12 19:38:27 2012 -0400
+
+ Backport of c4b33d30185eb4f5396a7c0c67b507371c7506c7/mythtv:
+
+ Updated Finnish MythFrontend and all plugins translation
+ from Ilkka Tengvall
+
+ Thank you!
+
+ Refs #10577
+
+ Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
+
+commit 5c87d03153f33f0594f657ba68efe44b9d358227
+Author: Yves Cayer <ycayer(a)gmail.com>
+Date: Thu Apr 12 09:56:33 2012 +0100
+
+ Re-enable idle timer after exiting video playback. (Copy/paste error). Fixes #10582
+
+ Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org>
+ (cherry picked from commit ea953d91599a3d89e3e070732fb56a47e824d374)
+
+commit d3c35b3e2c9ecdecfa22b9d4f6bed848a943d8e2
+Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
+Date: Wed Apr 11 21:01:25 2012 -0700
+
+ Tweak logging around Commercial Skip -> Cutlist copying
+ (cherry picked from commit 73d20c4c0b1801df6b42621278bb35ad521c6bf1)
+
+commit 14d7a74578dfb38fa085b46db9c7647825668713
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Wed Apr 11 12:59:34 2012 -0700
+
+ Fixes #10566. Reverts part of 3a51b833e to improve channel changes.
+
+ The first half of 3a51b833e looks like a bug (the new condition means
+ the following "else if" branch is never taken). Removing it stops
+ guide-based channel changes from being forced onto a different tuner.
+
+ Note: this fix exposes another problem with guide-based channel
+ changes - you can't switch to a different tuner in the current input
+ group. Fix is in progress.
+
+commit fd06548d81f12f0911538b17aa79fdb6b9ac5c6d
+Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com>
+Date: Tue Apr 10 12:12:40 2012 -0700
+
+ Fix a clang-related compile issue
+
+ Fixes #10473.
+
+ Port the mplayer yadif filter fix (revision 32437) to mythtv port to allow compile with clang
+
+ mplayer log: yadif: Explicit wordlength for compare. Fixes compile with clang.
+
+ mplayer cvslog reference:
+ http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2010-October/040647.html
+
+ Signed-off-by: Gavin Hurlbut <ghurlbut(a)mythtv.org>
+ (cherry picked from commit ecda14d1d751a4aa4b8eeb903330393d0e12bc48)
+
+commit 773c88c3ac2c2eac4e6dbb6af0ce949df6d4ab27
+Author: Kevon <mythtv(a)reidsresidence.com>
+Date: Tue Apr 10 11:45:14 2012 -0700
+
+ Make mythtv more compatible with GCC 4.7
+
+ Fixes #10537
+
+ Signed-off-by: Gavin Hurlbut <ghurlbut(a)mythtv.org>
+ (cherry picked from commit 19a7e0131146d38bfe384da55fc4c16193f2b54e)
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mythtv.spec 9 Sep 2012 16:30:16 -0000 1.107
+++ mythtv.spec 29 Oct 2012 02:04:24 -0000 1.108
@@ -1,4 +1,3 @@
-#
# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
#
# by: Chris Petersen <rpm(a)forevermore.net>
@@ -33,7 +32,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 crystalhd Disable Crystal HD support (disabled, currently broken)
# --without perl Disable building of the perl bindings
# --without python Disable building of the python bindings
#
@@ -60,12 +59,12 @@
# Git revision and branch ID
# 0.25 release: git tag v0.25.1
-%define _gitrev v0.25.2-15-g46cab93
-%define branch fixes/0.25
+%define _gitrev v0.26.0-0-g6c3ae8
+%define branch fixes/0.26
# Mythtv and plugins from github.com
-%global githash1 g4e44650
-%global githash2 19087cb
+%global githash1 g6c3ae81
+%global githash2 d2f9798
#
# Basic descriptive tags for this package:
@@ -76,12 +75,11 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.25.2
+Version: 0.26.0
%if "%{branch}" == "master"
-Release: 0.2.git.%{_gitrev}%{?dist}
-#Release: 0.1.rc1%{?dist}
+Release: 0.1.git.%{_gitrev}%{?dist}
%else
-Release: 3%{?dist}
+Release: 1%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -134,12 +132,7 @@
# https://github.com/MythTV/mythtv/tarball/v0.25
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
-Patch0: mythtv-0.25.2-fixes.patch
-
-# Fixes for PHP 5.4
-Patch1: mythtv-0.25.1-php54.patch
-# Adapative HLS profile based on resolution.
-Patch2: mythtv-0.25.1-hls_profile.patch
+Patch0: mythtv-0.26-fixes.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -152,7 +145,6 @@
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
Source109: mythtv-setup.desktop
-Source110: mysql.txt
Source111: 99-mythbackend.rules
@@ -181,6 +173,7 @@
BuildRequires: qt-webkit-devel
BuildRequires: qt-devel >= 4.6
BuildRequires: phonon-devel
+BuildRequires: libuuid-devel
BuildRequires: lm_sensors-devel
BuildRequires: lirc-devel
@@ -349,7 +342,8 @@
Requires: php-MythTV = %{version}-%{release}
Requires: python-MythTV = %{version}-%{release}
Requires: mythplugins = %{version}-%{release}
-Requires: mythweb
+Requires: mythweb = %{version}
+Requires: mythffmpeg = %{version}-%{release}
Requires: mysql-server >= 5, mysql >= 5
Requires: xmltv
@@ -578,6 +572,19 @@
This package contains components needed by multiple other MythTV components.
################################################################################
+################################################################################
+
+%package -n mythffmpeg
+Summary: MythTV build of FFmpeg
+Group: Applications/Multimedia
+
+%description -n mythffmpeg
+Several MythTV utilities interact with FFmpeg, which changes its parameters
+often enough to make it a hassle to support the variety of versions used by
+MythTV users. This is a snapshot of the FFmpeg code so that MythTV utilities
+can interact with a known verion.
+
+################################################################################
%if %{with_perl}
@@ -805,14 +812,10 @@
# Replace static lib paths with %{_lib} so we build properly on x86_64
# systems, where the libs are actually in lib64.
if [ "%{_lib}" != "lib" ]; then
- grep -rlZ '/lib/' . | xargs -r0 sed -i -e 's,/lib/,/%{_lib}/,g'
- grep -rlZ '/lib$' . | xargs -r0 sed -i -e 's,/lib$,/%{_lib},'
- grep -rlZ '/lib ' . | xargs -r0 sed -i -e 's,/lib ,/%{_lib} ,g'
+ find \( -name 'configure' -o -name '*pro' -o -name 'Makefile' \) -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+
fi
%patch0 -p1 -b .mythtv
-%patch1 -p1 -b .php54
-%patch2 -p1 -b .hls_profile
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -948,6 +951,7 @@
-exec sed -i -e "s,DEPLIBS = \$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \
-exec sed -i -e "s,\$\${PREFIX}/include/mythtv,$temp%{_includedir}/mythtv," {} \;
echo "INCLUDEPATH -= \$\${PREFIX}/include" >> settings.pro
+ echo "INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include" >> settings.pro
echo "INCLUDEPATH -= %{_includedir}" >> settings.pro
echo "INCLUDEPATH += $temp%{_includedir}" >> settings.pro
echo "INCLUDEPATH += %{_includedir}" >> settings.pro
@@ -1040,8 +1044,7 @@
# Fix permissions on executable python bindings
# chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth*.py
-# mysql.txt and other config/init files
- install -m 0644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
+# config/init files
echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
### SystemD based setup. ###
@@ -1080,6 +1083,11 @@
popd
+# Clean up some stuff we don't want to include
+rm -f %{buildroot}%{_libdir}/libmythqjson.prl \
+ %{buildroot}%{_libdir}/libmythzmq.la \
+ %{buildroot}%{_libdir}/pkgconfig/libmythzmq.pc
+
# MythPlugins
%if %{with_plugins}
pushd mythplugins
@@ -1225,6 +1233,7 @@
%{_bindir}/mythcommflag
%{_bindir}/mythmetadatalookup
%{_bindir}/mythutil
+%{_bindir}/mythlogserver
%{_bindir}/mythpreviewgen
%{_bindir}/mythtranscode
%{_bindir}/mythwikiscripts
@@ -1234,7 +1243,6 @@
%{_datadir}/mythtv/hardwareprofile/
%attr(-,mythtv,mythtv)
%dir %{_sysconfdir}/mythtv
-%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
%config(noreplace) %{_sysconfdir}/mythtv/config.xml
%files backend
@@ -1243,8 +1251,6 @@
%{_bindir}/mythjobqueue
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
-%{_bindir}/mythffmpeg
-%{_bindir}/mythffplay
%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
@@ -1287,6 +1293,7 @@
%dir %{_datadir}/mythtv/i18n
%dir %{_datadir}/mythtv/fonts
%{_datadir}/mythtv/fonts/*.ttf
+%{_datadir}/mythtv/fonts/*.otf
%{_datadir}/mythtv/fonts/*.txt
%{_datadir}/mythtv/i18n/mythfrontend_*.qm
%{_datadir}/applications/*mythfrontend.desktop
@@ -1308,6 +1315,9 @@
%dir %{_datadir}/mythtv/build
%{_datadir}/mythtv/build/settings.pro
+%files -n mythffmpeg
+%{_bindir}/mythffmpeg
+
%if %{with_perl}
%files -n perl-MythTV
%{perl_vendorlib}/MythTV.pm
@@ -1388,6 +1398,7 @@
%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythmusic
+%{_datadir}/mythtv/mythmusic/
%{_datadir}/mythtv/musicmenu.xml
%{_datadir}/mythtv/music_settings.xml
%{_datadir}/mythtv/i18n/mythmusic_*.qm
@@ -1441,6 +1452,12 @@
%changelog
+* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
+- Update to latest upstream release.
+- Remove mysql.txt as it is no longer used.
+- Fix lib -> lib64 replacement command to be more accurate and support mythzmq
+- Add mythzmq stuff
+
* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.25.2-3
- Rebuilt for x264 ABI 125
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 22 Jul 2012 18:42:46 -0000 1.55
+++ sources 29 Oct 2012 02:04:24 -0000 1.56
@@ -1 +1 @@
-05d3402459bf7380cf54cc6066c149a3 MythTV-mythtv-v0.25.2-0-g4e44650.tar.gz
+5a89c1afe1fdd7584786e7bd8bbf756a MythTV-mythtv-v0.26.0-0-g6c3ae81.tar.gz
--- mysql.txt DELETED ---
--- mythtv-0.25.1-hls_profile.patch DELETED ---
--- mythtv-0.25.1-php54.patch DELETED ---
--- mythtv-0.25.2-fixes.patch DELETED ---
12 years
rpms/lightspark/devel sources, 1.22, 1.23 .cvsignore, 1.2, 1.3 lightspark.spec, 1.31, 1.32
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/lightspark/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17619
Modified Files:
sources .cvsignore lightspark.spec
Log Message:
0.7.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lightspark/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 11 Jun 2012 18:14:54 -0000 1.22
+++ sources 28 Oct 2012 20:42:39 -0000 1.23
@@ -1 +1 @@
-66e13a61d06dd0c8c81303fabaee8549 lightspark-0.6.0.1.tar.gz
+faa4d11aa3bd706c4644c634c5590949 lightspark-0.7.0.tar.gz
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/lightspark/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 11 Jun 2012 18:14:54 -0000 1.2
+++ .cvsignore 28 Oct 2012 20:42:40 -0000 1.3
@@ -1 +1 @@
-lightspark-0.6.0.1.tar.gz
+lightspark-0.7.0.tar.gz
Index: lightspark.spec
===================================================================
RCS file: /cvs/free/rpms/lightspark/devel/lightspark.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lightspark.spec 17 Oct 2012 21:31:15 -0000 1.31
+++ lightspark.spec 28 Oct 2012 20:42:41 -0000 1.32
@@ -17,12 +17,12 @@
%define pre rc1
%endif
-%define rel 3
+%define rel 1
-%define major 0.6.0
+%define major 0.7.0
Name: lightspark
-Version: %{major}.1
+Version: %{major}
Release: %{?pre:0.}%{rel}%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}
Summary: An alternative Flash Player implementation
@@ -61,6 +61,7 @@
BuildRequires: libxml++-devel >= 2.33.1
BuildRequires: librtmp-devel
BuildRequires: libffi-devel
+BuildRequires: xz-devel
%description
Lightspark is a modern, free, open-source flash player implementation.
@@ -154,6 +155,9 @@
%{_libdir}/mozilla/plugins/lib%{name}plugin.so
%changelog
+* Sun Oct 28 2012 Xavier Bachelot <xavier(a)bachelot.org> - 0.7.0-1
+- Update to 0.7.0.
+
* Wed Oct 17 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.0.1-3
- Rebuilt for boost GLEW
12 years
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.88,1.89
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16928
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Remove old conflict
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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- xorg-x11-drv-nvidia.spec 16 Oct 2012 22:21:11 -0000 1.88
+++ xorg-x11-drv-nvidia.spec 28 Oct 2012 20:31:38 -0000 1.89
@@ -50,11 +50,6 @@
Requires(post): ldconfig
#Requires(preun): chkconfig
-%if 0%{?fedora} == 16
-Conflicts: selinux-policy-targeted < 3.10.0-53
-%endif
-
-
Provides: nvidia-kmod-common = %{?epoch}:%{version}
Conflicts: xorg-x11-drv-nvidia-beta
12 years
rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.29,1.30
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15924
Modified Files:
VirtualBox-kmod.spec
Log Message:
bump a version to overwrite
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-17/VirtualBox-kmod.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- VirtualBox-kmod.spec 28 Oct 2012 20:09:10 -0000 1.29
+++ VirtualBox-kmod.spec 28 Oct 2012 20:10:23 -0000 1.30
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.2.4
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
12 years
rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.28,1.29
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15799
Modified Files:
VirtualBox-kmod.spec
Log Message:
fix suffix version
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-17/VirtualBox-kmod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- VirtualBox-kmod.spec 28 Oct 2012 19:38:30 -0000 1.28
+++ VirtualBox-kmod.spec 28 Oct 2012 20:09:10 -0000 1.29
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.2.4
-Release: 1%{?prerel:.%{prerel}}%{?dist}.5
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
12 years
rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.27,1.28
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14470
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Oct 28 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-17/VirtualBox-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- VirtualBox-kmod.spec 23 Oct 2012 15:41:29 -0000 1.27
+++ VirtualBox-kmod.spec 28 Oct 2012 19:38:30 -0000 1.28
@@ -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
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -12,14 +12,14 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 3
+%global vboxrel 1
%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.2.0
+Version: 4.2.4
Release: 1%{?prerel:.%{prerel}}%{?dist}.5
Summary: Kernel module for VirtualBox
@@ -98,6 +98,9 @@
%changelog
+* Sun Oct 28 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
+- New upstream release.
+
* Tue Oct 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.0-1.5
- Rebuilt for updated kernel
12 years
rpms/VirtualBox-kmod/F-18 VirtualBox-kmod.spec,1.9,1.10
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13607
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Oct 28 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-18/VirtualBox-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VirtualBox-kmod.spec 23 Sep 2012 15:26:18 -0000 1.9
+++ VirtualBox-kmod.spec 28 Oct 2012 19:23:03 -0000 1.10
@@ -12,15 +12,15 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 3
+%global vboxrel 1
%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.2.0
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Version: 4.2.4
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sun Oct 28 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
+- New upstream release.
+
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
- Build with newest VirtualBox-kmodsrc (4.2.0-3).
12 years
