rpms/mythtv/devel mythplugins-0.21-svnfixes.patch, 1.4, 1.5 mythtv-0.21-svnfixes.patch, 1.4, 1.5 mythtv.spec, 1.13, 1.14

Jarod Wilson jarod at rpmfusion.org
Fri Dec 12 04:44:15 CET 2008


Author: jarod

Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31464

Modified Files:
	mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch 
	mythtv.spec 
Log Message:
* Thu Dec 11 2008 Jarod Wilson <jarod at wilsonet.com> - 0.21-15
- Update to release-0-21-fixes patches (r19344)
- Includes critical fix for supporting use of FireWire cable
  boxes w/Fedora's native FireWire driver stack (finally!)
- Fix missing package ownership of some stray dirs (rpmfusion bz#222)


mythplugins-0.21-svnfixes.patch:

Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythplugins-0.21-svnfixes.patch	29 Nov 2008 06:29:50 -0000	1.4
+++ mythplugins-0.21-svnfixes.patch	12 Dec 2008 03:44:14 -0000	1.5
@@ -2,7 +2,24 @@
 ===================================================================
 --- mythplugins/mythweb/INSTALL	(revision 16468)
 +++ mythplugins/mythweb/INSTALL	(working copy)
-@@ -195,6 +195,10 @@
+@@ -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
  
@@ -13,6 +30,32 @@
  =================
  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
++
 Index: mythplugins/mythweb/modules/music/stream.php
 ===================================================================
 --- mythplugins/mythweb/modules/music/stream.php	(revision 16468)
@@ -1176,6 +1219,34 @@
                  backend_command(array('FORGET_RECORDING', implode(backend_sep, $row), '0'));
              // Delay a second so the scheduler can catch up
                  sleep(1);
+Index: mythplugins/mythweb/README
+===================================================================
+--- mythplugins/mythweb/README	(revision 16468)
++++ mythplugins/mythweb/README	(working copy)
+@@ -135,10 +135,16 @@
+ Q: I get a "500 server error" (or some other number) when trying to view
+     MythWeb.
+ A: Check your apache logs for details about what caused the error.  Usually,
+-    it means that you didn't set up a required module.  Read the 
++    it means that you didn't set up a required module.  Read the
+     mythweb.conf.apache file in more detail to make sure you didn't miss
+     an important setup file.
+ 
++Q: MythWeb complains about "Warning: Unknown Programme" after Daylight Savings
++    Time has started/finished.
++A: PHP may not have determined your local timezone correctly. Read the PHP
++    section of MythWeb's INSTALL file to find out how to correctly configure
++    your timezone in PHP.
++
+ ======================
+ 4.0 Submitting Patches
+ ======================
+@@ -150,5 +156,3 @@
+ other "diff -u" patches, but if there have been any major changes in SVN (there
+ occasionally are), I won't put much effort into trying to make your patch work,
+ so please just use SVN.
+-
+-
 Index: mythplugins/configure
 ===================================================================
 --- mythplugins/configure	(revision 16468)
@@ -10168,6 +10239,7 @@
            <position>0,0</position>
          </image>
          
+
 Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts
 ===================================================================
 --- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts	(revision 16468)
@@ -12142,6 +12214,19 @@
  
              command_string = "Internal";
              gContext->GetMainWindow()->HandleMedia(command_string, filename);
+Index: mythplugins/mythvideo/mythvideo/videofilter.cpp
+===================================================================
+--- mythplugins/mythvideo/mythvideo/videofilter.cpp	(revision 16468)
++++ mythplugins/mythvideo/mythvideo/videofilter.cpp	(working copy)
+@@ -293,7 +293,7 @@
+     {
+         if (runtime == kRuntimeFilterUnknown)
+         {
+-            matches = mdata.Length() < 0;
++            matches = mdata.Length() == 0;
+         }
+         else
+         {
 Index: mythplugins/mythphone/i18n/mythphone_nl.ts
 ===================================================================
 --- mythplugins/mythphone/i18n/mythphone_nl.ts	(revision 16468)

mythtv-0.21-svnfixes.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 mythtv-0.21-svnfixes.patch
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythtv-0.21-svnfixes.patch	29 Nov 2008 06:29:50 -0000	1.4
+++ mythtv-0.21-svnfixes.patch	12 Dec 2008 03:44:14 -0000	1.5
@@ -7332,6 +7332,10 @@
      </message>
  </context>
  </TS>
+Index: mythtv/i18n/mythfrontend_nb.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
 Index: mythtv/i18n/mythfrontend_de.ts
 ===================================================================
 --- mythtv/i18n/mythfrontend_de.ts	(revision 16468)
@@ -25114,6 +25118,34 @@
      </message>
  </context>
  <context>
+Index: mythtv/i18n/mythfrontend_nl.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_cz.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_de.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_sv.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_he.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_fi.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: mythtv/i18n/mythfrontend_dk.qm
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
 Index: mythtv/configure
 ===================================================================
 --- mythtv/configure	(revision 16468)
@@ -26358,6 +26390,10 @@
  Hauppauge website for the most accurate information.</P>
  <P>A PVR-150 comes in a number of versions:
  <UL>
+Index: mythtv/docs/mythtv-HOWTO.pdf
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
 Index: mythtv/docs/index.html
 ===================================================================
 --- mythtv/docs/index.html	(revision 16468)
@@ -26387,7 +26423,7 @@
 Index: mythtv/libs/libs-targetfix.pro
 ===================================================================
 --- mythtv/libs/libs-targetfix.pro	(revision 0)
-+++ mythtv/libs/libs-targetfix.pro	(revision 19169)
++++ mythtv/libs/libs-targetfix.pro	(revision 19344)
 @@ -0,0 +1,20 @@
 +# Common project modifications to change the generated target.
 +
@@ -26679,6 +26715,55 @@
          image->SetDontRoundPosition(true);
  
          subtitleOSD->AddType(image);
+Index: mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
+===================================================================
+--- mythtv/libs/libmythtv/NuppelVideoRecorder.cpp	(revision 16468)
++++ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp	(working copy)
+@@ -981,28 +981,25 @@
+             correct_bttv = true;
+ 
+         QString driver = (char *)vcap.driver;
+-        if (driver == "cx8800" || driver == "go7007" || driver == "em28xx")
++        channelfd = open(videodevice.ascii(), O_RDWR);
++        if (channelfd < 0)
+         {
+-            channelfd = open(videodevice.ascii(), O_RDWR);
+-            if (channelfd < 0)
+-            {
+-                VERBOSE(VB_IMPORTANT, LOC_ERR +
+-                        QString("Can't open video device: %1").arg(videodevice));
+-                perror("open video:");
+-                KillChildren();
+-                return false;
+-            }
+-
+-            if (driver == "go7007")
+-            {
+-                go7007 = true;
+-            }
+-            
+-            inpixfmt = FMT_NONE;
+-            InitFilters();
+-            DoV4L2();
++            VERBOSE(VB_IMPORTANT, LOC_ERR +
++                    QString("Can't open video device: %1").arg(videodevice));
++            perror("open video:");
++            KillChildren();
+             return false;
+         }
++
++        if (driver == "go7007")
++        {
++            go7007 = true;
++        }
++ 
++        inpixfmt = FMT_NONE;
++        InitFilters();
++        DoV4L2();
++        return false;
+     }
+ 
+     channelfd = fd;
 Index: mythtv/libs/libmythtv/videoout_d3d.cpp
 ===================================================================
 --- mythtv/libs/libmythtv/videoout_d3d.cpp	(revision 16468)
@@ -26740,135 +26825,1232 @@
              (model == "GENERIC"));
  }
  
-Index: mythtv/libs/libmythtv/avformatdecoder.cpp
+Index: mythtv/libs/libmythtv/videoout_quartz.cpp
 ===================================================================
---- mythtv/libs/libmythtv/avformatdecoder.cpp	(revision 16468)
-+++ mythtv/libs/libmythtv/avformatdecoder.cpp	(working copy)
-@@ -1,6 +1,7 @@
- // C headers
- #include <cassert>
- #include <unistd.h>
-+#include <cmath>
+--- mythtv/libs/libmythtv/videoout_quartz.cpp	(revision 16468)
++++ mythtv/libs/libmythtv/videoout_quartz.cpp	(working copy)
+@@ -12,9 +12,10 @@
+  * - Other viewing options?
+  *
+  * = KNOWN BUGS
+- * - Aspect switching occasionally fails
+- * - Floating window needs testing. Resizing, or viewing something
+- *   a second time, may cause a crash (backtraces appreciated)
++ * - Drawing on the desktop only updates the main screen?
++ * - The floating window can only be created on the main screen?
++ * - The fullscreen window doesn't display anything when created
++ *   on any screen except, you guessed it, the main screen.
+  * 
+  * = REVISION
+  * $Id$
+@@ -36,11 +37,11 @@
+ // ****************************************************************************
+ 
+ #include <map>
++#include <vector>
+ #include <iostream>
++#include <algorithm>
+ using namespace std;
+ 
+-#include <qptrlist.h>
+-
+ #include "DisplayRes.h"
+ #include "yuv2rgb.h"
+ #include "uitypes.h"
+@@ -59,19 +60,73 @@
+ #include "osd.h"
+ #include "osdsurface.h"
+ #include "mythconfig.h"
++#include "mythverbose.h"
+ #include "videodisplayprofile.h"
+ #include "videoout_dvdv.h"
  
- // C++ headers
- #include <algorithm>
-@@ -51,6 +52,8 @@
+ #define LOC QString("VideoOutputQuartz: ")
+ #define LOC_ERR QString("VideoOutputQuartz Error: ")
  
- #define MAX_AC3_FRAME_SIZE 6144
+-class VideoOutputQuartzView;
++/**
++ * An abstract class for implementing QuickTime output viewports.
++ *
++ * This class is further sub-classed for different Mac OS X UI output types.
++ * e.g. Main Window, Full Screen, Dock Icon, Finder/Desktop background
++ */
++class VideoOutputQuartzView
++{
++  public:
++    VideoOutputQuartzView(QuartzData *pData);
[...10546 lines suppressed...]
++        fsInfo.directory = *(it++);
+         fsInfo.isLocal = (*(it++)).toInt();
+         fsInfo.fsID = (*(it++)).toInt();
+         fsInfo.dirID = (*(it++)).toInt();
+@@ -198,7 +192,11 @@
+     for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++)
+     {
+         if (it1->fsID == -1)
+-            it1->fsID = GetfsID(it1->dirID);
++        {
++            it1->fsID = GetfsID(it1);
++            it1->directory =
++                it1->hostname.section(".", 0, 0) + ":" + it1->directory;
++        }
+ 
+         it2 = it1;
+         for (it2++; it2 != fsInfos.end(); it2++)
+@@ -206,14 +204,14 @@
+             // Sometimes the space reported for an NFS mounted dir is slightly
              // different than when it is locally mounted because of block sizes
              if (it2->fsID == -1 &&
-                 (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) &&
+-                (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) &&
 -                (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
 +                (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
                  ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
                   <= maxWriteFiveSec))
              {
-@@ -292,7 +292,7 @@
+                 if (!it1->hostname.contains(it2->hostname))
+                     it1->hostname = it1->hostname + "," + it2->hostname;
+-                it1->directory = it1->directory + "," + it2->directory;
++                it1->directory = it1->directory + "," +
++                    it2->hostname.section(".", 0, 0) + ":" + it2->directory;
+                 fsInfos.erase(it2);
+                 it2 = it1;
+             }
+@@ -276,32 +274,56 @@
+         fsInfos.push_back(fsInfo);
+     }
+ 
++    VERBOSE(VB_SCHEDULE+VB_FILE, "Determining unique filesystems");
+     size_t maxWriteFiveSec = GetCurrentMaxBitrate(tvList)/12  /*5 seconds*/;
+     maxWriteFiveSec = max((size_t)2048, maxWriteFiveSec); // safety for NFS mounted dirs
+     vector<FileSystemInfo>::iterator it1, it2;
+     for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++)
+     {
+         if (it1->fsID == -1)
+-            it1->fsID = GetfsID(it1->dirID);
++            it1->fsID = GetfsID(it1);
+         else
+             continue;
+ 
++        VERBOSE(VB_SCHEDULE+VB_FILE,
++            QString("%1:%2 (fsID %3, dirID %4) using %5 out of %6 KB, "
++                    "looking for matches")
++                    .arg(it1->hostname).arg(it1->directory)
++                    .arg(it1->fsID).arg(it1->dirID)
++                    .arg(it1->usedSpaceKB).arg(it1->totalSpaceKB));
+         it2 = it1;
+         for (it2++; it2 != fsInfos.end(); it2++)
+         {
++            VERBOSE(VB_SCHEDULE+VB_FILE,
++                QString("    Checking %1:%2 (dirID %3) using %4 of %5 KB")
++                        .arg(it2->hostname).arg(it2->directory).arg(it2->dirID)
++                        .arg(it2->usedSpaceKB).arg(it2->totalSpaceKB));
++            VERBOSE(VB_SCHEDULE+VB_FILE,
++                QString("        Total KB Diff: %1 (want <= 32)") 
++                .arg((long)absLongLong(it1->totalSpaceKB - it2->totalSpaceKB)));
++            VERBOSE(VB_SCHEDULE+VB_FILE,
++                QString("        Used  KB Diff: %1 (want <= %2)")
++                .arg((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB))
++                .arg(maxWriteFiveSec));
++
              // Sometimes the space reported for an NFS mounted dir is slightly
              // different than when it is locally mounted because of block sizes
-             if (it2->fsID == -1 && !HasfsID(it2->dirID) &&
+-            if (it2->fsID == -1 && !HasfsID(it2->dirID) &&
 -                (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) &&
++            if (it2->fsID == -1 &&
 +                (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) &&
                  ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB)
                   <= maxWriteFiveSec))
              {
+                 it2->fsID = it1->fsID;
++
++                VERBOSE(VB_SCHEDULE+VB_FILE,
++                    QString("    MATCH Found: %1:%2 will use fsID %3")
++                            .arg(it2->hostname).arg(it2->directory)
++                            .arg(it2->fsID));
+             }
+         }
+     }
+ 
+-    if (print_verbose_messages & VB_FILE)
++    if (print_verbose_messages & (VB_FILE|VB_SCHEDULE))
+     {
+         cout << "--- GetFilesystemInfos directory list start ---" << endl;
+         for (it1 = fsInfos.begin(); it1 != fsInfos.end(); it1++)
+@@ -313,7 +335,8 @@
+             else
+                 cout << "Remote";
+             cout << endl;
+-            cout << "     Drive ID: " << it1->fsID << endl;
++            cout << "     fsID    : " << it1->fsID << endl;
++            cout << "     dirID   : " << it1->dirID << endl;
+             cout << "     TotalKB : " << it1->totalSpaceKB << endl;
+             cout << "     UsedKB  : " << it1->usedSpaceKB << endl;
+             cout << "     FreeKB  : " << it1->freeSpaceKB << endl;
 Index: mythtv/programs/mythtv-setup/setup.xml
 ===================================================================
 --- mythtv/programs/mythtv-setup/setup.xml	(revision 16468)
@@ -40784,7 +44946,7 @@
 Index: mythtv/contrib/Win32/build/mythtvsetup.iss
 ===================================================================
 --- mythtv/contrib/Win32/build/mythtvsetup.iss	(revision 0)
-+++ mythtv/contrib/Win32/build/mythtvsetup.iss	(revision 19169)
++++ mythtv/contrib/Win32/build/mythtvsetup.iss	(revision 19344)
 @@ -0,0 +1,493 @@
 +; Script generated by the Inno Setup Script Wizard.
 +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
@@ -41288,7 +45450,7 @@
 Index: mythtv/contrib/Win32/MythInstaller.bat
 ===================================================================
 --- mythtv/contrib/Win32/MythInstaller.bat	(revision 0)
-+++ mythtv/contrib/Win32/MythInstaller.bat	(revision 19169)
++++ mythtv/contrib/Win32/MythInstaller.bat	(revision 19344)
 @@ -0,0 +1,69 @@
 + at rem = '--*-Perl-*--
 + at rem
@@ -41370,7 +45532,7 @@
 Index: mythtv/contrib/Win32/run/mythfrontend.cmd
 ===================================================================
 --- mythtv/contrib/Win32/run/mythfrontend.cmd	(revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd	(revision 19169)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd	(revision 19344)
 @@ -0,0 +1,57 @@
 + at Echo off
 +::
@@ -41432,7 +45594,7 @@
 Index: mythtv/contrib/Win32/run/mythbackend.cmd
 ===================================================================
 --- mythtv/contrib/Win32/run/mythbackend.cmd	(revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd	(revision 19169)
++++ mythtv/contrib/Win32/run/mythbackend.cmd	(revision 19344)
 @@ -0,0 +1,58 @@
 + at Echo off
 +::
@@ -41555,6 +45717,51 @@
  # make
  [ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
  [ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
+Index: mythtv/contrib/OSX/osx-packager.pl
+===================================================================
+--- mythtv/contrib/OSX/osx-packager.pl	(revision 16468)
++++ mythtv/contrib/OSX/osx-packager.pl	(working copy)
+@@ -7,7 +7,7 @@
+ ### $Id$
+ ###
+ ### = location
+-### http://svn.mythtv.org/svn/trunk/mythtv/contrib/OSX/osx-packager.pl
++### http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythtv/contrib/OSX/osx-packager.pl
+ ###
+ ### = description
+ ### Tool for automating frontend builds on Mac OS X.
+@@ -577,6 +577,7 @@
+   'mythtv'
+   =>  [
+         '--prefix=' . $PREFIX,
++        '--runtime-prefix=../Resources',
+         # To "cross compile" something for a lesser Mac:
+         #'--tune=G3',
+         #'--disable-altivec',
+@@ -1041,6 +1042,13 @@
+ if ( $OPT{'verbose'} )
+ {   push @bundler, '--verbose'   }
+ 
++### Framework that has a screwed up link dependency path
++my $AVCfw = '/Developer/FireWireSDK*/Examples/' .
++            'Framework/AVCVideoServices.framework';
++my @AVCfw = split / /, `ls -d $AVCfw`;
++my $AVCfw = pop @AVCfw;
++chop $AVCfw;
++
+ ### Create each package.
+ ### Note that this is a bit of a waste of disk space,
+ ### because there are now multiple copies of each library.
+@@ -1072,6 +1080,9 @@
+   # Remove copy of binary
+   unlink "$SCRIPTDIR/$target" or die;
+ 
++  if ( $AVCfw )
++  {  &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks")  }
++
+  if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ )
+  {
+   my $res  = "$finalTarget/Contents/Resources";
 Index: mythtv/contrib/channel_changers/6200ch.c
 ===================================================================
 --- mythtv/contrib/channel_changers/6200ch.c	(revision 16468)


Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mythtv.spec	29 Nov 2008 06:29:50 -0000	1.13
+++ mythtv.spec	12 Dec 2008 03:44:15 -0000	1.14
@@ -1,5 +1,5 @@
 # svn revision number
-%define _svnver r19169
+%define _svnver r19344
 %define branch release-0-21-fixes
 # Nb: base 0.21 svn rev is r16468
 #define branch trunk
@@ -22,7 +22,7 @@
 %if "%{branch}" == "trunk"
 Release: 0.2.%{_svnver}%{?dist}
 %else
-Release: 14%{?dist}
+Release: 15%{?dist}
 %endif
 URL: http://www.mythtv.org/
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -255,6 +255,8 @@
 Group: Applications/Multimedia
 Requires: lame
 Requires: mythtv-common = %{version}-%{release}
+# libraw1394 2.0.0-5 for f10+ and 1.3.0-11 for f9 contain a critical fix
+Requires: libraw1394 >= 2.0.0-5
 Conflicts: xmltv-grabbers < 0.5.37
 
 %description backend
@@ -772,6 +774,7 @@
 %files common
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/mythtv
+%dir %{_datadir}/mythtv
 %config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
 %config(noreplace) %{_sysconfdir}/mythtv/config.xml
 %{_bindir}/mythcommflag
@@ -826,7 +829,8 @@
 %{_bindir}/mythlcdserver
 %{_bindir}/mythshutdown
 %{_bindir}/mythwelcome
-%{_libdir}/mythtv/filters
+%dir %{_libdir}/mythtv
+%dir %{_libdir}/mythtv/filters
 %dir %{_libdir}/mythtv/plugins
 %{_datadir}/mythtv/*.ttf
 %dir %{_datadir}/mythtv/i18n
@@ -848,6 +852,7 @@
 %{_includedir}/*
 %{_libdir}/*.so
 %exclude %{_libdir}/*.a
+%dir %{_datadir}/mythtv/build
 %{_datadir}/mythtv/build/settings.pro
 
 %files -n mythplugins
@@ -1003,6 +1008,8 @@
 %{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
 
@@ -1015,6 +1022,12 @@
 %endif
 
 %changelog
+* Thu Dec 11 2008 Jarod Wilson <jarod at wilsonet.com> - 0.21-15
+- Update to release-0-21-fixes patches (r19344)
+- Includes critical fix for supporting use of FireWire cable
+  boxes w/Fedora's native FireWire driver stack (finally!)
+- Fix missing package ownership of some stray dirs (rpmfusion bz#222)
+
 * Fri Nov 28 2008 Jarod Wilson <jarod at wilsonet.com> - 0.21-14
 - Update release-0-21-fixes patches (r19169)
 - Should resolve 720p playback stutter, rpmfusion bz#186



More information about the rpmfusion-commits mailing list