rpms/mythtv/F-11 mythplugins-0.21-svnfixes.patch, 1.6, 1.7 mythtv-0.21-svnfixes.patch, 1.7, 1.8 mythtv.spec, 1.36, 1.37 sources, 1.18, 1.19 mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch, 1.1, NONE

Sun Jun 14 02:10:28 CEST 2009

Author: jarod

Update of /cvs/free/rpms/mythtv/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6069

Modified Files:
	mythtv.spec sources 
Added Files:
	mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch 
Removed Files:
	mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch 
Log Message:
* Sat Jun 13 2009 Jarod Wilson <jarod at wilsonet.com> - 0.21-20
- Update to release-0-21-fixes patches (r20697)
- Add missing BR: pulseaudio-libs-devel so we work when pulse
  is running (rfbz#651)
- Fix compatability with forthcoming lcdproc 0.5.3 release


mythplugins-0.21-svnfixes.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 mythplugins-0.21-svnfixes.patch
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: mythplugins-0.21-svnfixes.patch
diff -N mythplugins-0.21-svnfixes.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mythplugins-0.21-svnfixes.patch	14 Jun 2009 00:10:27 -0000	1.7
@@ -0,0 +1,15872 @@
+Index: mythplugins/mythweb/INSTALL
+===================================================================
+--- mythplugins/mythweb/INSTALL	(revision 16468)
++++ mythplugins/mythweb/INSTALL	(working copy)
+@@ -2,7 +2,7 @@
+ requirements and instructions for MythWeb.  Please see README for other
+ information.
+ 
+-February 16, 2008
++October 26, 2008
+ 
+ ========
+ Contents
+@@ -18,6 +18,7 @@
+ 5.0     Apache
+ 5.1         Apache Config
+ 6.0     Lighttpd
++7.0     PHP
+ 
+ =======
+ Summary
+@@ -195,6 +196,10 @@
+     mod_deflate
+     mod_headers
+ 
++In Suse 10.3 and above, you'll need to add "rewrite" in the file
++/etc/sysconfig/apache2 on the "APACHE_MODULES" line if it's not already
++there.
++
+ =================
+ 5.1 Apache Config
+ =================
+@@ -245,3 +250,25 @@
+ 
+ Sorry, no documentation here yet...
+ 
++=======
++7.0 PHP
++=======
++
++PHP tries to determine the system's local timezone settings automatically
++but may not be successful on every distribution. To ensure that PHP uses
++the correct timezone, edit php.ini and configure the date.timezone variable
++to your local timezone.
++
++For example, to set the PHP timezone to Europe/London:
++
++  vim /etc/php.ini
++
++add/uncomment the date.timezone variable:
++
++  date.timezone = Europe/London
++
++and then restart Apache (exact commands depend on distribution):
++
++  /etc/init.d/apache2 stop
++  /etc/init.d/apache2 start
++
+
+Property changes on: mythplugins/mythweb/INSTALL
+___________________________________________________________________
+Modified: svn:keywords
+   - Date Revision Author HeadURL
+   + Id Date Revision Author HeadURL
+
+Index: mythplugins/mythweb/modules/music/stream.php
+===================================================================
+--- mythplugins/mythweb/modules/music/stream.php	(revision 16468)
++++ mythplugins/mythweb/modules/music/stream.php	(working copy)
+@@ -76,8 +76,11 @@
+             $mime = 'audio/mpeg';
+             break;
+         case 'ogg':
+-            $mine = 'application/ogg';
++            $mime = 'application/ogg';
+             break;
++	case 'm4a':
++	    $mime = 'audio/mp4a-latm';
++	    break;
+         default:
+             $mime = 'application/octet-stream';
+     }
+Index: mythplugins/mythweb/modules/music/mp3act_functions.php
+===================================================================
+--- mythplugins/mythweb/modules/music/mp3act_functions.php	(revision 16468)
++++ mythplugins/mythweb/modules/music/mp3act_functions.php	(working copy)
+@@ -334,13 +334,15 @@
+       $length = $row[1];
+ 
+       // Attempt to find some album art.
+-      $query='SELECT ms.filename, ms.album_id, md.path, ma.artist_name, ma.artist_id, ms.directory_id
++      $query='SELECT ms.filename, ms.album_id, md.path, ma.artist_name, ma.artist_id, ms.directory_id, mal.album_name
+                 FROM music_songs AS ms
+                      LEFT JOIN music_directories AS md
+                             ON ms.directory_id=md.directory_id
+                      LEFT JOIN music_artists AS ma
+                             ON ms.artist_id=ma.artist_id
+-               WHERE album_id='.$sql_itemid.'
++                     LEFT JOIN music_albums AS mal
++                            ON ms.album_id=mal.album_id
++               WHERE ms.album_id='.$sql_itemid.'
+                LIMIT 1';
+       $result = mysql_query($query);
+       if (!$result)
+Index: mythplugins/mythweb/modules/_shared/lang/German.cat
+===================================================================
+--- mythplugins/mythweb/modules/_shared/lang/German.cat	(revision 16468)
++++ mythplugins/mythweb/modules/_shared/lang/German.cat	(working copy)
+@@ -2,7 +2,7 @@
+     Action
+     \b(?:\w*action|adven|\w*abenteuer)
+ "Adult"
+-    Erwachsene
++    Erotik
+     \b(?:adult|erot)
+ "Animals"
+     Tiere
+Index: mythplugins/mythweb/modules/_shared/lang/German.lang
+===================================================================
+--- mythplugins/mythweb/modules/_shared/lang/German.lang	(revision 16468)
++++ mythplugins/mythweb/modules/_shared/lang/German.lang	(working copy)
+@@ -2,10 +2,13 @@
+ " at "
+     um
+ "# Tracks"
++    # Lieder
+ "$1 B"
+     $1 B
+ "$1 day"
++    $1 Tag
+ "$1 days"
++    $1 Tage
+ "$1 episode"
+     $1 Folge
+ "$1 episodes"
+@@ -17,6 +20,7 @@
+ "$1 hrs"
+     $1 Std.
+ "$1 is not responding."
++    $1 antwortet nicht
+ "$1 KB"
+     $1 kB
+ "$1 MB"
+@@ -26,7 +30,9 @@
+ "$1 mins"
+     $1 Min.
+ "$1 month"
++    $1 Monat
+ "$1 months"
++    $1 Monate
+ "$1 programs, using $2 ($3) out of $4 ($5 free)."
+     $1 Aufnahmen, belegen $2 ($3) von $4.
+ "$1 recording"
+@@ -34,6 +40,7 @@
+ "$1 recordings"
+     $1 Aufnahmen
+ "$1 requests pending."
++    $1 Anfragen zu bearbeiten
+ "$1 Search"
+     $1 Suche
+ "$1 TB"
+@@ -41,35 +48,51 @@
+ "$1 to $2"
+     $1 bis $2
+ "$1 wasted"
++    $1 verschwendet
+ "$1 year"
++    $1 Jahr
+ "$1 years"
++    $1 Jahre
+ "%s Song (%s)"
++    %s Lied (%s)
+ "%s Songs"
++    %s Lieder
+ "%s Songs (%s)"
++    %s Lieder (%s)
+ "&deg;C"
+ "&deg;F"
+ "Aborted"
++    abgebrochen
+ "Aborting"
++    breche ab
+ "Action"
+     Aktion
+ "Activate"
+     Aktivieren
+ "Active Screens"
+ "Add"
++    HinzufÃ¼gen
+ "Add Album to Current Playlist"
++    zur Wiedergabelsite hinzufÃ¼gen
+ "Add Mix"
++    Mix hinzufÃ¼gen
[...15479 lines suppressed...]
+     <item>
+         <title>G4TV Street Fury Video Podcast</title>
+-        <url>http://www.g4tv.com/streetfury/podcasts/11/Street_Fury_Video_Podcast.xml</url>
+-        <ico>http://www.g4tv.com/favicon.ico</ico>
++        <url>http://g4tv.com/streetfury/podcasts/11/Street_Fury_Video_Podcast.xml</url>
++        <ico>http://g4tv.com/favicon.ico</ico>
+     </item> 
+ 
+     <item>
+         <title>G4TV The Daily Feed Video Podcast</title>
+-        <url>http://www.g4tv.com/thefeed/podcasts/19/The_Daily_Feed_Video_Podcast.xml</url>
+-        <ico>http://www.g4tv.com/favicon.ico</ico>
++        <url>http://g4tv.com/thefeed/podcasts/19/The_Daily_Feed_Video_Podcast.xml</url>
++        <ico>http://g4tv.com/favicon.ico</ico>
+     </item> 
+ 
+     <item>
+         <title>G4TV The Daily Nut</title>
+-        <url>http://www.g4tv.com/dailynut/podcasts/15/The_Daily_Nut.xml</url>
+-        <ico>http://www.g4tv.com/favicon.ico</ico>
++        <url>http://g4tv.com/dailynut/podcasts/15/The_Daily_Nut.xml</url>
++        <ico>http://g4tv.com/favicon.ico</ico>
+     </item> 
+ 
+     <item>
+         <title>G4TV The Man Show Video Podcast</title>
+-        <url>http://www.g4tv.com/themanshow/podcasts/14/The_Man_Show_Video_Podcast.xml</url>
+-        <ico>http://www.g4tv.com/favicon.ico</ico>
++        <url>http://g4tv.com/themanshow/podcasts/14/The_Man_Show_Video_Podcast.xml</url>
++        <ico>http://g4tv.com/favicon.ico</ico>
+     </item> 
+ 
+     <item>
+         <title>G4TV X-Play Daily Video Podcast</title>
+-        <url>http://www.g4tv.com/xplay/podcasts/6/XPlay_Daily_Video_Podcast.xml</url>
+-        <ico>http://www.g4tv.com/favicon.ico</ico>
++        <url>http://g4tv.com/xplay/podcasts/6/XPlay_Daily_Video_Podcast.xml</url>
++        <ico>http://g4tv.com/favicon.ico</ico>
+     </item>
+ 
+ </category>
+@@ -639,7 +639,7 @@
+ 
+     <item>
+         <title>Scotsman.com International News</title>
+-        <url>http://news.scotsman.com/international.cfm?format=rss</url>
++        <url>http://news.scotsman.com/getFeed.aspx?Format=rss&amp;sectionid=7000</url>
+         <ico>http://www.scotsman.com/favicon.ico</ico>
+     </item>
+ 
+@@ -725,85 +725,55 @@
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Broadcasting</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsbroadcast.xml</url>
++        <title>Digital Spy - Media Headlines</title>
++        <url>http://www.digitalspy.co.uk/rss/zones/gb/media.xml</url>
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Cable</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dscable.xml</url>
++        <title>Digital Spy - Big Brother</title>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/bigbrother.xml</url>
+     </item>
+ 
+     <item>
+         <title>Digital Spy - Cult</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dscult.xml</url>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/cult.xml</url>
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Entertainment Headlines</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dseznews.xml</url>
+-    </item>
+-
+-    <item>
+-        <title>Digital Spy - Gaydar</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsgaydar.xml</url>
+-    </item>
+-
+-    <item>
+-        <title>Digital Spy - Headlines</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsukstd.xml</url>
+-    </item>
+-
+-    <item>
+-        <title>Digital Spy - Media Headlines</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsmznews.xml</url>
+-    </item>
+-
+-    <item>
+         <title>Digital Spy - Movies</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsfilm.xml</url>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/movies.xml</url>
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Programming</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsprogramming.xml</url>
++        <title>Digital Spy - Music</title>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/music.xml</url>
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Radio</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsradio.xml</url>
++        <title>Digital Spy - Reality</title>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/realitytv.xml</url>
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Reality TV</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsreality.xml</url>
++        <title>Digital Spy - Showbiz</title>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/showbiz.xml</url>
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Satellite</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dssatellite.xml</url>
++        <title>Digital Spy - Soaps</title>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/soaps.xml</url>
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Showbiz</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsshowbiz.xml</url>
+-    </item>
+-
+-    <item>
+         <title>Digital Spy - Television</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dstv.xml</url>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/tv.xml</url>
+     </item>
+ 
+     <item>
+-        <title>Digital Spy - Terrestrial</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsterrestrial.xml</url>
++        <title>Digital Spy - US TV</title>
++        <url>http://www.digitalspy.co.uk/rss/categories/gb/ustv.xml</url>
+     </item>
+ 
+-    <item>
+-        <title>Digital Spy - US Television</title>
+-        <url>http://syndication.digitalspy.co.uk/xmlcache/dsustv.xml</url>
+-    </item>
+-
+ </category>
+ 
+ <category name="MythTV">
+@@ -840,7 +810,7 @@
+ 
+     <item>
+         <title>MythTV - Wiki Recent Changes</title>
+-        <url>http://www.mythtv.org/wiki/index.php?title=Special:Recentchanges&amp;feed=rss</url>
++        <url>http://www.mythtv.org/wiki?title=Special:RecentChanges&amp;feed=rss</url>
+     </item>
+   
+ </category>
+@@ -1019,7 +989,7 @@
+ 
+     <item>
+         <title>Scotsman.com Opinion</title>
+-        <url>http://news.scotsman.com/opinion.cfm?format=rss</url>
++        <url>http://news.scotsman.com/getFeed.aspx?Format=rss&amp;sectionid=7074</url>
+         <ico>http://www.scotsman.com/favicon.ico</ico>
+     </item>
+     
+@@ -1115,18 +1085,25 @@
+ 
+     <item>
+         <title>Helsingin Sanomat (FI)</title>
+-        <url>http://siirto.helsinginsanomat.fi/aukio/HS-Tuoreet-RSS.xml</url>
++        <url>http://www.hs.fi/uutiset/rss/</url>
++        <ico>http://www.hs.fi/static/hs/img/favicon.ico</ico>
+     </item>
+ 
+     <item>
++        <title>YLE (FI)</title>
++        <url>http://www.yle.fi/uutiset/rss/paauutiset.xml</url>
++        <ico>http://www.yle.fi/favicon.ico</ico>
++    </item>
++    
++    <item>
+         <title>Scotsman.com Headlines</title>
+-        <url>http://news.scotsman.com/index.cfm?format=rss</url>
++        <url>http://news.scotsman.com/getFeed.aspx?Format=rss&amp;sectionid=4068</url>
+         <ico>http://www.scotsman.com/favicon.ico</ico>
+     </item>
+ 
+     <item>
+         <title>Scotsman.com UK News</title>
+-        <url>http://news.scotsman.com/uk.cfm?format=rss</url>
++        <url>http://news.scotsman.com/getFeed.aspx?Format=rss&amp;sectionid=7071</url>
+         <ico>http://www.scotsman.com/favicon.ico</ico>
+     </item>
+ 

mythtv-0.21-svnfixes.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.7 -r 1.8 mythtv-0.21-svnfixes.patch
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: mythtv-0.21-svnfixes.patch
diff -N mythtv-0.21-svnfixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mythtv-0.21-svnfixes.patch	14 Jun 2009 00:10:27 -0000	1.8
@@ -0,0 +1,47775 @@
+Index: mythtv/i18n/mythfrontend_nb.ts
+===================================================================
+--- mythtv/i18n/mythfrontend_nb.ts	(revision 16468)
++++ mythtv/i18n/mythfrontend_nb.ts	(working copy)
+@@ -151,7 +151,7 @@
+     </message>
+     <message>
+         <source>Use channel scanner to find channels for this input.</source>
+-        <translation>Bruk kanalsÃ¸keren for Ã¥ finne kanaler fro denne inndatakilden.</translation>
++        <translation>Bruk kanalsÃ¸keren for Ã¥ finne kanaler for denne inndatakilden.</translation>
+     </message>
+     <message>
+         <source>This uses the listings data source to provide the channels for this input.</source>
+@@ -391,7 +391,7 @@
+     </message>
+     <message>
+         <source>Anytime on a specific day of the week</source>
+-        <translation>NÃ¥rr som helst pÃ¥ en bestemt ukedag</translation>
++        <translation>NÃ¥r som helst pÃ¥ en bestemt ukedag</translation>
+     </message>
+     <message>
+         <source>Only on weekdays (Monday through Friday)</source>
+@@ -1165,7 +1165,7 @@
+     </message>
+     <message>
+         <source>The connection to the master backend server has gone away for some reason.. Is it running?</source>
+-        <translation>Tilkoblingen til hovedtjeneren har av en eller anenn grunn forsvunnet. KjÃ¸rer den?</translation>
++        <translation>Tilkoblingen til hovedtjeneren har av en eller annen grunn forsvunnet. KjÃ¸rer den?</translation>
+     </message>
+     <message>
+         <source>There are also other clients using this database. They should be shut down first.</source>
+@@ -1216,7 +1216,7 @@
+         <source>The theme you are using is missing the &apos;file_browser_background&apos; element. 
+ 
+ Returning to the previous menu.</source>
+-        <translation>Temaet som brukes mangler elementet Â«file_borwsser_backgroundÂ». 
++        <translation>Temaet som brukes mangler elementet Â«file_browser_backgroundÂ». 
+ 
+ GÃ¥r tilbake til forrige meny.</translation>
+     </message>
+@@ -1224,7 +1224,7 @@
+         <source>The theme you are using is missing the &apos;file_browser&apos; element. 
+ 
+ Returning to the previous menu.</source>
+-        <translation>Temaet som brukes mangler elementet Â«file_borwserÂ». 
++        <translation>Temaet som brukes mangler elementet Â«file_browserÂ». 
+ 
+ GÃ¥r tilbake til forrige meny.</translation>
+     </message>
+@@ -1559,7 +1559,7 @@
+     </message>
+     <message>
+         <source>Commercials are flagged</source>
+-        <translation>Reklamer blir markert</translation>
++        <translation>Reklamer er markert</translation>
+     </message>
+     <message>
+         <source>An editing cutlist is present</source>
+@@ -1949,7 +1949,7 @@
+     </message>
+     <message>
+         <source>Reverse Time</source>
+-        <translation>Omvendt kronoligisk rekkefÃ¸lge</translation>
++        <translation>Omvendt kronologisk rekkefÃ¸lge</translation>
+     </message>
+     <message>
+         <source>Sort by Title</source>
+@@ -2388,7 +2388,7 @@
+     </message>
+     <message>
+         <source>If this frontend&apos;s host name changes often, check this box and provide a network-unique name to identify it. If unchecked, the frontend machine&apos;s local host name will be used to save preferences in the database.</source>
+-        <translation>Hvis klientens vertsnavn enders ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for Ã¥ identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for Ã¥ lagre innstillinger i databasen.</translation>
++        <translation>Hvis klientens vertsnavn endres ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for Ã¥ identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for Ã¥ lagre innstillinger i databasen.</translation>
+     </message>
+     <message>
+         <source>Custom identifier</source>
+@@ -3163,7 +3163,7 @@
+     </message>
+     <message>
+         <source>This showing will be recorded.</source>
+-        <translation>Denne sendingen vil bil tatt opp.</translation>
++        <translation>Denne sendingen vil bli tatt opp.</translation>
+     </message>
+     <message>
+         <source>This showing is being recorded.</source>
+@@ -3183,7 +3183,7 @@
+     </message>
+     <message>
+         <source>This showing was not recorded because </source>
+-        <translation>Denne sendingen vil ikke bli tatt opp fordi </translation>
++        <translation>Denne sendingen ble ikke tatt opp fordi </translation>
+     </message>
+     <message>
+         <source>it was manually set to not record.</source>
+@@ -3818,7 +3818,7 @@
+     </message>
+     <message>
+         <source>Match duplicates using subtitle</source>
+-        <translation>Finn duplisering ved hejlp av undertittel</translation>
++        <translation>Finn duplisering ved hjelp av undertittel</translation>
+     </message>
+     <message>
+         <source>Match duplicates using description</source>
+@@ -3850,7 +3850,7 @@
+     </message>
+     <message>
+         <source>Allow auto expire</source>
+-        <translation>Tillatt automatisk utlÃ¸ing</translation>
++        <translation>Tillat automatisk utlÃ¸ping</translation>
+     </message>
+     <message>
+         <source>Don&apos;t allow auto expire</source>
+@@ -3866,11 +3866,11 @@
+     </message>
+     <message>
+         <source>Delete oldest if this would exceed the max episodes</source>
+-        <translation>Slett den eldste hvis denne overstiger tillate episoder</translation>
++        <translation>Slett den eldste hvis denne overstiger antall tillatte episoder</translation>
+     </message>
+     <message>
+         <source>Don&apos;t record if this would exceed the max episodes</source>
+-        <translation>Ikke ta opp hvis denne overstiger tillate episoder</translation>
++        <translation>Ikke ta opp hvis denne overstiger antall tillatte episoder</translation>
+     </message>
+     <message>
+         <source>No episode limit</source>
+@@ -3956,7 +3956,7 @@
+         <source>You MUST run &apos;mythfilldatabase --manual the first time,
+  instead of just &apos;mythfilldatabase&apos;.
+ Your grabber does not provide channel numbers, so you have to set them manually.</source>
+-        <translation>FÃ¸rste gangen MÃ… Â«mythfilldatabase --manualÂ» kjÃ¸res i stedet for bare Â«mythfilldatabaseÂ». Henteren tildeler ikke kanalnumbre, sÃ¥ disse mÃ¥ angis manuelt.</translation>
++        <translation>FÃ¸rste gangen MÃ… Â«mythfilldatabase --manualÂ» kjÃ¸res i stedet for bare Â«mythfilldatabaseÂ». Henteren tildeler ikke kanalnummer, sÃ¥ disse mÃ¥ angis manuelt.</translation>
+     </message>
+     <message>
+         <source>Video source setup</source>
+@@ -4242,7 +4242,7 @@
+     </message>
+     <message>
+         <source>Enable this setting if MythTV is playing &quot;crackly&quot; audio and you are using hardware encoding. This setting will have no effect on MPEG-4 or RTJPEG video. MythTV will keep extra audio data in its internal buffers to workaround this bug.</source>
+-        <translation>SlÃ¥ pÃ¥ denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt pÃ¥ MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholde ekstra lyddata i dets interne hurtigminne.</translation>
++        <translation>SlÃ¥ pÃ¥ denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt pÃ¥ MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholder ekstra lyddata i dets interne hurtigminne.</translation>
+     </message>
+     <message>
+         <source>PIP Video Location</source>
+@@ -4410,7 +4410,7 @@
+     </message>
+     <message>
+         <source>New Recording Free Disk Space Threshold (in Megabytes)</source>
+-        <translation>MInimum ledig diskplass for Ã¥ ta opp (i MB)</translation>
++        <translation type="unfinished">Minimum ledig diskplass for Ã¥ ta opp (i MB)</translation>
+     </message>
+     <message>
+         <source>MythTV will stop scheduling new recordings on a backend when its free disk space falls below this value.</source>
+@@ -4418,7 +4418,7 @@
+     </message>
+     <message>
+         <source>Time to record before start of show (in seconds)</source>
+-        <translation>TId Ã¥ ta opp fÃ¸r programstart (i sekunder)</translation>
++        <translation type="unfinished">Tid Ã¥ ta opp fÃ¸r programstart (i sekunder)</translation>
+     </message>
+     <message>
+         <source>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
+@@ -4430,7 +4430,7 @@
+     </message>
+     <message>
+         <source>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
+-        <translation>Denne globale innstillingen tillater opptakeren Ã¥ ta opp etter den planlagte sluttiden. Dette pÃ¥virker ikke planlaggeren, og ignoreres nÃ¥r to opptak er planlagt uten nok tid mellom dem.</translation>
++        <translation>Denne globale innstillingen tillater opptakeren Ã¥ ta opp etter den planlagte sluttiden. Dette pÃ¥virker ikke planleggeren, og ignoreres nÃ¥r to opptak er planlagt uten nok tid mellom dem.</translation>
+     </message>
+     <message>
+         <source>List Newest Recording First</source>
+@@ -4470,7 +4470,7 @@
+     </message>
+     <message>
+         <source>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa.  If disabled, it will decrease the current speed or switch to play mode if the speed can&apos;t be decreased further.</source>
+-        <translation>Hvis pÃ¥ vil et trykk pÃ¥ den treige spole tilbake-knappen i framoverspillingsmodues bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodues hvis farten ikke kan reduseres mer.</translation>
++        <translation>Hvis pÃ¥ vil et trykk pÃ¥ den treige spole tilbake-knappen i framoverspillingsmodus bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodus hvis farten ikke kan reduseres mer.</translation>
+     </message>
+     <message>
+         <source>Menu theme</source>
+@@ -4578,7 +4578,7 @@
+     </message>
+     <message>
+         <source>UDP Notify Port</source>
+-        <translation>UPD-notifiseringsport</translation>
++        <translation>UDP-notifiseringsport</translation>
+     </message>
+     <message>
+         <source>During playback, MythTV will listen for connections from the &quot;mythtvosd&quot; or &quot;mythudprelay&quot; programs on this port.  See the README in contrib/mythnotify/ for additional information.</source>
+@@ -4662,7 +4662,7 @@
+     </message>
+     <message>
+         <source>&quot;Fill&quot; is the quickest shading method. &quot;Image&quot; is somewhat slow, but has a higher visual quality. No shading will be the fastest.</source>
[...47382 lines suppressed...]
+ #define DCT6416_MODEL_ID1  0x0000646b
+ 
+-#define AVC1394_SUBUNIT_TYPE_6200 (9 << 19)  /* uses a reserved subunit type */ 
++#define QIP7100_VENDOR_ID1 0x00002374
++#define QIP7100_MODEL_ID1  0x00008100
++#define QIP7100_MODEL_ID2  0x00000001
+ 
+-#define AVC1394_6200_COMMAND_CHANNEL 0x000007C00   /* 6200 subunit command */
++#define MOT_UNKNOWN_VENDOR_ID1 0x04db
++#define MOT_UNKNOWN_VENDOR_ID2 0x0406
++#define MOT_UNKNOWN_VENDOR_ID3 0x0ce5
++#define MOT_UNKNOWN_VENDOR_ID4 0x111a
++#define MOT_UNKNOWN_VENDOR_ID5 0x1225
++#define MOT_UNKNOWN_VENDOR_ID6 0x1404
++#define MOT_UNKNOWN_VENDOR_ID7 0x1626
++#define MOT_UNKNOWN_VENDOR_ID8 0x18c0
++#define MOT_UNKNOWN_VENDOR_ID9 0x1ade
++#define MOT_UNKNOWN_VENDOR_ID10 0x1cfb
++#define MOT_UNKNOWN_VENDOR_ID11 0x2040
++#define MOT_UNKNOWN_VENDOR_ID12 0x211e
++#define MOT_UNKNOWN_VENDOR_ID13 0x2180
++#define MOT_UNKNOWN_VENDOR_ID14 0x2210
++#define MOT_UNKNOWN_VENDOR_ID15 0x230b
++#define MOT_UNKNOWN_VENDOR_ID16 0x2375
++#define MOT_UNKNOWN_VENDOR_ID17 0x2395
++#define MOT_UNKNOWN_VENDOR_ID18 0x23a2
++#define MOT_UNKNOWN_VENDOR_ID19 0x23ed
++#define MOT_UNKNOWN_VENDOR_ID20 0x23ee
++#define MOT_UNKNOWN_VENDOR_ID21 0x23a0
++#define MOT_UNKNOWN_VENDOR_ID22 0x23a1
++
++#define PACE_VENDOR_ID1    0x00005094 /* 550 & 779 */
++#define PACE_VENDOR_ID2    0x00005094 /* unknown */
++#define PACE550_MODEL_ID1  0x00010551
++#define PACE779_MODEL_ID1  0x00010755
++
+ #define AVC1394_6200_OPERAND_SET 0x20      /* 6200 subunit command operand */
+ 
+-#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_6200 | \
+-        AVC1394_SUBUNIT_ID_0 | AVC1394_6200_COMMAND_CHANNEL | \
++#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_PANEL | \
++        AVC1394_SUBUNIT_ID_0 | AVC1394_PANEL_COMMAND_PASS_THROUGH | \
+         AVC1394_6200_OPERAND_SET
+ 
+ #define STARTING_NODE 1  /* skip 1394 nodes to avoid error msgs */
+@@ -171,7 +207,7 @@
+ 
+    if (!handle) {
+       if (!errno) {
+-         fprintf(stderr, "Not Compatable!\n");
++         fprintf(stderr, "Not Compatible!\n");
+       } else {
+          perror("Couldn't get 1394 handle");
+          fprintf(stderr, "Is ieee1394, driver, and raw1394 loaded?\n");
+@@ -218,9 +254,13 @@
+ 
+       // WARNING: Please update firewiredevice.cpp when adding to this list.
+       if ( ((dir.vendor_id == DCH3200_VENDOR_ID1) ||
+-            (dir.vendor_id == DCT3412_VENDOR_ID1) || 
+-            (dir.vendor_id == DCT3416_VENDOR_ID1) || 
+-            (dir.vendor_id == DCT3416_VENDOR_ID2) || 
++            (dir.vendor_id == DCH3200_VENDOR_ID2) ||
++            (dir.vendor_id == DCH3200_VENDOR_ID3) ||
++            (dir.vendor_id == DCH3200_VENDOR_ID4) ||
++            (dir.vendor_id == DCH3416_VENDOR_ID1) ||
++            (dir.vendor_id == DCT3412_VENDOR_ID1) ||
++            (dir.vendor_id == DCT3416_VENDOR_ID1) ||
++            (dir.vendor_id == DCT3416_VENDOR_ID2) ||
+             (dir.vendor_id == DCT5100_VENDOR_ID1) ||
+             (dir.vendor_id == DCT6200_VENDOR_ID1) ||
+             (dir.vendor_id == DCT6200_VENDOR_ID2) ||
+@@ -237,11 +277,38 @@
+             (dir.vendor_id == DCT6200_VENDOR_ID13) ||
+             (dir.vendor_id == DCT6200_VENDOR_ID14) ||
+             (dir.vendor_id == DCT6200_VENDOR_ID15) ||
++            (dir.vendor_id == DCT6200_VENDOR_ID16) ||
+             (dir.vendor_id == DCT6412_VENDOR_ID1) ||
+             (dir.vendor_id == DCT6412_VENDOR_ID2) ||
+-            (dir.vendor_id == DCT6416_VENDOR_ID1) || 
+-            (dir.vendor_id == DCT6416_VENDOR_ID2)) &&
++            (dir.vendor_id == DCT6416_VENDOR_ID1) ||
++            (dir.vendor_id == DCT6416_VENDOR_ID2) ||
++            (dir.vendor_id == QIP7100_VENDOR_ID1) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID1) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID2) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID3) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID4) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID5) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID6) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID7) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID8) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID9) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID10) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID11) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID12) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID13) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID14) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID15) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID16) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID17) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID18) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID19) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID20) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID21) ||
++            (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID22) ||
++            (dir.vendor_id == PACE_VENDOR_ID1) ||
++            (dir.vendor_id == PACE_VENDOR_ID2)) &&
+            ((dir.model_id == DCH3200_MODEL_ID1) ||
++            (dir.model_id == DCH3416_MODEL_ID1) ||
+             (dir.model_id == DCT3412_MODEL_ID1) ||
+             (dir.model_id == DCT3416_MODEL_ID1) ||
+             (dir.model_id == DCT3416_MODEL_ID2) ||
+@@ -250,7 +317,12 @@
+             (dir.model_id == DCT6200_MODEL_ID2) ||
+             (dir.model_id == DCT6412_MODEL_ID1) ||
+             (dir.model_id == DCT6412_MODEL_ID2) ||
+-            (dir.model_id == DCT6416_MODEL_ID1)) ) {
++            (dir.model_id == DCT6416_MODEL_ID1) ||
++            (dir.model_id == QIP7100_MODEL_ID1) ||
++            (dir.model_id == QIP7100_MODEL_ID2) ||
++            (dir.model_id == PACE550_MODEL_ID1) ||
++            (dir.model_id == PACE779_MODEL_ID1)) )
++      {
+             if (dir.unit_spec_id != DCT6200_SPEC_ID)
+                fprintf(stderr, "Warning: Unit Spec ID different.\n");
+             if (dir.unit_sw_version != DCT6200_SW_VERSION)
+Index: mythtv/contrib/channel_changers/sa3250ch.c
+===================================================================
+--- mythtv/contrib/channel_changers/sa3250ch.c	(revision 16468)
++++ mythtv/contrib/channel_changers/sa3250ch.c	(working copy)
+@@ -32,13 +32,24 @@
+ 
+ /* SA3250HD IDs */
+ /* WARNING: Please update firewiredevice.cpp when adding to this list. */
+-#define SA_VENDOR_ID1           0x000011e6
+-#define SA_VENDOR_ID2           0x000014f8
+-#define SA_VENDOR_ID3           0x00001692
+-#define SA_VENDOR_ID4           0x00001947
+-#define SA_VENDOR_ID5           0x00000f21
+-#define SA_VENDOR_ID6           0x00001ac3
+-#define SA_VENDOR_ID7           0x00000a73
++
++#define SA_VENDOR_ID1           0x00000a73
++#define SA_VENDOR_ID2           0x00000f21
++#define SA_VENDOR_ID3           0x000011e6
++#define SA_VENDOR_ID4           0x000014f8
++#define SA_VENDOR_ID5           0x00001692
++#define SA_VENDOR_ID6           0x00001868
++#define SA_VENDOR_ID7           0x00001947
++#define SA_VENDOR_ID8           0x00001ac3
++#define SA_VENDOR_ID9           0x00001bd7
++#define SA_VENDOR_ID10          0x00001cea
++#define SA_VENDOR_ID11          0x00001e6b
++#define SA_VENDOR_ID12          0x000021be
++#define SA_VENDOR_ID13          0x0000223a
++#define SA_VENDOR_ID14          0x000022ce
++#define SA_VENDOR_ID15          0x000023be
++#define SA_VENDOR_ID16          0x0000252e
++
+ #define SA3250HD_MODEL_ID1      0x00000be0
+ #define SA4200HD_MODEL_ID1      0x00001072
+ #define SA4250HDC_MODEL_ID1     0x000010cc
+@@ -130,13 +141,22 @@
+                  i, dir.vendor_id, dir.model_id); 
+ 		
+       /* WARNING: Please update firewiredevice.cpp when adding to this list. */
+-      if (((dir.vendor_id == SA_VENDOR_ID1) ||
+-           (dir.vendor_id == SA_VENDOR_ID2) ||
+-           (dir.vendor_id == SA_VENDOR_ID3) ||
+-           (dir.vendor_id == SA_VENDOR_ID4) ||
+-           (dir.vendor_id == SA_VENDOR_ID5) ||
+-           (dir.vendor_id == SA_VENDOR_ID6) ||
+-           (dir.vendor_id == SA_VENDOR_ID7)) &&
++      if (((dir.vendor_id == SA_VENDOR_ID1)  ||
++           (dir.vendor_id == SA_VENDOR_ID2)  ||
++           (dir.vendor_id == SA_VENDOR_ID3)  ||
++           (dir.vendor_id == SA_VENDOR_ID4)  ||
++           (dir.vendor_id == SA_VENDOR_ID5)  ||
++           (dir.vendor_id == SA_VENDOR_ID6)  ||
++           (dir.vendor_id == SA_VENDOR_ID7)  ||
++           (dir.vendor_id == SA_VENDOR_ID8)  ||
++           (dir.vendor_id == SA_VENDOR_ID9)  ||
++           (dir.vendor_id == SA_VENDOR_ID10) ||
++           (dir.vendor_id == SA_VENDOR_ID11) ||
++           (dir.vendor_id == SA_VENDOR_ID12) ||
++           (dir.vendor_id == SA_VENDOR_ID13) ||
++           (dir.vendor_id == SA_VENDOR_ID14) ||
++           (dir.vendor_id == SA_VENDOR_ID15) ||
++           (dir.vendor_id == SA_VENDOR_ID16)) &&
+           ((dir.model_id == SA3250HD_MODEL_ID1)  ||
+            (dir.model_id == SA4200HD_MODEL_ID1)  ||
+            (dir.model_id == SA4250HDC_MODEL_ID1)))
+
+Property changes on: mythtv/contrib/channel_changers
+___________________________________________________________________
+Added: svn:ignore
+   + 6200ch
+sa3250ch
+
+


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.36 -r 1.37 mythtv.spec
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/mythtv.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mythtv.spec	4 Jun 2009 04:34:11 -0000	1.36
+++ mythtv.spec	14 Jun 2009 00:10:28 -0000	1.37
@@ -1,128 +1,37 @@
-#
-# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
-#
-# by:   Chris Petersen <rpm at forevermore.net>
-#       Jarod Wilson <jarod at wilsonet.com>
-#
-#  Modified/Extended from the great (non-svn based) work of:
-#     Axel Thimm <Axel.Thimm at ATrpms.net>
-#     David Bussenschutt <buzz at oska.com>
-#     and others; see changelog at bottom for details.
-#
-# The latest version of this file can be found at:
-#
-#     http://www.mythtv.org/wiki/index.php/Mythtv-svn-rpmbuild.spec
-#
-# Note:
-#
-#     This spec relies upon several files included in the RPMFusion mythtv
-#     src.rpm file.  Please install it into your build tree before trying to
-#     build anything with this spec.
-#
-# Explanation of options:
-#
-# --with proc_opt           Enable MythTV's optimized processor detection code
-#                               and override RPM's defaults.
-# --with debug              Enable debug mode
-#
-# The following options are disabled by default.  Use these options to enable:
-#
-# --with directfb           Enable directfb support
-#
-# The following options are enabled by default.  Use these options to disable:
-#
-# --without xvmcnvidia      Disable NVidia XvMC support
-# --without perl            Disable building of the perl bindings
-# --without python          Disable building of the python bindings
-#
-# # All plugins get built by default, but you can disable them as you wish:
-#
-# --without mytharchive
-# --without mythbrowser
-# --without mythflix
-# --without mythgallery
-# --without mythgame
-# --without mythmovies
-# --without mythmusic
-# --without mythnews
-# --without mythvideo
-# --without mythweather
-# --without mythzoneminder
-# --without mythweb
-#
+# svn revision number
+%define _svnver r20697
+%define branch release-0-21-fixes
+# Nb: base 0.21 svn rev is r16468
+#define branch trunk
+
+# disabled options
+%define with_debug      %{?_with_debug:      1} %{?!_with_debug:      0}
+%define with_directfb   %{?_with_directfb:   1} %{?!_with_directfb:   0}
+%define with_festival   %{?_with_festival:   1} %{?!_with_festival:   0}
+%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0}
 
-################################################################################
-
-# A list of which applications we want to put into the desktop menu system
 %define desktop_applications mythfrontend mythtv-setup
+%define desktop_vendor RPMFusion
 
-# The vendor name we should attribute the aforementioned entries to
-%define desktop_vendor  RPMFusion
-
-# SVN Revision number and branch ID
-%define _svnrev r20668
-%define branch trunk
-
-#
-# Basic descriptive tags for this package:
-#
-Name:           mythtv
-Summary:        A digital video recorder (DVR) application.
-URL:            http://www.mythtv.org/
-Group:          Applications/Multimedia
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
 
-# Version/Release info
-Version: 0.22
+Summary: A digital video recorder (DVR) application
+Name: mythtv
+Version: 0.21
 %if "%{branch}" == "trunk"
-Release: 0.2.svn.%{_svnrev}%{?dist}
+Release: 0.2.%{_svnver}%{?dist}
 %else
-Release: 1%{?dist}
+Release: 20%{?dist}
 %endif
-
+URL: http://www.mythtv.org/
 # The primary license is GPLv2+, but bits are borrowed from a number of
 # projects... For a breakdown of the licensing, see PACKAGE-LICENSING.
 License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+)
-
-################################################################################
-
-# Set "--with proc_opt" to let mythtv autodetect your CPU and run its
-# processor-specific optimizations.  It seems to cause compile problems on many
-# systems (particularly x86_64), so it is classified by the MythTV developers
-# as "use at your own risk."
-%define with_proc_opt      %{?_with_proc_opt:       1} %{!?_with_proc_opt:      0}
-
-# Set "--with debug" to enable MythTV debug compile mode
-%define with_debug         %{?_with_debug:          1} %{?!_with_debug:         0}
-
-# The following options are enabled by default.  Use --without to disable them
-%define with_perl          %{?_without_perl:        0} %{!?_without_perl:       1}
-%define with_python        %{?_without_python:      0} %{!?_without_python:     1}
-%define with_pulseaudio    %{?_without_pulseaudio:  0} %{!?_without_pulseaudio: 1}
-
-# The following options are disabled by default.  Use --with to enable them
-%define with_directfb      %{?_with_directfb:       1} %{!?_with_directfb:      0}
-%define with_xvmcnvidia    %{?_with_xvmcnvidia:     1} %{?!_with_xvmcnvidia:    0}
-
-# All plugins get built by default, but you can disable them as you wish
-%define with_plugins        %{?_without_plugins:        0} %{!?_without_plugins:         1}
-%define with_mytharchive    %{?_without_mytharchive:    0} %{!?_without_mytharchive:     1}
-%define with_mythbrowser    %{?_without_mythbrowser:    0} %{!?_without_mythbrowser:     1}
-%define with_mythflix       %{?_without_mythflix:       0} %{!?_without_mythflix:        1}
-%define with_mythgallery    %{?_without_mythgallery:    0} %{!?_without_mythgallery:     1}
-%define with_mythgame       %{?_without_mythgame:       0} %{!?_without_mythgame:        1}
-%define with_mythmovies     %{?_without_mythmovies:     0} %{!?_without_mythmovies:      1}
-%define with_mythmusic      %{?_without_mythmusic:      0} %{!?_without_mythmusic:       1}
-%define with_mythnews       %{?_without_mythnews:       0} %{!?_without_mythnews:        1}
-%define with_mythvideo      %{?_without_mythvideo:      0} %{!?_without_mythvideo:       1}
-%define with_mythweather    %{?_without_mythweather:    0} %{!?_without_mythweather:     1}
-%define with_mythweb        %{?_without_mythweb:        0} %{!?_without_mythweb:         1}
-%define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder:  1}
-
-################################################################################
-
-Source0:   http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2
-Source1:   http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
-Source10:  PACKAGE-LICENSING
+Group: Applications/Multimedia
+Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2
+Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
+Source10: PACKAGE-LICENSING
 Source101: mythbackend.sysconfig.in
 Source102: mythbackend.init.in
 Source103: mythbackend.logrotate.in
@@ -132,194 +41,128 @@
 Source109: mythtv-setup.desktop
 Source110: mysql.txt
 Source401: mythweb.conf
-Patch0:    mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-################################################################################
-# Python setup
-
-%if %{with_python}
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
-%endif
-
-################################################################################
-
-# Global MythTV and Shared Build Requirements
-
-BuildRequires:  desktop-file-utils
-BuildRequires:  freetype-devel >= 2
-BuildRequires:  gcc-c++
-BuildRequires:  mysql-devel >= 5
-BuildRequires:  qt4-devel
-BuildRequires:  phonon-devel
-
-BuildRequires:  lm_sensors-devel
-BuildRequires:  lirc-devel
-BuildRequires:  nasm, yasm-devel
-
-# X, and Xv video support
-BuildRequires:  libXmu-devel
-BuildRequires:  libXv-devel
-BuildRequires:  libXvMC-devel
-BuildRequires:  libXxf86vm-devel
-BuildRequires:  mesa-libGLU-devel
-BuildRequires:  xorg-x11-proto-devel
-%ifarch %{ix86} x86_64
[...1764 lines suppressed...]
-* Mon Apr 13 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.2.svn.r20371
-- Update to pre-0.22 svn trunk, revision 20371
-- Relocate Requires: wget to the sub-packages where necessary (rfbz#384)
-- Don't use a52dec, mythtv has its own internal support these days
-
-* Tue Apr 07 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.2.svn.r20317
-- Update to pre-0.22 svn trunk, revision 20317
-
-* Tue Mar 31 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.2.svn.r20293
-- Update to pre-0.22 svn trunk, revision 20293
-- Add BuildRequires: phonon-devel
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20273
-- rebuild for new F11 features
-
-* Fri Mar 27 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r20273
-- Update to pre-0.22 svn trunk, revision 20273
-
-* Fri Mar 20 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r20232
-- Update to pre-0.22 svn trunk, revision 20232
-
-* Thu Mar 12 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r20196
-- Update to pre-0.22 svn trunk, revision r20196
-- Carries work-around for qt 4.5 "everthing is a prepared statement now"
-  bug/quirk (rpmfusion bz#421)
-
-* Wed Mar 04 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r20107
-- Update to pre-0.22 svn trunk, revision 20107
-- Features misc gcc 4.4 and qt 4.5 build fixage
-
-* Mon Mar 02 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r20089
-- Update to pre-0.22 svn trunk, revision 20089
-
-* Wed Feb 18 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r20019
-- Update to pre-0.22 svn trunk, revision 20019
+%dir %{_sysconfdir}/mythgame
+%config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml
+%{_libdir}/mythtv/plugins/libmythgame.so
+%{_datadir}/mythtv/games
+%exclude %{_datadir}/mythtv/games/xmame
+%{_datadir}/mythtv/game_settings.xml
+%{_datadir}/mythtv/i18n/mythgame_*.qm
+%exclude %{_datadir}/mame/screens
 
-* Wed Feb 11 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19980
-- Update to pre-0.22 svn trunk, revision 19980
+#files -n mythgame-emulators
+#defattr(-,root,root,-)
+#{_datadir}/mythtv/games/xmame
+#{_datadir}/mame/screens
+#{_datadir}/mame/flyers
 
-* Thu Jan 29 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19874
-- Update to pre-0.22 svn trunk, revision 19874
+%files -n mythnews
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mythnews/AUTHORS
+%doc mythplugins-%{version}/mythnews/COPYING
+%doc mythplugins-%{version}/mythnews/README
+%{_libdir}/mythtv/plugins/libmythnews.so
+%{_datadir}/mythtv/mythnews
+%{_datadir}/mythtv/i18n/mythnews_*.qm
 
-* Sat Jan 24 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19811
-- Update to pre-0.22 svn trunk, revision 19811
-- Drop mythcontrols plugin (functionality merged into mythfrontend)
-- Re-enable building iptv support
+%files -n mythbrowser
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mythbrowser/AUTHORS
+%doc mythplugins-%{version}/mythbrowser/COPYING
+%doc mythplugins-%{version}/mythbrowser/README
+%{_bindir}/mythbrowser
+%{_libdir}/mythtv/plugins/libmythbookmarkmanager.so
+%{_datadir}/mythtv/i18n/mythbrowser_*.qm
 
-* Sat Jan 17 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19722
-- Update to pre-0.22 svn trunk, revision 19722
-- MythPhone plugin is dead as a doornail (MythTV changeset 19702)
+%files -n mythphone
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mythphone/AUTHORS
+%doc mythplugins-%{version}/mythphone/COPYING
+%doc mythplugins-%{version}/mythphone/README
+%doc mythplugins-%{version}/mythphone/TODO
+%{_libdir}/mythtv/plugins/libmythphone.so
+%{_datadir}/mythtv/i18n/mythphone_*.qm
+
+%files -n mythcontrols
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mythcontrols/AUTHORS
+%doc mythplugins-%{version}/mythcontrols/COPYING
+%doc mythplugins-%{version}/mythcontrols/README
+%doc mythplugins-%{version}/mythcontrols/TODO
+%{_libdir}/mythtv/plugins/libmythcontrols.so
+%{_datadir}/mythtv/i18n/mythcontrols_*.qm
 
-* Sat Jan 17 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19721
-- Update to pre-0.22 svn trunk, revision 19721
+%files -n mythflix
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mythflix/AUTHORS
+%doc mythplugins-%{version}/mythflix/COPYING
+%doc mythplugins-%{version}/mythflix/README
+%{_libdir}/mythtv/plugins/libmythflix.so
+%{_datadir}/mythtv/mythflix
+%{_datadir}/mythtv/i18n/mythflix_*.qm
+%{_datadir}/mythtv/i18n/mythflix_*.ts
+%{_datadir}/mythtv/netflix_menu.xml
 
-* Fri Jan 09 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19630
-- Update to pre-0.22 svn trunk, revision 19630
-- Fix a %%files list screw-up w/mythgame-emulators nukage
+%files -n mytharchive
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mytharchive/AUTHORS
+%doc mythplugins-%{version}/mytharchive/COPYING
+%doc mythplugins-%{version}/mytharchive/README
+%doc mythplugins-%{version}/mytharchive/TODO
+%{_bindir}/mytharchivehelper
+%{_libdir}/mythtv/plugins/libmytharchive.so
+%{_datadir}/mythtv/archiveformat.xml
+%{_datadir}/mythtv/archivemenu.xml
+%{_datadir}/mythtv/archiveutils.xml
+%{_datadir}/mythtv/mytharchive
+%{_datadir}/mythtv/i18n/mytharchive_*.qm
 
-* Fri Jan 09 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19622
-- Update to pre-0.22 svn trunk, revision 19622
+%files -n mythzoneminder
+%defattr(-,root,root,-)
+%{_libdir}/mythtv/plugins/libmythzoneminder.so
+%{_datadir}/mythtv/zonemindermenu.xml
+%{_bindir}/mythzmserver
 
-* Fri Jan 02 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19534
-- Update to pre-0.22 svn trunk, revision 19534
-- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
+%files -n mythweb
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mythweb/README
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%defattr(-,apache,apache,0775)
+%dir %{_datadir}/mythweb
+%{_datadir}/mythweb/*
 
-* Sun Dec 28 2008 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19467
-- Update to pre-0.22 svn trunk, revision 19467
+%files -n perl-MythTV
+%defattr(-,root,root,-)
+%{perl_vendorlib}/MythTV.pm
+%dir %{perl_vendorlib}/MythTV
+%{perl_vendorlib}/MythTV/*.pm
+%dir %{perl_vendorlib}/IO/Socket
+%dir %{perl_vendorlib}/IO/Socket/INET
+%{perl_vendorlib}/IO/Socket/INET/MythTV.pm
+%exclude %{perl_vendorarch}/auto/MythTV/.packlist
 
-* Mon Dec 15 2008 Jarod Wilson <jarod at wilsonet.com> 0.22-0.1.svn.r19390
-- MythTV svn trunk (pre-0.22), revision 19390
-- Re-enable fast cmov on x86_64 by default
-- Add BR: yasm-devel to enable yasm-specific improvements
+%files -n python-MythTV
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/MythTV/
+%{python_sitelib}/MythTV/*
+%if 0%{?fedora} >= 9
+%{python_sitelib}/MythTV-*.egg-info
+%endif
 
-* Sat Dec 13 2008 Chris Petersen <rpm at forevermore.net> 0.22-0.1.svn
-- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps
-- Major cleanup and porting from my personal spec (which was a combination
-  of works from atrpms and some of Jarod's earlier works).
-- Add a few more --with and --without options, including the ability to
-  disable specific mythplugins and/or all plugins.
+%changelog
+* Sat Jun 13 2009 Jarod Wilson <jarod at wilsonet.com> - 0.21-20
+- Update to release-0-21-fixes patches (r20697)
+- Add missing BR: pulseaudio-libs-devel so we work when pulse
+  is running (rfbz#651)
+- Fix compatability with forthcoming lcdproc 0.5.3 release
+
+* Wed Jun 03 2009 Jarod Wilson <jarod at wilsonet.com> - 0.21-19
+- Update to release-0-21-fixes patches (r20668)
+
+* Mon Apr 13 2009 Jarod Wilson <jarod at wilsonet.com> - 0.21-18
+- Update release-0-21-fixes patches (r20373)
+- Slide Requires: wget into more appropriate places (rfbz#384)
+
+* Thu Jan 22 2009 Jarod Wilson <jarod at wilsonet.com> - 0.21-17
+- Update release-0-21-fixes patches (r19788)
+- Add Require: perl-XML-SAX to mythweather (rpmfusion bz#337)
+
+* Tue Dec 30 2008 Jarod Wilson <jarod at wilsonet.com> - 0.21-16
+- Update release-0-21-fixes patches (r19505)
+- Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286)
 
 * Thu Dec 11 2008 Jarod Wilson <jarod at wilsonet.com> - 0.21-15
 - Update to release-0-21-fixes patches (r19344)


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	4 Jun 2009 04:34:11 -0000	1.18
+++ sources	14 Jun 2009 00:10:28 -0000	1.19
@@ -1,4 +1,4 @@
 be3ab99952c2a3a135a7c4af90b08f15  mythfrontend.png
 be3ab99952c2a3a135a7c4af90b08f15  mythtv-setup.png
-4c485ae9f5238c3beed9ee80f7ab4cd6  mythplugins-0.22.tar.bz2
-5c484b6e40ca6ffc08be5491655faf2e  mythtv-0.22.tar.bz2
+6c08043227bef1384858deee12b5cdc3  mythplugins-0.21.tar.bz2
+49fc135e1cde90cd935c1229467fa37e  mythtv-0.21.tar.bz2


--- mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch DELETED ---

