rpms/mythtv/devel 99-mythbackend.rules, NONE,
1.1 mythtv-0.24.2-fixes.patch, NONE, 1.1 .cvsignore, 1.6,
1.7 mythbackend.service, 1.2, 1.3 mythtv.spec, 1.85,
1.86 sources, 1.51, 1.52 mythplugins-0.24.1-fixes.patch, 1.3,
NONE mythtv-0.24.1-fixes.patch, 1.3,
NONE mythtv-0.24.1-glu_h_gluErrorString.patch, 1.1,
NONE mythweb-0.24.1-fixes.patch, 1.1, NONE
Richard Shaw
hobbes1069 at rpmfusion.org
Thu Feb 2 04:36:03 CET 2012
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30786
Modified Files:
.cvsignore mythbackend.service mythtv.spec sources
Added Files:
99-mythbackend.rules mythtv-0.24.2-fixes.patch
Removed Files:
mythplugins-0.24.1-fixes.patch mythtv-0.24.1-fixes.patch
mythtv-0.24.1-glu_h_gluErrorString.patch
mythweb-0.24.1-fixes.patch
Log Message:
* Sun Jan 29 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.24.2-1
- Update to latest version.
- Update mythbackend systemd service file for better compatibilty with devices
that take time to initialize due to firmware loading.
- Add dependency m2vrequantiser for mytharchive.
--- NEW FILE 99-mythbackend.rules ---
# Do not edit this file, it will be overwritten on update
# If you need to make changes to this file create a copy in
# /etc/udev/rules.d first.
# This file is part of the packaging of MythTV
#
# MythTV is free software; view http://www.mythtv.org
# for more information.
#
# The purpose of this set of rules is to ensure that
# systemd will create device units that the backend
# startup can (optionally) wait on.
#
#
# Insure that systemd creates device units for capture devices
#
SUBSYSTEM=="video4linux", TAG+="systemd"
SUBSYSTEM=="dvb", TAG+="systemd"
SUBSYSTEM=="firewire", TAG+="systemd"
mythtv-0.24.2-fixes.patch:
avformatdecoder.cpp | 9 +++++++--
cc708decoder.cpp | 7 +++++++
cc708decoder.h | 1 +
eitfixup.h | 2 +-
recordinginfo.cpp | 7 ++++++-
5 files changed, 22 insertions(+), 4 deletions(-)
--- NEW FILE mythtv-0.24.2-fixes.patch ---
mythtv/libs/libmythtv/avformatdecoder.cpp | 9 +++++++--
mythtv/libs/libmythtv/cc708decoder.cpp | 7 +++++++
mythtv/libs/libmythtv/cc708decoder.h | 1 +
mythtv/libs/libmythtv/eitfixup.h | 2 +-
mythtv/libs/libmythtv/recordinginfo.cpp | 7 ++++++-
5 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
index 896ad11..655cfa8 100644
--- a/mythtv/libs/libmythtv/avformatdecoder.cpp
+++ b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -2577,14 +2577,19 @@ void AvFormatDecoder::DecodeDTVCC(const uint8_t *buf, uint len)
{
uint cc_code = buf[2+(cur*3)];
bool cc_valid = cc_code & 0x04;
- if (!cc_valid)
- continue;
uint data1 = buf[3+(cur*3)];
uint data2 = buf[4+(cur*3)];
uint data = (data2 << 8) | data1;
uint cc_type = cc_code & 0x03;
+ if (!cc_valid)
+ {
+ if (cc_type >= 0x2)
+ ccd708->decode_cc_null();
+ continue;
+ }
+
if (cc_type <= 0x1) // EIA-608 field-1/2
{
if (cc608_good_parity(cc608_parity_table, data))
diff --git a/mythtv/libs/libmythtv/cc708decoder.cpp b/mythtv/libs/libmythtv/cc708decoder.cpp
index 4214772..4fe3bbf 100644
--- a/mythtv/libs/libmythtv/cc708decoder.cpp
+++ b/mythtv/libs/libmythtv/cc708decoder.cpp
@@ -62,6 +62,13 @@ void CC708Decoder::decode_cc_data(uint cc_type, uint data1, uint data2)
}
}
+void CC708Decoder::decode_cc_null(void)
+{
+ if (partialPacket.size && reader)
+ parse_cc_packet(reader, &partialPacket, last_seen);
+ partialPacket.size = 0;
+}
+
void CC708Decoder::services(uint seconds, bool seen[64]) const
{
time_t now = time(NULL);
diff --git a/mythtv/libs/libmythtv/cc708decoder.h b/mythtv/libs/libmythtv/cc708decoder.h
index 4a00073..2b403aa 100644
--- a/mythtv/libs/libmythtv/cc708decoder.h
+++ b/mythtv/libs/libmythtv/cc708decoder.h
@@ -32,6 +32,7 @@ class CC708Decoder
~CC708Decoder() {}
void decode_cc_data(uint cc_type, uint data1, uint data2);
+ void decode_cc_null(void);
/// \return Services seen in last few seconds as specified.
void services(uint seconds, bool[64]) const;
diff --git a/mythtv/libs/libmythtv/eitfixup.h b/mythtv/libs/libmythtv/eitfixup.h
index a724506..39f732a 100644
--- a/mythtv/libs/libmythtv/eitfixup.h
+++ b/mythtv/libs/libmythtv/eitfixup.h
@@ -134,8 +134,8 @@ class EITFixUp
const QRegExp m_ukYearColon;
const QRegExp m_ukExclusionFromSubtitle;
const QRegExp m_ukCompleteDots;
- const QRegExp m_ukQuotedSubtitle;
const QRegExp m_ukAllNew;
+ const QRegExp m_ukQuotedSubtitle;
const QRegExp m_comHemCountry;
const QRegExp m_comHemDirector;
const QRegExp m_comHemActor;
diff --git a/mythtv/libs/libmythtv/recordinginfo.cpp b/mythtv/libs/libmythtv/recordinginfo.cpp
index 3e2e7a9..9f90d97 100644
--- a/mythtv/libs/libmythtv/recordinginfo.cpp
+++ b/mythtv/libs/libmythtv/recordinginfo.cpp
@@ -518,7 +518,12 @@ void RecordingInfo::ApplyRecordStateChange(RecordingType newstate, bool save)
record->m_type = newstate;
if (save)
- record->Save();
+ {
+ if (newstate == kNotRecording)
+ record->Delete();
+ else
+ record->Save();
+ }
}
/** \fn RecordingInfo::ApplyRecordRecPriorityChange(int)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 17 May 2011 22:34:18 -0000 1.6
+++ .cvsignore 2 Feb 2012 03:36:03 -0000 1.7
@@ -1,12 +1,2 @@
-mythfrontend.png
-mythtv-setup.png
-mythplugins-0.21.tar.bz2
-mythtv-0.21.tar.bz2
-mythtv-0.22.tar.bz2
-mythplugins-0.22.tar.bz2
-mythtv-0.23.tar.bz2
-mythplugins-0.23.tar.bz2
-mythplugins-0.24.tar.bz2
-mythtv-0.24.tar.bz2
-mythplugins-0.24.1.tar.bz2
-mythtv-0.24.1.tar.bz2
+MythTV-mythtv-v0.24.2-0-g4627dc9.tar.gz
+MythTV-mythweb-v0.24.2-0-g946deb7.tar.gz
Index: mythbackend.service
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythbackend.service,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythbackend.service 23 Nov 2011 15:27:40 -0000 1.2
+++ mythbackend.service 2 Feb 2012 03:36:03 -0000 1.3
@@ -1,3 +1,34 @@
+# Do not edit this file, it will be replaced on update
+# If you need to make modifications to this unit file first make a copy in
+# /etc/systemd/system
+
+# This file is part of the packaging of MythTV
+#
+# MythTV is free software; view http://www.mythtv.org
+# for more information.
+#
+# It is sometimes necessary to wait for a capture
+# device to finish (hot)plug initialization before
+# the backend starts. If this is necessary,
+# create a Wants and After entry for all the capture
+# devices that one wishes to wait to be created
+# before the backend starts using the systemd
+# device name mangling names (/dev/some/thing turns
+# into dev-some-thing.device). These normally should
+# be udev persistent filename rules to avoid confusion.
+# See the MythTV wiki for udev persistent filename
+# discussions found at:
+# http://www.mythtv.org/wiki/Device_Filenames_and_udev
+#
+# In order to insure that systemd will create a
+# device unit for the capture device, one must
+# insure that udev will have the tag "systemd"
+# (i.e. add TAG+="systemd" to the udev rule).
+#
+# The MythTV package ships with a default udev
+# rule file located in: /lib/udev/rules.d/99-mythbackend.rules
+
+
[Unit]
Description=MythTV backend service
After=network.target mysqld.service
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mythtv.spec 23 Nov 2011 15:27:41 -0000 1.85
+++ mythtv.spec 2 Feb 2012 03:36:03 -0000 1.86
@@ -3,6 +3,7 @@
#
# by: Chris Petersen <rpm at forevermore.net>
# Jarod Wilson <jarod at wilsonet.com>
+# Richard Shaw <hobbes1069 at gmail.com>
#
# Modified/Extended from the great work of:
# Axel Thimm <Axel.Thimm at ATrpms.net>
@@ -62,11 +63,19 @@
%define desktop_applications mythfrontend mythtv-setup
# The vendor name we should attribute the aforementioned entries to
-%define desktop_vendor RPMFusion
+%define desktop_vendor RPMFusion
# Git revision and branch ID
# 0.24 release: git tag v0.24.1
-%define _gitrev e89d6a9f7e
+%define _gitrev 40f3bae
+
+# Mythtv and plugins from github.com
+%global githash1 g4627dc9
+%global githash2 c239b59
+# Mythweb from github.com
+%global githash3 g946deb7
+%global githash4 28a6e31
+
%define branch fixes/0.24
#
@@ -78,17 +87,17 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.24.1
+Version: 0.24.2
%if "%{branch}" == "master"
-Release: 0.1.git.%{_gitrev}%{?dist}
+Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 5%{?dist}
+Release: 1%{?dist}
%endif
# 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+)
+License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+)
################################################################################
@@ -130,11 +139,13 @@
################################################################################
-Source0: mythtv-%{version}.tar.bz2
-Source1: mythplugins-%{version}.tar.bz2
+#Source0: mythtv-%{version}.tar.bz2
+#Source1: mythplugins-%{version}.tar.bz2
+Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
+Source1: MythTV-mythweb-v%{version}-0-%{githash3}.tar.gz
Patch0: mythtv-%{version}-fixes.patch
-Patch1: mythplugins-%{version}-fixes.patch
-#Patch2: mythweb-%{version}-fixes.patch\
+#Patch1: mythplugins-%{version}-fixes.patch
+
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig
Source102: mythbackend.init
@@ -145,6 +156,7 @@
Source108: mythtv-setup.png
Source109: mythtv-setup.desktop
Source110: mysql.txt
+Source111: 99-mythbackend.rules
Source401: mythweb.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -181,12 +193,8 @@
BuildRequires: freetype-devel >= 2
BuildRequires: gcc-c++
BuildRequires: mysql-devel >= 5
-%if 0%{?fedora} >= 14
BuildRequires: qt-webkit-devel
BuildRequires: qt-devel >= 4.4
-%else
-BuildRequires: qt4-devel >= 4.4
-%endif
BuildRequires: phonon-devel
BuildRequires: lm_sensors-devel
@@ -323,6 +331,8 @@
Requires: perl(Image::Size)
BuildRequires: perl(SOAP::Lite)
Requires: perl(SOAP::Lite)
+BuildRequires: perl(JSON)
+Requires: perl(JSON)
%endif
%if %{with_mythzoneminder}
@@ -348,11 +358,7 @@
Requires: mythtv-setup = %{version}-%{release}
Requires: perl-MythTV = %{version}-%{release}
Requires: python-MythTV = %{version}-%{release}
-
Requires: mythplugins = %{version}-%{release}
-# These are available via mythtv's built-in theme downloader now,
-# so lets not install them by default.
-#Requires: mythtv-themes = %{version}
Requires: mysql-server >= 5, mysql >= 5
# XMLTV is not yet packaged for rpmfusion
@@ -366,7 +372,7 @@
%description
MythTV provides a unified graphical interface for recording and viewing
-television programs. Refer to the mythtv package for more information.
+television programs. Refer to the mythtv package for more information.
There are also several add-ons and themes available. In order to facilitate
installations with smart/apt-get/yum and other related package
@@ -375,7 +381,7 @@
MythTV implements the following DVR features, and more, with a
unified graphical interface:
- - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
+ - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
- Video compression using RTjpeg or MPEG-4, and support for DVB and
hardware encoder cards/devices.
- Program listing retrieval using XMLTV
@@ -518,8 +524,8 @@
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
Provides: mythtv-frontend-api = %{mythfeapiver}
-Obsoletes: mythcontrols < %{version}-%{release}
-Provides: mythcontrols = %{version}-%{release}
+Obsoletes: mythcontrols < %{version}-%{release}
+Provides: mythcontrols = %{version}-%{release}
%description frontend
MythTV provides a unified graphical interface for recording and viewing
@@ -670,6 +676,7 @@
Requires: python >= 2.3.5
Requires: python-imaging
Requires: transcode >= 1.0.2
+Requires: m2vrequantiser
%description -n mytharchive
MythArchive is a new plugin for MythTV that lets you create DVDs from
@@ -839,7 +846,20 @@
################################################################################
%prep
-%setup -q -c -a 1
+#### MythWeb
+# Provided as a separate download so we deal with it here.
+%setup -q -T -b 1 -n MythTV-mythweb-%{githash4}
+
+# Fix up permissions for MythWeb
+ chmod -R g-w ./*
+
+# Remove execute bits from some php mythweb files
+# chmod -x mythweb/classes/*.php
+
+
+#### MythTV
+#setup -q -c -a 1
+%setup -q -n MythTV-%{name}-%{githash2}
# Replace static lib paths with %{_lib} so we build properly on x86_64
# systems, where the libs are actually in lib64.
@@ -849,10 +869,10 @@
grep -rlZ '/lib ' . | xargs -r0 sed -i -e 's,/lib ,/%{_lib} ,g'
fi
-##### MythTV
+%patch0 -p1 -b .mythtv
+#patch1 -p1 -b .mythplug
-cd mythtv-%{version}
-%patch0 -p2
+pushd mythtv
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -879,14 +899,13 @@
sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure
# On to mythplugins
-cd ..
+popd
+
##### MythPlugins
%if %{with_plugins}
-cd mythplugins-%{version}
-%patch1 -p2
-#patch2 -p1
+pushd mythplugins
# Fix /mnt/store -> /var/lib/mythmusic
cd mythmusic
@@ -898,16 +917,11 @@
sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp
cd ..
-# Fix up permissions for MythWeb
- cd mythweb
- chmod -R g-w ./*
- cd ..
+# And back to the compile root
+popd
+
-# Remove execute bits from some php mythweb files
- chmod -x mythweb/classes/*.php
-# And back to the compile root
-cd ..
%endif
@@ -916,7 +930,7 @@
%build
# First, we build MythTV
-cd mythtv-%{version}
+pushd mythtv
# Similar to 'percent' configure, but without {_target_platform} and
# {_exec_prefix} etc... MythTV no longer accepts the parameters that the
@@ -996,15 +1010,15 @@
make %{?_smp_mflags}
# Prepare to build the plugins
- cd ..
- mkdir temp
- temp=`pwd`/temp
- make -C mythtv-%{version} install INSTALL_ROOT=$temp
+ popd
+ mkdir fakeroot
+ temp=`pwd`/fakeroot
+ make -C mythtv install INSTALL_ROOT=$temp
export LD_LIBRARY_PATH=$temp%{_libdir}:$LD_LIBRARY_PATH
# Next, we build the plugins
%if %{with_plugins}
-cd mythplugins-%{version}
+pushd mythplugins
# Fix things up so they can find our "temp" install location for mythtv-libs
echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
@@ -1082,7 +1096,7 @@
make %{?_smp_mflags}
- cd ..
+ popd
%endif
################################################################################
@@ -1093,7 +1107,7 @@
rm -rf %{buildroot}
# First, install MythTV
-cd mythtv-%{version}
+pushd mythtv
make install INSTALL_ROOT=%{buildroot}
@@ -1115,15 +1129,19 @@
# chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth*.py
# mysql.txt and other config/init files
- install -m 644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
+ install -m 0644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
%if 0%{?fedora} >= 16
- install -p -m 644 %{SOURCE104} %{buildroot}%{_unitdir}/
+ install -p -m 0644 %{SOURCE104} %{buildroot}%{_unitdir}/
+ # Install udev rules for devices that may initialize late in the boot
+ # process so they are available for mythbackend.
+ mkdir -p %{buildroot}/lib/udev/rules.d/
+ install -p -m 0644 %{SOURCE111} %{buildroot}/lib/udev/rules.d/
%else
- install -p -m 755 %{SOURCE102} %{buildroot}%{_sysconfdir}/init.d/mythbackend
- install -p -m 644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/mythbackend
+ install -p -m 0755 %{SOURCE102} %{buildroot}%{_sysconfdir}/init.d/mythbackend
+ install -p -m 0644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/mythbackend
%endif
- install -p -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/logrotate.d/mythbackend
+ install -p -m 0644 %{SOURCE103} %{buildroot}%{_sysconfdir}/logrotate.d/mythbackend
# Desktop entries
mkdir -p %{buildroot}%{_datadir}/pixmaps
@@ -1143,11 +1161,11 @@
mkdir -p %{buildroot}%{_datadir}/mythtv/build/
install -p -m 644 settings.pro %{buildroot}%{_datadir}/mythtv/build/
- cd ..
+popd
# MythPlugins
%if %{with_plugins}
-cd mythplugins-%{version}
+pushd mythplugins
make install INSTALL_ROOT=%{buildroot}
@@ -1174,9 +1192,10 @@
ln -s ../../../../../%{_sysconfdir}/mythgame/ \
%{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml
%endif
+popd
%if %{with_mythweb}
- cd mythweb
+ pushd ../MythTV-mythweb-%{githash4}
mkdir -p %{buildroot}%{_datadir}/mythweb
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
@@ -1185,11 +1204,10 @@
cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/
# drop .htaccess file, settings handled in the above
rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
- cd ..
+ popd
%endif
# And back to the build/install root
- cd ..
%endif
################################################################################
@@ -1209,10 +1227,10 @@
getent passwd mythtv >/dev/null || \
useradd -r -g mythtv -d %{_localstatedir}/lib/mythtv -s /sbin/nologin \
-c "mythbackend user" mythtv
-exit 0
# Make sure the mythtv user is in the audio and video group for existing
# or new installs.
usermod -a -G audio,video mythtv
+exit 0
%post backend
%if 0%{?fedora} >= 16
@@ -1274,16 +1292,16 @@
%files docs
%defattr(-,root,root,-)
-%doc mythtv-%{version}/README*
-%doc mythtv-%{version}/UPGRADING
-%doc mythtv-%{version}/AUTHORS
-%doc mythtv-%{version}/COPYING
-%doc mythtv-%{version}/FAQ
-%doc mythtv-%{version}/database mythtv-%{version}/keys.txt
-%doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png
-%doc mythtv-%{version}/docs/*.txt
-%doc mythtv-%{version}/PACKAGE-LICENSING
-%doc mythtv-%{version}/contrib
+%doc mythtv/README*
+%doc mythtv/UPGRADING
+%doc mythtv/AUTHORS
+%doc mythtv/COPYING
+%doc mythtv/FAQ
+%doc mythtv/database mythtv/keys.txt
+%doc mythtv/docs/*.html mythtv/docs/*.png
+%doc mythtv/docs/*.txt
+%doc mythtv/PACKAGE-LICENSING
+%doc mythtv/contrib
%files common
%defattr(-,root,root,-)
@@ -1311,6 +1329,7 @@
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv
%if 0%{?fedora} >=16
%{_unitdir}/mythbackend.service
+/lib/udev/rules.d/99-mythbackend.rules
%else
%{_sysconfdir}/init.d/mythbackend
%config(noreplace) %{_sysconfdir}/sysconfig/mythbackend
@@ -1398,15 +1417,15 @@
%if %{with_plugins}
%files -n mythplugins
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/COPYING
+%doc mythplugins/COPYING
%if %{with_mytharchive}
%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
+%doc mythplugins/mytharchive/AUTHORS
+%doc mythplugins/mytharchive/COPYING
+%doc mythplugins/mytharchive/README
+%doc mythplugins/mytharchive/TODO
%{_bindir}/mytharchivehelper
%{_libdir}/mythtv/plugins/libmytharchive.so
%{_datadir}/mythtv/archivemenu.xml
@@ -1418,9 +1437,9 @@
%if %{with_mythbrowser}
%files -n mythbrowser
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythbrowser/AUTHORS
-%doc mythplugins-%{version}/mythbrowser/COPYING
-%doc mythplugins-%{version}/mythbrowser/README
+%doc mythplugins/mythbrowser/AUTHORS
+%doc mythplugins/mythbrowser/COPYING
+%doc mythplugins/mythbrowser/README
%{_libdir}/mythtv/plugins/libmythbrowser.so
%{_datadir}/mythtv/i18n/mythbrowser_*.qm
%endif
@@ -1428,12 +1447,12 @@
%if %{with_mythgallery}
%files -n mythgallery
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythgallery/AUTHORS
-%doc mythplugins-%{version}/mythgallery/COPYING
-%doc mythplugins-%{version}/mythgallery/README
+%doc mythplugins/mythgallery/AUTHORS
+%doc mythplugins/mythgallery/COPYING
+%doc mythplugins/mythgallery/README
%{_libdir}/mythtv/plugins/libmythgallery.so
%{_datadir}/mythtv/i18n/mythgallery_*.qm
-%{_localstatedir}/lib/pictures
+%attr(-,mythtv,mythtv) %{_localstatedir}/lib/pictures
%endif
%if %{with_mythgame}
@@ -1453,9 +1472,9 @@
%if %{with_mythmusic}
%files -n mythmusic
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythmusic/AUTHORS
-%doc mythplugins-%{version}/mythmusic/COPYING
-%doc mythplugins-%{version}/mythmusic/README
+%doc mythplugins/mythmusic/AUTHORS
+%doc mythplugins/mythmusic/COPYING
+%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
%{_localstatedir}/lib/mythmusic
%{_datadir}/mythtv/musicmenu.xml
@@ -1466,9 +1485,9 @@
%if %{with_mythnews}
%files -n mythnews
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythnews/AUTHORS
-%doc mythplugins-%{version}/mythnews/COPYING
-%doc mythplugins-%{version}/mythnews/README
+%doc mythplugins/mythnews/AUTHORS
+%doc mythplugins/mythnews/COPYING
+%doc mythplugins/mythnews/README
%{_libdir}/mythtv/plugins/libmythnews.so
%{_datadir}/mythtv/mythnews
%{_datadir}/mythtv/i18n/mythnews_*.qm
@@ -1477,22 +1496,22 @@
%if %{with_mythvideo}
%files -n mythvideo
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythvideo/COPYING
-%doc mythplugins-%{version}/mythvideo/README*
+%doc mythplugins/mythvideo/COPYING
+%doc mythplugins/mythvideo/README*
%{_libdir}/mythtv/plugins/libmythvideo.so
%{_datadir}/mythtv/mythvideo
%{_datadir}/mythtv/i18n/mythvideo_*.qm
%{_datadir}/mythtv/video_settings.xml
%{_datadir}/mythtv/videomenu.xml
-%{_localstatedir}/lib/mythvideo
+%attr(-,mythtv,mythtv) %{_localstatedir}/lib/mythvideo
%endif
%if %{with_mythweather}
%files -n mythweather
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythweather/AUTHORS
-%doc mythplugins-%{version}/mythweather/COPYING
-%doc mythplugins-%{version}/mythweather/README
+%doc mythplugins/mythweather/AUTHORS
+%doc mythplugins/mythweather/COPYING
+%doc mythplugins/mythweather/README
%{_libdir}/mythtv/plugins/libmythweather.so
%{_datadir}/mythtv/i18n/mythweather_*.qm
%{_datadir}/mythtv/weather_settings.xml
@@ -1503,7 +1522,8 @@
%if %{with_mythweb}
%files -n mythweb
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythweb/README
+%doc ../MythTV-mythweb-%{githash4}/README
+%doc ../MythTV-mythweb-%{githash4}/LICENSE
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
%defattr(-,apache,apache,0775)
%dir %{_datadir}/mythweb
@@ -1522,9 +1542,9 @@
%if %{with_mythnetvision}
%files -n mythnetvision
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythnetvision/AUTHORS
-%doc mythplugins-%{version}/mythnetvision/ChangeLog
-%doc mythplugins-%{version}/mythnetvision/README
+%doc mythplugins/mythnetvision/AUTHORS
+%doc mythplugins/mythnetvision/ChangeLog
+%doc mythplugins/mythnetvision/README
%{_bindir}/mythfillnetvision
%{_libdir}/mythtv/plugins/libmythnetvision.so
%{_datadir}/mythtv/mythnetvision
@@ -1537,6 +1557,17 @@
################################################################################
%changelog
+* Sun Jan 29 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.24.2-1
+- Update to latest version.
+- Update mythbackend systemd service file for better compatibilty with devices
+ that take time to initialize due to firmware loading.
+- Add dependency m2vrequantiser for mytharchive.
+
+* Mon Dec 12 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.24.1-6
+- Fix %%post to make sure group membership gets set for the mythtv user.
+- Fix ownership of mythtv directories.
+- Update to latest 0.24.1-fixes, git revision 40f3bae.
+
* Mon Nov 21 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.24.1-5
- Fix typo in spec file causing mythtv user to not be created (#2051).
- Change mythbackend systemd type to "simple" and other fixes (#2016).
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources 17 May 2011 22:34:20 -0000 1.51
+++ sources 2 Feb 2012 03:36:03 -0000 1.52
@@ -1,4 +1,2 @@
-be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
-be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-6870c679619ec58456e76839745411d8 mythtv-0.24.1.tar.bz2
-3fbe948f05263000fb50ec20d89835b6 mythplugins-0.24.1.tar.bz2
+89473db072e917ece75ead18666cd912 MythTV-mythtv-v0.24.2-0-g4627dc9.tar.gz
+25420e68e1b5d35fb8a53a4ffc8258b7 MythTV-mythweb-v0.24.2-0-g946deb7.tar.gz
--- mythplugins-0.24.1-fixes.patch DELETED ---
--- mythtv-0.24.1-fixes.patch DELETED ---
--- mythtv-0.24.1-glu_h_gluErrorString.patch DELETED ---
--- mythweb-0.24.1-fixes.patch DELETED ---
More information about the rpmfusion-commits
mailing list