Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20864
Modified Files:
mythbackend.service mythplugins-0.24.1-fixes.patch
mythtv-0.24.1-fixes.patch mythtv.spec
Removed Files:
mythtv-0.24.1-glu_h_gluErrorString.patch
mythweb-0.24.1-fixes.patch
Log Message:
* Mon Nov 21 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.1-5
- Fix typo in spec file causing mythtv user to not be created (#2051).
- Change mythbackend systemd type to "simple" and other fixes (#2016).
- Update to latest 0.24.1-fixes, git revision f5fd11fa54.
Index: mythbackend.service
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/mythbackend.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.service 26 Oct 2011 15:29:13 -0000 1.1
+++ mythbackend.service 21 Nov 2011 23:19:04 -0000 1.2
@@ -3,14 +3,11 @@
After=network.target mysqld.service
[Service]
-Type=forking
-PIDFile=/var/run/mythbackend.pid
+Type=simple
Environment=MYTHCONFDIR=/etc/mythtv
Environment=HOME=/usr/share/mythtv
-Environment=MYTHBACKEND_USER=root
-EnvironmentFile=-/etc/sysconfig/mythbackend
User=mythtv
-ExecStart=/usr/bin/mythbackend --daemon --logfile /var/log/mythtv/mythbackend.log
--pidfile /var/run/mythbackend.pid
+ExecStart=/usr/bin/mythbackend --logfile /var/log/mythtv/mythbackend.log
[Install]
WantedBy=multi-user.target
mythplugins-0.24.1-fixes.patch:
mytharchive/i18n/mytharchive_da.qm |binary
mytharchive/i18n/mytharchive_da.ts | 20
mytharchive/i18n/mytharchive_en_gb.ts | 6
mythgallery/i18n/mythgallery_da.qm |binary
mythgallery/i18n/mythgallery_da.ts | 86 -
mythgallery/i18n/mythgallery_en_gb.qm |binary
mythgallery/i18n/mythgallery_en_gb.ts | 162 +-
mythgallery/i18n/mythgallery_es.qm |binary
mythgallery/i18n/mythgallery_es.ts | 20
mythgallery/mythgallery/gallerysettings.cpp | 4
mythgame/i18n/mythgame_en_gb.ts | 101 -
mythmusic/i18n/mythmusic_en_gb.ts | 327 ++--
mythmusic/i18n/mythmusic_es.qm |binary
mythmusic/i18n/mythmusic_es.ts | 1957 +++++++++++++++-------------
mythmusic/mythmusic/main.cpp | 8
mythnetvision/i18n/mythnetvision_en_gb.ts | 82 -
mythnetvision/i18n/mythnetvision_es.qm |binary
mythnetvision/i18n/mythnetvision_es.ts | 226 +--
mythvideo/mythvideo/scripts/jamu.py | 7
mythweather/i18n/mythweather_en_gb.ts | 2
mythzoneminder/i18n/mythzoneminder_en_gb.ts | 2
21 files changed, 1630 insertions(+), 1380 deletions(-)
Index: mythplugins-0.24.1-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/mythplugins-0.24.1-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythplugins-0.24.1-fixes.patch 26 Oct 2011 15:29:14 -0000 1.3
+++ mythplugins-0.24.1-fixes.patch 21 Nov 2011 23:19:05 -0000 1.4
@@ -1,3 +1,26 @@
+ mythplugins/mytharchive/i18n/mytharchive_da.qm | Bin 28888 -> 28824 bytes
+ mythplugins/mytharchive/i18n/mytharchive_da.ts | 20 +-
+ mythplugins/mytharchive/i18n/mytharchive_en_gb.ts | 6 +-
+ mythplugins/mythgallery/i18n/mythgallery_da.qm | Bin 13074 -> 13649 bytes
+ mythplugins/mythgallery/i18n/mythgallery_da.ts | 86 +-
+ mythplugins/mythgallery/i18n/mythgallery_en_gb.qm | Bin 297 -> 684 bytes
+ mythplugins/mythgallery/i18n/mythgallery_en_gb.ts | 162 +-
+ mythplugins/mythgallery/i18n/mythgallery_es.qm | Bin 13684 -> 13676 bytes
+ mythplugins/mythgallery/i18n/mythgallery_es.ts | 20 +-
+ .../mythgallery/mythgallery/gallerysettings.cpp | 4 +-
+ mythplugins/mythgame/i18n/mythgame_en_gb.ts | 101 +-
+ mythplugins/mythmusic/i18n/mythmusic_en_gb.ts | 327 ++--
+ mythplugins/mythmusic/i18n/mythmusic_es.qm | Bin 31964 -> 60973 bytes
+ mythplugins/mythmusic/i18n/mythmusic_es.ts | 1957 +++++++++++---------
+ mythplugins/mythmusic/mythmusic/main.cpp | 8 +-
+ .../mythnetvision/i18n/mythnetvision_en_gb.ts | 82 +-
+ mythplugins/mythnetvision/i18n/mythnetvision_es.qm | Bin 23 -> 7911 bytes
+ mythplugins/mythnetvision/i18n/mythnetvision_es.ts | 226 ++--
+ mythplugins/mythvideo/mythvideo/scripts/jamu.py | 7 +-
+ mythplugins/mythweather/i18n/mythweather_en_gb.ts | 2 +-
+ .../mythzoneminder/i18n/mythzoneminder_en_gb.ts | 2 +-
+ 21 files changed, 1630 insertions(+), 1380 deletions(-)
+
diff --git a/mythplugins/mytharchive/i18n/mytharchive_da.qm
b/mythplugins/mytharchive/i18n/mytharchive_da.qm
index b744be6..623eff6 100644
Binary files a/mythplugins/mytharchive/i18n/mytharchive_da.qm and
b/mythplugins/mytharchive/i18n/mytharchive_da.qm differ
mythtv-0.24.1-fixes.patch:
b/mythtv/VERSION | 2
b/mythtv/bindings/perl/MythTV.pm | 39
b/mythtv/bindings/python/MythTV/database.py | 1
b/mythtv/bindings/python/MythTV/dataheap.py | 2
b/mythtv/bindings/python/MythTV/system.py | 22
b/mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 97
b/mythtv/bindings/python/MythTV/ttvdb/XSLT/tvdbVideo.xsl | 23
b/mythtv/bindings/python/MythTV/ttvdb/tvdbXslt.py | 50
b/mythtv/bindings/python/MythTV/utility.py | 10
b/mythtv/configure | 5
b/mythtv/contrib/imports/mirobridge/mirobridge.py | 545 +
b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_4_0_2.py | 788 ++
b/mythtv/external/FFmpeg/libavcodec/Makefile | 1
b/mythtv/external/FFmpeg/libavcodec/aac.h | 36
b/mythtv/external/FFmpeg/libavcodec/aacdec.c | 822 +-
b/mythtv/external/FFmpeg/libavcodec/aacdectab.h | 8
b/mythtv/external/FFmpeg/libavcodec/aacsbr.c | 38
b/mythtv/external/FFmpeg/libavcodec/dvbsubdec.c | 11
b/mythtv/external/FFmpeg/libavcodec/ppc/asm.S | 6
b/mythtv/i18n/mythfrontend_da.qm |binary
b/mythtv/i18n/mythfrontend_da.ts | 3445
++++----
b/mythtv/i18n/mythfrontend_en_gb.qm |binary
b/mythtv/i18n/mythfrontend_en_gb.ts | 3924
++++------
b/mythtv/libs/libmyth/audiooutput.cpp | 14
b/mythtv/libs/libmyth/audiooutputalsa.cpp | 28
b/mythtv/libs/libmyth/audiooutputbase.cpp | 33
b/mythtv/libs/libmyth/audiooutputbase.h | 9
b/mythtv/libs/libmyth/audiooutputjack.cpp | 15
b/mythtv/libs/libmyth/audiooutputsettings.cpp | 2
b/mythtv/libs/libmyth/libmyth.pro | 4
b/mythtv/libs/libmyth/mythterminal.cpp | 5
b/mythtv/libs/libmyth/netutils.cpp | 2
b/mythtv/libs/libmyth/programtypes.cpp | 5
b/mythtv/libs/libmythdvdnav/dvdread/dvd_udf.c | 10
b/mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 7
b/mythtv/libs/libmythhdhomerun/hdhomerun_device.c | 5
b/mythtv/libs/libmythmetadata/metadatacommon.cpp | 11
b/mythtv/libs/libmythtv/DVDRingBuffer.cpp | 16
b/mythtv/libs/libmythtv/DVDRingBuffer.h | 4
b/mythtv/libs/libmythtv/DeviceReadBuffer.cpp | 21
b/mythtv/libs/libmythtv/DeviceReadBuffer.h | 13
b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp | 2
b/mythtv/libs/libmythtv/RingBuffer.cpp | 63
b/mythtv/libs/libmythtv/RingBuffer.h | 4
b/mythtv/libs/libmythtv/analogsignalmonitor.cpp | 2
b/mythtv/libs/libmythtv/avformatdecoder.cpp | 6
b/mythtv/libs/libmythtv/cardutil.cpp | 2
b/mythtv/libs/libmythtv/cc708decoder.cpp | 2
b/mythtv/libs/libmythtv/channelutil.cpp | 2
b/mythtv/libs/libmythtv/decoderbase.cpp | 4
b/mythtv/libs/libmythtv/eitfixup.cpp | 4
b/mythtv/libs/libmythtv/eitfixup.h | 1
b/mythtv/libs/libmythtv/firewiredevice.cpp | 4
b/mythtv/libs/libmythtv/jobqueue.cpp | 1
b/mythtv/libs/libmythtv/mythplayer.cpp | 41
b/mythtv/libs/libmythtv/mythplayer.h | 4
b/mythtv/libs/libmythtv/osd.cpp | 12
b/mythtv/libs/libmythtv/osd.h | 36
b/mythtv/libs/libmythtv/recordinginfo.cpp | 4
b/mythtv/libs/libmythtv/subtitlescreen.cpp | 12
b/mythtv/libs/libmythtv/tv_rec.cpp | 15
b/mythtv/libs/libmythtv/tvbrowsehelper.cpp | 18
b/mythtv/libs/libmythtv/util-osd.cpp | 8
b/mythtv/libs/libmythtv/v4lchannel.cpp | 2
b/mythtv/libs/libmythtv/vbitext/vbi.c | 2
b/mythtv/libs/libmythtv/videodev_myth.h | 360
b/mythtv/libs/libmythtv/videosource.cpp | 4
b/mythtv/libs/libmythtv/videosource.h | 2
b/mythtv/libs/libmythui/mythrender_opengl.cpp | 1
b/mythtv/libs/libmythui/mythuihelper.cpp | 3
b/mythtv/libs/libmythui/mythuiimage.cpp | 10
b/mythtv/libs/libmythui/mythuiwebbrowser.cpp | 12
b/mythtv/libs/libmythui/mythuiwebbrowser.h | 11
b/mythtv/programs/mythbackend/main_helpers.cpp | 6
b/mythtv/programs/mythbackend/mainserver.cpp | 42
b/mythtv/programs/mythbackend/mainserver.h | 7
b/mythtv/programs/mythbackend/scheduler.cpp | 19
b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp | 7
b/mythtv/programs/mythfilldatabase/main.cpp | 32
b/mythtv/programs/mythfrontend/guidegrid.cpp | 8
b/mythtv/programs/mythfrontend/networkcontrol.cpp | 2
b/mythtv/programs/mythfrontend/playbackbox.cpp | 27
b/mythtv/programs/mythfrontend/playbackbox.h | 6
b/mythtv/programs/mythfrontend/playbackboxhelper.cpp | 7
b/mythtv/programs/mythfrontend/progfind.cpp | 14
b/mythtv/programs/mythfrontend/proglist.cpp | 6
b/mythtv/programs/mythfrontend/themechooser.cpp | 4
b/mythtv/programs/mythtranscode/main.cpp | 30
b/mythtv/programs/mythtranscode/mpeg2fix.cpp | 4
b/mythtv/programs/mythtranscode/transcode.cpp | 67
b/mythtv/programs/mythtranscode/transcode.h | 2
b/mythtv/themes/MythCenter-wide/config-ui.xml | 145
b/mythtv/themes/MythCenter-wide/schedule-ui.xml | 4
b/mythtv/themes/MythCenter-wide/status-ui.xml | 2
b/mythtv/themes/default-wide/config-ui.xml | 101
b/mythtv/themes/default/keyboard/da.xml | 270
b/mythtv/themes/default/keyboard/da_ui.xml | 382
mythtv/libs/libavutil/.gitignore | 1
mythtv/themes/default/keyboard/dk.xml | 270
mythtv/themes/default/keyboard/dk_ui.xml | 382
100 files changed, 7508 insertions(+), 5072 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 mythtv-0.24.1-fixes.patch
Index: mythtv-0.24.1-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/mythtv-0.24.1-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.24.1-fixes.patch 26 Oct 2011 15:29:14 -0000 1.3
+++ mythtv-0.24.1-fixes.patch 21 Nov 2011 23:19:05 -0000 1.4
@@ -1,3 +1,105 @@
+ mythtv/VERSION | 2 +-
+ mythtv/bindings/perl/MythTV.pm | 39 +-
+ mythtv/bindings/python/MythTV/database.py | 1 -
+ mythtv/bindings/python/MythTV/dataheap.py | 2 +-
+ mythtv/bindings/python/MythTV/system.py | 22 +-
+ mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 97 +-
+ .../python/MythTV/ttvdb/XSLT/tvdbVideo.xsl | 23 +-
+ mythtv/bindings/python/MythTV/ttvdb/tvdbXslt.py | 50 +-
+ mythtv/bindings/python/MythTV/utility.py | 10 +-
+ mythtv/configure | 5 +-
+ mythtv/contrib/imports/mirobridge/mirobridge.py | 545 ++-
+ .../mirobridge/mirobridge_interpreter_4_0_2.py | 788 ++++
+ mythtv/external/FFmpeg/libavcodec/Makefile | 1 -
+ mythtv/external/FFmpeg/libavcodec/aac.h | 36 +-
+ mythtv/external/FFmpeg/libavcodec/aacdec.c | 822 ++++-
+ mythtv/external/FFmpeg/libavcodec/aacdectab.h | 8 +
+ mythtv/external/FFmpeg/libavcodec/aacsbr.c | 38 +-
+ mythtv/external/FFmpeg/libavcodec/dvbsubdec.c | 11 +
+ mythtv/external/FFmpeg/libavcodec/ppc/asm.S | 6 +-
+ mythtv/i18n/mythfrontend_da.qm | Bin 518521 -> 517358 bytes
+ mythtv/i18n/mythfrontend_da.ts | 3445 +++++++++---------
+ mythtv/i18n/mythfrontend_en_gb.qm | Bin 80703 -> 81236 bytes
+ mythtv/i18n/mythfrontend_en_gb.ts | 3924 ++++++++++----------
+ mythtv/libs/libavutil/.gitignore | 1 -
+ mythtv/libs/libmyth/audiooutput.cpp | 14 +-
+ mythtv/libs/libmyth/audiooutputalsa.cpp | 28 +-
+ mythtv/libs/libmyth/audiooutputbase.cpp | 33 +-
+ mythtv/libs/libmyth/audiooutputbase.h | 9 +-
+ mythtv/libs/libmyth/audiooutputjack.cpp | 15 +-
+ mythtv/libs/libmyth/audiooutputsettings.cpp | 2 +
+ mythtv/libs/libmyth/libmyth.pro | 4 +-
+ mythtv/libs/libmyth/mythterminal.cpp | 5 +-
+ mythtv/libs/libmyth/netutils.cpp | 2 +-
+ mythtv/libs/libmyth/programtypes.cpp | 5 +-
+ mythtv/libs/libmythdvdnav/dvdread/dvd_udf.c | 10 +-
+ mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 7 +
+ mythtv/libs/libmythhdhomerun/hdhomerun_device.c | 5 +-
+ mythtv/libs/libmythmetadata/metadatacommon.cpp | 11 +-
+ mythtv/libs/libmythtv/DVDRingBuffer.cpp | 16 +-
+ mythtv/libs/libmythtv/DVDRingBuffer.h | 4 +-
+ mythtv/libs/libmythtv/DeviceReadBuffer.cpp | 21 +-
+ mythtv/libs/libmythtv/DeviceReadBuffer.h | 13 +
+ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp | 2 +-
+ mythtv/libs/libmythtv/RingBuffer.cpp | 63 +-
+ mythtv/libs/libmythtv/RingBuffer.h | 4 +
+ mythtv/libs/libmythtv/analogsignalmonitor.cpp | 2 +-
+ mythtv/libs/libmythtv/avformatdecoder.cpp | 6 +-
+ mythtv/libs/libmythtv/cardutil.cpp | 2 +-
+ mythtv/libs/libmythtv/cc708decoder.cpp | 2 +-
+ mythtv/libs/libmythtv/channelutil.cpp | 2 +-
+ mythtv/libs/libmythtv/decoderbase.cpp | 4 +-
+ mythtv/libs/libmythtv/eitfixup.cpp | 4 +
+ mythtv/libs/libmythtv/eitfixup.h | 1 +
+ mythtv/libs/libmythtv/firewiredevice.cpp | 4 +
+ mythtv/libs/libmythtv/jobqueue.cpp | 1 +
+ mythtv/libs/libmythtv/mythplayer.cpp | 41 +-
+ mythtv/libs/libmythtv/mythplayer.h | 4 +
+ mythtv/libs/libmythtv/osd.cpp | 12 +-
+ mythtv/libs/libmythtv/osd.h | 36 +-
+ mythtv/libs/libmythtv/recordinginfo.cpp | 4 +-
+ mythtv/libs/libmythtv/subtitlescreen.cpp | 12 +-
+ mythtv/libs/libmythtv/tv_rec.cpp | 15 +-
+ mythtv/libs/libmythtv/tvbrowsehelper.cpp | 18 +-
+ mythtv/libs/libmythtv/util-osd.cpp | 8 +-
+ mythtv/libs/libmythtv/v4lchannel.cpp | 2 +-
+ mythtv/libs/libmythtv/vbitext/vbi.c | 2 +-
+ mythtv/libs/libmythtv/videodev_myth.h | 360 ++
+ mythtv/libs/libmythtv/videosource.cpp | 4 +-
+ mythtv/libs/libmythtv/videosource.h | 2 +-
+ mythtv/libs/libmythui/mythrender_opengl.cpp | 1 +
+ mythtv/libs/libmythui/mythuihelper.cpp | 3 +
+ mythtv/libs/libmythui/mythuiimage.cpp | 10 +-
+ mythtv/libs/libmythui/mythuiwebbrowser.cpp | 12 +
+ mythtv/libs/libmythui/mythuiwebbrowser.h | 11 +
+ mythtv/programs/mythbackend/main_helpers.cpp | 6 +-
+ mythtv/programs/mythbackend/mainserver.cpp | 42 +-
+ mythtv/programs/mythbackend/mainserver.h | 7 +
+ mythtv/programs/mythbackend/scheduler.cpp | 19 +-
+ .../programs/mythcommflag/PrePostRollFlagger.cpp | 7 +-
+ mythtv/programs/mythfilldatabase/main.cpp | 32 +-
+ mythtv/programs/mythfrontend/guidegrid.cpp | 8 +-
+ mythtv/programs/mythfrontend/networkcontrol.cpp | 2 +-
+ mythtv/programs/mythfrontend/playbackbox.cpp | 27 +-
+ mythtv/programs/mythfrontend/playbackbox.h | 6 +-
+ mythtv/programs/mythfrontend/playbackboxhelper.cpp | 7 +
+ mythtv/programs/mythfrontend/progfind.cpp | 14 +-
+ mythtv/programs/mythfrontend/proglist.cpp | 6 +-
+ mythtv/programs/mythfrontend/themechooser.cpp | 4 +-
+ mythtv/programs/mythtranscode/main.cpp | 30 +-
+ mythtv/programs/mythtranscode/mpeg2fix.cpp | 4 +
+ mythtv/programs/mythtranscode/transcode.cpp | 67 +-
+ mythtv/programs/mythtranscode/transcode.h | 2 +-
+ mythtv/themes/MythCenter-wide/config-ui.xml | 145 +-
+ mythtv/themes/MythCenter-wide/schedule-ui.xml | 4 +-
+ mythtv/themes/MythCenter-wide/status-ui.xml | 2 +-
+ mythtv/themes/default-wide/config-ui.xml | 101 +
+ mythtv/themes/default/keyboard/da.xml | 270 ++
+ mythtv/themes/default/keyboard/da_ui.xml | 382 ++
+ mythtv/themes/default/keyboard/dk.xml | 270 --
+ mythtv/themes/default/keyboard/dk_ui.xml | 382 --
+ 100 files changed, 7508 insertions(+), 5072 deletions(-)
+
diff --git a/mythtv/VERSION b/mythtv/VERSION
index 5e1cbc9..91bc38f 100644
--- a/mythtv/VERSION
@@ -108,11 +210,146 @@
raise MythError("Program could not be found")
def open(self, type='r'):
+diff --git a/mythtv/bindings/python/MythTV/system.py
b/mythtv/bindings/python/MythTV/system.py
+index 332934d..348062f 100644
+--- a/mythtv/bindings/python/MythTV/system.py
++++ b/mythtv/bindings/python/MythTV/system.py
+@@ -147,16 +147,18 @@ class Metadata( DictData ):
+
+ def _process(self, xml):
+ for element in xml.getchildren():
+- if element.tag in self:
+- if (element.text == '') or (element.text is None):
+- self[element.tag] = None
+- else:
+- self[element.tag] = \
+- self._trans[self._global_type[element.tag]]\
+- (element.text)
+- if element.tag in self._groups:
+- self.__dict__[element.tag] = \
+- eval('self.%s(element)' % element.tag.capitalize())
++ try:
++ if element.tag in self:
++ if (element.text == '') or (element.text is None):
++ self[element.tag] = None
++ else:
++ self[element.tag] = \
++ self._trans[self._global_type[element.tag]]\
++ (element.text)
++ if element.tag in self._groups:
++ self.__dict__[element.tag] = \
++ eval('self.%s(element)' % element.tag.capitalize())
++ except: pass
+
+ class VideoMetadata( Metadata ):
+ _field_order =
['title','subtitle','tagline','description','season',
diff --git a/mythtv/bindings/python/MythTV/tmdb/tmdb_api.py
b/mythtv/bindings/python/MythTV/tmdb/tmdb_api.py
-index 4e00848..c1dd52f 100644
+index 4e00848..5197c48 100644
--- a/mythtv/bindings/python/MythTV/tmdb/tmdb_api.py
+++ b/mythtv/bindings/python/MythTV/tmdb/tmdb_api.py
-@@ -591,7 +591,18 @@ class MovieDb(object):
+@@ -19,7 +19,7 @@ metadata and image URLs from TMDB. These routines are based on the v2.1
TMDB api
+ for this api are published at
http://api.themoviedb.org/2.1/
+ '''
+
+-__version__="v0.2.5"
++__version__="v0.2.6"
+ # 0.1.0 Initial development
+ # 0.1.1 Alpha Release
+ # 0.1.2 Added removal of any line-feeds from data
+@@ -41,6 +41,8 @@ __version__="v0.2.5"
+ # 0.2.4 Added width and height attributes to images
+ # 0.2.5 Added a replace text XPatch extention so that "person" full size
images can be created from
+ # the thumbnail.
++# 0.2.6 Fixed processing publish date when it is a 'UTC' date
++# Code line length clean up
+
+ import os, struct, sys, time
+ import urllib, urllib2
+@@ -348,23 +350,38 @@ class MovieDb(object):
+ self.config[u'urls'] = {}
+
+ # v2.1 api calls
+- self.config[u'urls'][u'movie.search'] =
u'%(base_url)s/Movie.search/%(language)s/xml/%(apikey)s/%%s' % (self.config)
+- self.config[u'urls'][u'tmdbid.search'] =
u'%(base_url)s/Movie.getInfo/%(language)s/xml/%(apikey)s/%%s' % (self.config)
+- self.config[u'urls'][u'imdb.search'] =
u'%(base_url)s/Movie.imdbLookup/%(language)s/xml/%(apikey)s/tt%%s' %
(self.config)
+- self.config[u'urls'][u'image.search'] =
u'%(base_url)s/Movie.getImages/%(language)s/xml/%(apikey)s/%%s' % (self.config)
+- self.config[u'urls'][u'person.search'] =
u'%(base_url)s/Person.search/%(language)s/xml/%(apikey)s/%%s' % (self.config)
+- self.config[u'urls'][u'person.info'] =
u'%(base_url)s/Person.getInfo/%(language)s/xml/%(apikey)s/%%s' % (self.config)
+- self.config[u'urls'][u'hash.info'] =
u'%(base_url)s/Hash.getInfo/%(language)s/xml/%(apikey)s/%%s' % (self.config)
++ self.config[u'urls'][u'movie.search'] = \
++ u'%(base_url)s/Movie.search/%(language)s/xml/%(apikey)s/%%s' %
(self.config)
++ self.config[u'urls'][u'tmdbid.search'] = \
++ u'%(base_url)s/Movie.getInfo/%(language)s/xml/%(apikey)s/%%s' %
(self.config)
++ self.config[u'urls'][u'imdb.search'] = \
++ u'%(base_url)s/Movie.imdbLookup/%(language)s/xml/%(apikey)s/tt%%s' %
(self.config)
++ self.config[u'urls'][u'image.search'] = \
++ u'%(base_url)s/Movie.getImages/%(language)s/xml/%(apikey)s/%%s' %
(self.config)
++ self.config[u'urls'][u'person.search'] = \
++ u'%(base_url)s/Person.search/%(language)s/xml/%(apikey)s/%%s' %
(self.config)
++ self.config[u'urls'][u'person.info'] = \
++ u'%(base_url)s/Person.getInfo/%(language)s/xml/%(apikey)s/%%s' %
(self.config)
++ self.config[u'urls'][u'hash.info'] = \
++ u'%(base_url)s/Hash.getInfo/%(language)s/xml/%(apikey)s/%%s' %
(self.config)
[...3240 lines suppressed...]
+- <move left="key_å" right="key_q"
up="key_back" down="key_done"></move>
+- <image function="normal"
filename="keyboard/key_normal_del.png"></image>
+- <image function="focused"
filename="keyboard/key_focused_del.png"></image>
+- <image function="down"
filename="keyboard/key_down_del.png"></image>
+- <image function="downfocused"
filename="keyboard/key_downfocused_del.png"></image>
+- </key>
+-
+- <!-- row 3 -->
+- <key name="key_a" type="char"
draworder="1">
+- <position>28,79</position>
+- <char normal="a" shift="A" alt=""
altshift=""></char>
+- <move left="key_done" right="key_s"
up="key_q" down="key_z"></move>
+- </key>
+- <key name="key_s" type="char"
draworder="1">
+- <position>65,79</position>
+- <char normal="s" shift="S" alt=""
altshift=""></char>
+- <move left="key_a" right="key_d" up="key_w"
down="key_x"></move>
+- </key>
+- <key name="key_d" type="char"
draworder="1">
+- <position>102,79</position>
+- <char normal="d" shift="D" alt=""
altshift=""></char>
+- <move left="key_s" right="key_f" up="key_e"
down="key_c"></move>
+- </key>
+- <key name="key_f" type="char"
draworder="1">
+- <position>139,79</position>
+- <char normal="f" shift="F" alt=""
altshift=""></char>
+- <move left="key_d" right="key_g" up="key_r"
down="key_v"></move>
+- </key>
+- <key name="key_g" type="char"
draworder="1">
+- <position>176,79</position>
+- <char normal="g" shift="G" alt=""
altshift=""></char>
+- <move left="key_f" right="key_h" up="key_t"
down="key_b"></move>
+- </key>
+- <key name="key_h" type="char"
draworder="1">
+- <position>213,79</position>
+- <char normal="h" shift="H" alt=""
altshift=""></char>
+- <move left="key_g" right="key_j" up="key_y"
down="key_n"></move>
+- </key>
+- <key name="key_j" type="char"
draworder="1">
+- <position>250,79</position>
+- <char normal="j" shift="J" alt=""
altshift=""></char>
+- <move left="key_h" right="key_k" up="key_u"
down="key_m"></move>
+- </key>
+- <key name="key_k" type="char"
draworder="1">
+- <position>287,79</position>
+- <char normal="k" shift="K" alt="ß"
altshift=""></char>
+- <move left="key_j" right="key_l" up="key_i"
down="key_,"></move>
+- </key>
+- <key name="key_l" type="char"
draworder="1">
+- <position>324,79</position>
+- <char normal="l" shift="L" alt="œ"
altshift=""></char>
+- <move left="key_k" right="key_æ" up="key_o"
down="key_."></move>
+- </key>
+- <key name="key_æ" type="char"
draworder="1">
+- <position>361,79</position>
+- <char normal="æ" shift="Æ" alt=""
altshift=""></char>
+- <move left="key_l" right="key_ø" up="key_p"
down="key_-"></move>
+- </key>
+- <key name="key_ø" type="char"
draworder="1">
+- <position>398,79</position>
+- <char normal="ø" shift="Ø" alt=""
altshift=""></char>
+- <move left="key_æ" right="key_done"
up="key_å" down="key_-"></move>
+- </key>
+- <key name="key_done" type="done"
draworder="1">
+- <fcnfont name="normal"
function="focused"></fcnfont>
+- <position>435,79</position>
+- <char normal="Enter" shift="Enter"
alt="Enter" altshift="Enter"></char>
+- <move left="key_ø" right="key_a" up="key_del"
down="key_alt"></move>
+- <image function="normal"
filename="keyboard/key_normal_done.png"></image>
+- <image function="focused"
filename="keyboard/key_focused_done.png"></image>
+- <image function="down"
filename="keyboard/key_down_done.png"></image>
+- <image function="downfocused"
filename="keyboard/key_downfocused_done.png"></image>
+- </key>
+-
+- <!-- row 4 -->
+- <key name="key_z" type="char"
draworder="1">
+- <position>42,116</position>
+- <char normal="z" shift="Z" alt="0x003c"
altshift=""></char>
+- <move left="key_-" right="key_x" up="key_a"
down="key_shift"></move>
+- </key>
+- <key name="key_x" type="char"
draworder="1">
+- <position>79,116</position>
+- <char normal="x" shift="X" alt="0x003e"
altshift=""></char>
+- <move left="key_z" right="key_c" up="key_s"
down="key_lock"></move>
+- </key>
+- <key name="key_c" type="char"
draworder="1">
+- <position>116,116</position>
+- <char normal="c" shift="C" alt="|"
altshift=""></char>
+- <move left="key_x" right="key_v" up="key_d"
down="key_lock"></move>
+- </key>
+- <key name="key_v" type="char"
draworder="1">
+- <position>153,116</position>
+- <char normal="v" shift="V" alt=""
altshift=""></char>
+- <move left="key_c" right="key_b" up="key_f"
down="key_lock"></move>
+- </key>
+- <key name="key_b" type="char"
draworder="1">
+- <position>190,116</position>
+- <char normal="b" shift="B" alt=""
altshift=""></char>
+- <move left="key_v" right="key_n" up="key_g"
down="key_space"></move>
+- </key>
+- <key name="key_n" type="char"
draworder="1">
+- <position>227,116</position>
+- <char normal="n" shift="N" alt=""
altshift=""></char>
+- <move left="key_b" right="key_m" up="key_h"
down="key_space"></move>
+- </key>
+- <key name="key_m" type="char"
draworder="1">
+- <position>264,116</position>
+- <char normal="m" shift="M" alt=""
altshift=""></char>
+- <move left="key_n" right="key_," up="key_j"
down="key_space"></move>
+- </key>
+- <key name="key_," type="char"
draworder="1">
+- <position>301,116</position>
+- <char normal="," shift=";" alt=""
altshift=""></char>
+- <move left="key_m" right="key_." up="key_k"
down="key_space"></move>
+- </key>
+- <key name="key_." type="char"
draworder="1">
+- <position>338,116</position>
+- <char normal="." shift=":" alt=""
altshift=""></char>
+- <move left="key_," right="key_-" up="key_l"
down="key_left"></move>
+- </key>
+- <key name="key_-" type="char"
draworder="1">
+- <position>375,116</position>
+- <char normal="-" shift="_" alt=""
altshift=""></char>
+- <move left="key_." right="key_z" up="key_ø"
down="key_right"></move>
+- </key>
+-
+- <!-- row 5 -->
+- <key name="key_shift" type="shift"
draworder="1">
+- <fcnfont name="normal"
function="focused"></fcnfont>
+- <position>5,153</position>
+- <char normal="Shift" shift="Shift"
alt="Shift" altshift="Shift"></char>
+- <move left="key_alt" right="key_lock"
up="key_z" down="key_1"></move>
+- <image function="normal"
filename="keyboard/key_normal_shift.png"></image>
+- <image function="focused"
filename="keyboard/key_focused_shift.png"></image>
+- <image function="down"
filename="keyboard/key_down_shift.png"></image>
+- <image function="downfocused"
filename="keyboard/key_downfocused_shift.png"></image>
+- </key>
+- <key name="key_lock" type="lock"
draworder="1">
+- <fcnfont name="normal"
function="focused"></fcnfont>
+- <position>85,153</position>
+- <char normal="Lås" shift="Lås" alt="Lås"
altshift="Lås"></char>
+- <move left="key_shift" right="key_space"
up="key_c" down="key_3"></move>
+- <image function="normal"
filename="keyboard/key_normal_shift.png"></image>
+- <image function="focused"
filename="keyboard/key_focused_shift.png"></image>
+- <image function="down"
filename="keyboard/key_down_shift.png"></image>
+- <image function="downfocused"
filename="keyboard/key_downfocused_shift.png"></image>
+- </key>
+- <key name="key_space" type="char"
draworder="1">
+- <position>205,153</position>
+- <char normal=" " shift=" " alt=" "
altshift=" "></char>
+- <move left="key_lock" right="key_left"
up="key_n" down="key_6"></move>
+- <image function="normal"
filename="keyboard/key_normal_space.png"></image>
+- <image function="focused"
filename="keyboard/key_focused_space.png"></image>
+- <image function="down"
filename="keyboard/key_down_space.png"></image>
+- <image function="downfocused"
filename="keyboard/key_downfocused_space.png"></image>
+- </key>
+- <key name="key_left" type="moveleft"
draworder="1">
+- <fcnfont name="larger"
function="normal"></fcnfont>
+- <fcnfont name="larger"
function="focused"></fcnfont>
+- <fcnfont name="larger"
function="down"></fcnfont>
+- <fcnfont name="larger"
function="downfocused"></fcnfont>
+- <position>350,153</position>
+- <char normal="←" shift="←" alt="←"
altshift="←"></char>
+- <move left="key_space" right="key_right"
up="key_." down="key_9"></move>
+- <image function="normal"
filename="keyboard/key_normal_move.png"></image>
+- <image function="focused"
filename="keyboard/key_focused_move.png"></image>
+- <image function="down"
filename="keyboard/key_down_move.png"></image>
+- <image function="downfocused"
filename="keyboard/key_downfocused_move.png"></image>
+- </key>
+- <key name="key_right" type="moveright"
draworder="1">
+- <fcnfont name="larger"
function="normal"></fcnfont>
+- <fcnfont name="larger"
function="focused"></fcnfont>
+- <fcnfont name="larger"
function="down"></fcnfont>
+- <fcnfont name="larger"
function="downfocused"></fcnfont>
+- <position>405,153</position>
+- <char normal="→" shift="→" alt="→"
altshift="→"></char>
+- <move left="key_left" right="key_alt"
up="key_-" down="key_0"></move>
+- <image function="normal"
filename="keyboard/key_normal_move.png"></image>
+- <image function="focused"
filename="keyboard/key_focused_move.png"></image>
+- <image function="down"
filename="keyboard/key_down_move.png"></image>
+- <image function="downfocused"
filename="keyboard/key_downfocused_move.png"></image>
+- </key>
+- <key name="key_alt" type="alt"
draworder="1">
+- <fcnfont name="normal"
function="focused"></fcnfont>
+- <position>460,153</position>
+- <char normal="Alt" shift="Alt" alt="Alt"
altshift="Alt"></char>
+- <move left="key_right" right="key_shift"
up="key_done" down="key_back"></move>
+- <image function="normal"
filename="keyboard/key_normal_back.png"></image>
+- <image function="focused"
filename="keyboard/key_focused_back.png"></image>
+- <image function="down"
filename="keyboard/key_down_back.png"></image>
+- <image function="downfocused"
filename="keyboard/key_downfocused_back.png"></image>
+- </key>
+-
+- </keyboard>
+-
+- </container>
+-
+- </window>
+-
+-</mythuitheme>
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/mythtv.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mythtv.spec 26 Oct 2011 15:29:14 -0000 1.81
+++ mythtv.spec 21 Nov 2011 23:19:06 -0000 1.82
@@ -83,7 +83,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 3%{?dist}
+Release: 5%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1209,7 +1209,7 @@
# Add the "mythtv" user, with membership in the audio and video group
getent group mythtv >/dev/null || groupadd -r mythtv
getent passwd mythtv >/dev/null || \
- useradd -r -g mythtv -d d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
+ useradd -r -g mythtv -d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
-c "mythbackend user" mythtv
exit 0
# Make sure the mythtv user is in the audio and video group for existing
@@ -1535,6 +1535,17 @@
################################################################################
%changelog
+* Mon Nov 21 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.1-5
+- Fix typo in spec file causing mythtv user to not be created (#2051).
+- Change mythbackend systemd type to "simple" and other fixes (#2016).
+- Update to latest 0.24.1-fixes, git revision f5fd11fa54.
+
+* Fri Oct 28 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.24.1-4
+- Fix for glibc bug rhbz#747377
+! Reminder:
+- Changes default user for mythbackend from root to mythtv on
+ Fedora 16+. See
http://rpmfusion.org/Package/mythtv for additonal information.
+
* Sun Oct 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.1-3
- Update to latest 0.24.1-fixes, git revision e89d6a9f7e.
- Fixes BZ#1993, FTBFS on Fedora 16.
--- mythtv-0.24.1-glu_h_gluErrorString.patch DELETED ---
--- mythweb-0.24.1-fixes.patch DELETED ---