rpms/mythtv/F-17 mythtv-0.26-fixes.patch, NONE, 1.1 ChangeLog, 1.3, 1.4 mythtv.spec, 1.99, 1.100 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

Richard Shaw hobbes1069 at rpmfusion.org
Mon Oct 29 18:47:41 CET 2012


Author: hobbes1069

Update of /cvs/free/rpms/mythtv/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25064

Modified Files:
	ChangeLog mythtv.spec sources 
Added Files:
	mythtv-0.26-fixes.patch 
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 at 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


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()


Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	25 Aug 2012 19:59:17 -0000	1.3
+++ ChangeLog	29 Oct 2012 17:47:41 -0000	1.4
@@ -1,129 +1,275 @@
-commit 46cab93562429cd19029402a2387f63a72aeb898
-Author: Raymond Wagner <rwagner at mythtv.org>
-Date:   Tue Jul 31 14:21:22 2012 -0400
+commit e3087dda66175a6b7308ad5a5e80a35ff7d72fd3
+Author: Jonatan Lindblad <jlindblad at mythtv.org>
+Date:   Sun Oct 28 21:59:38 2012 +0100
 
-    Correct --printexpire option in mythbackend.
+    Internet Content: Remove deprecated YouTube categories
     
-    This corrects logic that was accidentally inverted in 8bc8dd54, and
-    allows `mythbackend --printexpire` to be used again.
-    (cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)
+    Fixes #11193
+    (cherry picked from commit 7c903d2a90d7962fa6e1ee856d506539ce17c1c8)
+
+commit 0de21aa876e3117ff98499c5a502affc52b5277e
+Author: Raymond Wagner <rwagner at 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 8ab229a8bed860fb0855797c683655a7465e2ee4
-Merge: a4cdc9e 1c496c8
+commit 5e0099555dac1c16f7a76f46996675fa99c7a6b7
 Author: Raymond Wagner <rwagner at mythtv.org>
-Date:   Tue Jul 31 14:22:32 2012 -0400
+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 744a595db2273affca4030f4e8879860d72d4683
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date:   Tue Oct 23 15:51:05 2012 -0400
+
+    Use 'unicode' rather than 'str' for UTF8 compatibility.
+    (cherry picked from commit 0bc83db48ec08b8df576c6ecbf1049567d34ab7a)
 
-    Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+commit 35389d8f177c94a7b6381b5a63cfcb997d22dc66
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date:   Tue Oct 23 15:42:31 2012 -0400
 
-commit 1c496c81662eabda444452071eb18f2fd375d4d0
-Author: Kyle <klillis at gmail.com>
-Date:   Mon Jul 30 13:34:11 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 163e0e629095401268cf67309d16987ded6a0d72
+Author: Bill <billstuff2001 at sbcglobal.net>
+Date:   Fri Oct 12 13:47:27 2012 -0400
 
-    Fixes #10897. Clear paused when we unpause FirewireRecorder.
+    Fixes #11061. Speed up TFW recovery after falling behind on writes.
     
     Signed-off-by: Daniel Thor Kristjansson <danielk at cuymedia.net>
 
-commit 9c199a42258f2a19dd1c8d3b934e6eb04f1757ce
-Author: Daniel Thor Kristjansson <dkristjansson at mythtv.org>
-Date:   Tue Jul 24 12:13:16 2012 -0400
+commit 143e2de7da6c88d8c9f736e700df2e71130f0882
+Author: Jonatan Lindblad <jlindblad at mythtv.org>
+Date:   Sun Oct 21 17:30:38 2012 +0200
+
+    MythUI: Fix double rendering of fading screens
+    (cherry picked from commit da065e42b2cfa3ea875df1b5c36ce34422f379a0)
+
+commit 2870590667b4b3b3e13b171c5e81a805d30512ce
+Author: Jonatan Lindblad <jlindblad at mythtv.org>
+Date:   Sun Oct 21 13:29:12 2012 +0200
 
-    Fixes #10870. Fix Start/Stop race condition in StreamHandler.
+    MythUI: Fix potential use after free when leaving a web page
     
-    This is a backport of [445faaa47].
+    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 a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
-Author: Stuart Morgan <smorgan at mythtv.org>
-Date:   Sun Jul 29 12:42:41 2012 +0100
+commit 8b7f6ce5cb97702718d69bea8e582f5dc26746c9
+Author: Jean-Yves Avenard <jyavenard at mythtv.org>
+Date:   Fri Oct 19 20:47:32 2012 +1100
+
+    Fix OS X compilation
+    
+    Signal SIGRTMIN doesn't exist under OS X so make all this code conditional.
+    
+    [cherry-picked from 9f65a657827790687b8ac24daf7a4c581e7535a3]
 
-    Restore setup pincode following [57adc5d120] - 'Flatten the Setup Menus in the default menu theme' which dropped util_menu.xml but failed to carry over the <password> markup.
-    (cherry picked from commit 134417fe3bf7170f3419d2388a6c26afe16c4927)
+commit fdfd45035d322bba1c537546dcf0c392dc1b35d5
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date:   Fri Oct 19 12:12:51 2012 -0400
 
-commit 3256849b14cc882536a153e7fbe4724adf03260c
-Author: Jim Stichnoth <jstichnoth at mythtv.org>
-Date:   Tue Jul 24 10:56:15 2012 -0700
+    Add -a parameter to tmdb3.py.
+    (cherry picked from commit 150e57259794084ae6d819ff72cb9977b7cf20bf)
 
-    Subtitles: backport some code to enable cc608 TT deprecation log message.
+commit bfc3dfc12d67104f37adafc9d5ad148a13db83c1
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date:   Fri Oct 19 02:40:57 2012 -0400
 
-commit 39fad46248bbcbe5ab27068e73fb7c5a91bc155b
-Author: Jim Stichnoth <jstichnoth at mythtv.org>
-Date:   Tue Jul 24 08:23:53 2012 -0700
+    Add -t parameter to tmdb3.py.
+    (cherry picked from commit 144c4f5142ad783b5fce7814716816576ee232a7)
+
+commit 474107b04853831df6e7a0a3ca869a64097602bb
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date:   Thu Oct 18 15:20:35 2012 -0400
 
-    Subtitles: Put a "DEPRECATED_608_TELETEXT" message into the logs.
+    Fix setting of values to Artwork property.
     
-    Support for CEA-608 teletext captions is to be removed.  Allow users
-    to check whether they would be affected.  Refs #10786.
-    (cherry picked from commit 7b1aef85ec92658acb91c1ff019aed909e5df30a)
+    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 9e0d839be7667056dc65b79711dda84159a1b13d
-Author: Stuart Morgan <smorgan at mythtv.org>
-Date:   Tue Jul 24 14:11:47 2012 +0100
+commit bff8eb1a1893335f6b96eb6eb8ebd1d567feb9cb
+Author: Antonio Marcos Lopez Alonso <amlopezalonso at gmail.com>
+Date:   Tue Oct 16 06:50:16 2012 -0400
+
+    Updated Spanish/Spain MythFrontend, MythArchive and MythWeather
+    translation from Antonio Marcos Lopez Alonso.
+    
+    Backport of af9d36763 to 0.26-fixes
+    
+    Thank you Antonio!
+    
+    Closes #11179
+    
+    Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
 
-    Set m_cdWatcher to NULL after deletion, fixes segfault on exiting frontend. Fixes #10936
-    (cherry picked from commit de851dd273eaa80689a427f915c7db40d015e0ba)
+commit fd6e25bfe3074507a5f27133dddf34ccd7dbb988
+Author: Nicolas Riendeau <nriendeau at mythtv.org>
+Date:   Mon Oct 15 19:31:32 2012 -0400
 
-commit 10a68895e1fcd5c409058d2eb61fe59e78736235
-Author: Stuart Morgan <smorgan at mythtv.org>
-Date:   Sun Jul 22 23:24:40 2012 +0100
+    Updated Polish Mythfrontend and MythWeather translation
+    from Warpme
+    
+    Thank you Warpme and porbas!
+    
+    Refs #11178
+
+commit 280e7efd82fe2daccee8d5fa542e4610af36124a
+Author: Jim Stichnoth <jstichnoth at mythtv.org>
+Date:   Sat Oct 13 16:30:23 2012 -0700
 
-    Fix segfault after music scan completes.
-    (cherry picked from commit b2379ae9b8d42c23c3feee26b52a1f0a2ebef394)
+    Fixes #11151 by correcting a float-to-integer truncation problem.
+    (cherry picked from commit 4a09ca11c47137a88355a961efd5131c2157d4d7)
 
-commit ed58b3a818a1796340ba0f085a53159eb1d52266
-Author: Stuart Morgan <smorgan at mythtv.org>
-Date:   Sat Jul 21 23:53:41 2012 +0100
+commit aae34c428d30413b6f62aa2279a9189e399ed430
+Author: Morris Cavestro <morriscavestro at yahoo.it>
+Date:   Mon Oct 8 13:51:39 2012 -0400
 
-    Fix for Synaesthesia memory corruption
+    Updated Italian MythMusic translation
+    from Morris Cavestro
     
-    We were allocating just half the required space and consequently
-    writing beyond the end of the array. This consistently caused
-    segfaults for me when using the Synaesthesia visualiser.
+    (Backport to 0.26-fixes)
     
-    This fix appears to be consistent with the code used in other projects
-    which were also derived from the original Synaesthia project.
+    Thank you Morris!
     
-    e.g. GStreamer/Source/gst-plugins-ugly/gst/synaesthesia/synaescope.c
-    (cherry picked from commit e331017f2d1ee9be82da9c0b64ca4435ec3efd1e)
+    Closes #11167
+    
+    Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
 
-commit a4cdc9e01295991056cdc8c5411e70937b1a4842
-Merge: 450ed91 f0e2ad8
+commit 90ba02c17dd993792f29fb4ac5d2d71fce9670b3
+Merge: ff922bb 624ad5a
 Author: Raymond Wagner <rwagner at mythtv.org>
-Date:   Fri Jul 20 21:06:48 2012 -0400
+Date:   Wed Oct 10 11:01:53 2012 -0400
 
-    Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+    Merge branch 'fixes/0.26' of code.mythtv.org:mythtv into fixes/0.26
 
-commit f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
-Author: Jean-Yves Avenard <jyavenard at mythtv.org>
-Date:   Wed Jul 18 20:49:11 2012 +1000
+commit ff922bb074b425d086324b7d89db348f90d623dd
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date:   Wed Oct 10 10:52:24 2012 -0400
 
-    Make AllowLinkLocal default to true
+    Add reporting of logging volume to Smolt.
     
-    Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>
+    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 4b82e27e6c89bac9d60c3a56f1d924979c80c746
-Author: Raymond Wagner <rwagner at mythtv.org>
-Date:   Wed Jul 18 01:50:46 2012 -0400
+commit 624ad5a3533ba34033debb37f0058da0670cf4e1
+Author: Jesse Crews <jcrews at gridlox.net>
+Date:   Tue Oct 9 10:59:27 2012 +0100
+
+    Fix mythbackend not exiting after network initialization failure. Fixes #11163
+    
+    Signed-off-by: Stuart Morgan <smorgan at mythtv.org>
+
+commit 2d2932ac11ed6d01f05f502a8e373455774ba46a
+Author: Lawrence Rust <lvr at softsystem.co.uk>
+Date:   Sun May 6 12:33:35 2012 +0200
+
+    libmythui: Fix a redraw bug in MythUIType
+    
+    While evaluating the ATI Catalyst 'TearFree Desktop' option I noticed
+    that sometimes a keypress was apparently being held up until the time
+    on the main menu was updated.  Initially I thought that this was a lirc
+    or fglrx issue, but on investigation it turned out that MythMainWindow::animate
+    was requesting updates for empty repaint regions.  Delving further
+    showed that MythUIType::Draw was resetting m_DirtyRegion to empty
+    even if the clipRect was smaller, thus leaving unpainted regions.
+    
+    m_DirtyRegion may be extended by HandleMovementPulse, SetRedraw
+    or SetChildNeedsRedraw etc AFTER GetDirtyArea is called.
+    So when MythUIType::Draw is called, clipRect may not include the whole
+    of m_DirtyRegion.
+    
+    This patch subtracts the Draw clipRect from m_DirtyRegion instead of
+    simply emtying it.
+    
+    Fixes #10695
+    
+    Signed-off-by: Lawrence Rust <lvr at softsystem.co.uk>
+    Signed-off-by: Stuart Morgan <smorgan at mythtv.org>
+    (cherry picked from commit 39984eb579369f6cb25cd8f57acb8b23ebcccfc6)
+
+commit 52c48f983ca3175be983bdaa8c0072b736315d3c
+Author: Xavier Hervy <xavier.hervy at gmail.com>
+Date:   Sun Oct 7 19:19:54 2012 +0100
 
-    Correct bad copy/paste in ServerPool.
+    Allow adding a channel to an empty channel group from the guide. Update the cached channel group list after adding or removing a channel. Fixes #10411
     
-    Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>
+    Signed-off-by: Stuart Morgan <smorgan at mythtv.org>
+    (cherry picked from commit 9d5aabc1ed42156bf23a9d0afac0b31fdaedc5e1)
 
-commit e4ba7d74aee6bd437e747772046a8836fa9ae5cb
+commit 4c67cedbea9e4b18d7688f30af02bd46e65cd07d
 Author: Raymond Wagner <rwagner at mythtv.org>
-Date:   Sat Jul 14 01:57:46 2012 -0400
+Date:   Sat Oct 6 13:42:21 2012 -0400
 
-    Rework IP selection so link-local is always used.
+    Read in dbPingHost value from config.xml.
     
-    This adds an option to mythtv-setup that makes link-local addresses
-    listened to by default.  This behavior can still be disabled, to block
-    off network access.
+    Fixes #11148
+    (cherry picked from commit 65a720c9b830ab77bbd2931e03fb428e05dee6f9)
+
+commit ad5bb8b0929d546ac91324ccee5e7f7f2a49742e
+Author: Stuart Morgan <smorgan at mythtv.org>
+Date:   Sat Oct 6 12:40:36 2012 +0100
+
+    Only set the BackendServerIP6 setting to ::1 by default if that address is available, otherwise leave it blank
+
+commit 6b541e74da22ff4daa28dd13425bcc9ffe2c7303
+Author: Stuart Morgan <smorgan at mythtv.org>
+Date:   Sat Oct 6 11:36:59 2012 +0100
+
+    Log an error if we are unable to find IPv4 or IPv6 addresses, only
+    exit if we are unable to find any address to bind to
+
+commit dd0521ec029f5e5413592e93b3beff946fb5499f
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date:   Sat Oct 6 04:28:48 2012 -0400
+
+    Fix single episode grabber for season 0 specials.
     
-    Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>
+    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 450ed915d3a13b84489ecdebdad6fca18fc8c312
-Author: GDragon <gdragon at jetcom.org>
-Date:   Mon Jul 9 15:33:31 2012 -0400
+commit c744347675573dfc690cb263353b3ccc4a950a1a
+Author: R.D. Vaughan <r.d.vaughan at rogers.com>
+Date:   Tue Oct 2 13:29:55 2012 -0400
 
-    Properly set job type in fromProgram and fromRecorded methods.
+    Adjust to datetime issues with MythTV v0.26's move to UTC datetimes in DB
     
     Signed-off-by: Raymond Wagner <rwagner at mythtv.org>
-    (cherry picked from commit 868a566c1d635be3e60f83438f87b6f21d9f1780)
+    (cherry picked from commit fcf6da5608cc5621a7bee48120d988352f34189f)
+
+commit a49c750cfc1a2d3f0b8a46f98e75a0e79b3a79fc
+Author: Gavin Hurlbut <ghurlbut at mythtv.org>
+Date:   Tue Oct 2 13:53:03 2012 -0700
+
+    Force a commit to fixes/0.26 to test the tagging
+
+commit b4deb185994d6388b55cea18aa3e861c71541101
+Author: Stuart Morgan <smorgan at mythtv.org>
+Date:   Tue Oct 2 12:05:20 2012 +0100
+
+    Prevent a segfault in MythUIImage, this doesn't fix the root cause of the problem but at least we won't crash. Refs #11047


Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythtv.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mythtv.spec	25 Aug 2012 19:59:17 -0000	1.99
+++ mythtv.spec	29 Oct 2012 17:47:41 -0000	1.100
@@ -1,4 +1,3 @@
-#
 # Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
 #
 # by:   Chris Petersen <rpm at forevermore.net>
@@ -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-28-ge3087dd
+%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.1.git.%{_gitrev}%{?dist}
-#Release: 0.1.rc1%{?dist}
 %else
-Release:        2%{?dist}
+Release:        1%{?dist}
 %endif
 
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -131,15 +129,10 @@
 
 ################################################################################
 
-# https://github.com/MythTV/mythtv/tarball/v0.25
+# https://github.com/MythTV/mythtv/tarball/v0.26
 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,15 @@
 
 
 %changelog
+* Sun Oct 28 2012 Richard Shaw <hobbes1069 at 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 at gmail.com> - 0.25.2-3
+- Rebuilt for x264 ABI 125
+
 * Sat Aug 25 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.2-2
 - Update to latest fixes/0.25.
 - Fix mythbackend looking in the wrong directory for config.xml (BZ#2450).


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	30 Jul 2012 18:22:57 -0000	1.55
+++ sources	29 Oct 2012 17:47:41 -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 ---


More information about the rpmfusion-commits mailing list