Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31375 Modified Files: .cvsignore ChangeLog mythtv.spec sources Removed Files: mysql.txt mythtv-0.25.1-hls_profile.patch mythtv-0.25.1-php54.patch mythtv-0.25.2-fixes.patch Log Message: * Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.26.0-1 - Update to latest upstream release. - Remove mysql.txt as it is no longer used. - Fix lib -> lib64 replacement command to be more accurate and support mythzmq - Add mythzmq stuff Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 22 Jul 2012 18:42:46 -0000 1.10 +++ .cvsignore 29 Oct 2012 02:04:24 -0000 1.11 @@ -1 +1 @@ -MythTV-mythtv-v0.25.2-0-g4e44650.tar.gz +MythTV-mythtv-v0.26.0-0-g6c3ae81.tar.gz View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 ChangeLog Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ChangeLog 25 Aug 2012 16:55:34 -0000 1.3 +++ ChangeLog 29 Oct 2012 02:04:24 -0000 1.4 @@ -1,3 +1,242 @@ +commit 117b611ebdaf1c1710a1ccbcb2ffdeee06c92057 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Thu Oct 25 15:16:38 2012 -0400 + + Tweak DictData behavior to properly function with Properties. + (cherry picked from commit 662b5e83cfa103fc3aed86c194b2fa2c6b9424d8) + +commit d0c153bcc0567dd9ac97856563f05ba368654077 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Thu Oct 25 15:14:27 2012 -0400 + + Correct handling of Artwork when database field is set to NULL. + (cherry picked from commit 4646e7f56fc97f62d05d42b5896e8eceb361492e) + +commit fe9f6fab3b9c43c98067ff0c3d62f136f2858d60 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Tue Oct 23 15:51:05 2012 -0400 + + Use 'unicode' rather than 'str' for UTF8 compatibility. + (cherry picked from commit 0bc83db48ec08b8df576c6ecbf1049567d34ab7a) + +commit 175b741f2d66eb8e795e9be65686c1141aec6efa +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Tue Oct 23 15:42:31 2012 -0400 + + Fix immutable methods in Artwork class. + + This fixes an issue with several immutable methods in the Artwork class, + inherited from the parent UserString class. As the Artwork class is + modified for use as a property, and not intended to be called directly + for storage of a string, the inherited UserString methods that returned + a new instance using the __class__ attribute would fail. This adds a + __new__ method that detects such uses and forces the call to return a + standard str type instead. + (cherry picked from commit 9f66fa0f9a4d9d759b9fdb44f411a4dc1a0748cb) + +commit 4176baab0a6371be7d21b8ad3500ce663391dfd7 +Author: Bill <billstuff2001(a)sbcglobal.net&gt; +Date: Fri Oct 12 13:47:27 2012 -0400 + + Fixes #11061. Speed up TFW recovery after falling behind on writes. + + Signed-off-by: Daniel Thor Kristjansson <danielk(a)cuymedia.net&gt; + +commit 2103465e70f0eda760d4cd25abd49078add273d3 +Author: Jonatan Lindblad <jlindblad(a)mythtv.org&gt; +Date: Sun Oct 21 14:07:49 2012 +0200 + + MythUI: Fix potential use after free when leaving a web page + + It's not safe to delete a QNetworkAccessManager before the QWebPage it is being + used with since any outstanding QNetworkReplys will be deleted, causing + QWebPage to potentially access free memory. + + Fixes #11168. + (cherry picked from commit 83e88bc0abe21f54daace479ac921c352710c9de) + +commit 1fa9479b11791c60860d88eb37ad2033251d8957 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Thu Oct 18 15:20:35 2012 -0400 + + Fix setting of values to Artwork property. + + This makes the Artwork property derived from a MutableString rather than + a unicode type, allowing the setting of values to work properly, rather + than merely by chance, and correcting an issue where importMetadata + would not apply a coverart value to Video Library entries. + (cherry picked from commit e4b46f0cdc1a18ee5dca94e29229531d928a6dc1) + +commit 84431ca786a4543623fb3a293b0ec18d49194338 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Wed Oct 10 10:52:24 2012 -0400 + + Add reporting of logging volume to Smolt. + + This reports the logging volume as a percentage of the total amount + stored in the database, for each urgency level. This is intended as a + simple metric to determine stability of MythTV, as higher counts of + higher urgency levels will indicate an increase in problems seen by the + user base. + + (cherry picked from commit 5f90b1d62c4d692a6c23ae22ab2047db85e6572e) + +commit 380076192d0a0945c8489cba851537fde75b21e4 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Sat Oct 6 04:28:48 2012 -0400 + + Fix single episode grabber for season 0 specials. + + This makes the check for arguments to grabInetref() look specifically + for None, rather than boolean False, to prevent false positives when + dealing with specials that have a season of 0. + (cherry picked from commit 7da754ad0d350988f324c239477a6587bf88ba1c) + +commit 139bd59f435974cf0f19934b8feafb1e742aea65 +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Mon Oct 1 17:56:38 2012 +0100 + + Setting VERSION to v0.25.3 + +commit f86a6c6466826baf6aa6fe7a7b778a4c4b6d0c05 +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Mon Oct 1 17:54:18 2012 +0100 + + Setting VERSION to vv0.25.3 + +commit 957c7e20c8b9e2f2bb50a5fc826810c39689db4b +Author: Daniel Thor Kristjansson <danielk(a)cuymedia.net&gt; +Date: Mon Jul 30 15:40:10 2012 -0400 + + Refs #10948. Fully randomize EIT crawl start time. + + The deadlocks we've been seeing here should be fixed now, but they + should have been rare to begin with due to randomization of the + EIT Scanning start time. But they were occurring at fairly high + frequency. It turns out we were not applying enough randomness when + there were multiple cards and we were also losing randomness after + the first recording on a tuner finished and we reset the clock. + (cherry picked from commit 0e5d159c6bc98ef29a7b6bb225b43492b45c37ac) + +commit eb52783e9f7ad232cbf4afb22dbc604898514e45 +Author: Daniel Kristjansson <danielk(a)cuymedia.net&gt; +Date: Fri Aug 3 17:47:39 2012 -0400 + + Fixes #10970. Fix StreamHandler restart race. + + We wait for _running to be set to false, but we need the thread to be + in the finish state or QThread::start() will exit silently without + starting the thread. Since we're calling QThread::wait() we don't + really need the while (_running) loop at all in either Start() or + Stop(), so I've removed it. This race probably dates back to the + pthread->QThread porting. + (cherry picked from commit 7d01e691d2bb58ed7dcbbdcca93ec06dc3a7381b) + +commit 0817eb2a6d5663c5dce770105b8350688f09e97e +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Fri Sep 21 13:05:14 2012 -0400 + + Fix argument count error in MythBE.getConflictedRecordings(). + (cherry picked from commit 272fb61b88522be3bf9d51510d3e0aaa882b36a2) + +commit d8ca64e65f99c628571cfc09ce88f70228b165b7 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Thu Sep 20 13:29:10 2012 -0400 + + Add 'releasedate' to properties handled by Video.importMetadata() + (cherry picked from commit dbd7a9e47f1ffa003f0011cbf76359829eab2122) + +commit c93373060d0053782a9033a0fce2d784e51f95a0 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Thu Sep 20 12:15:03 2012 -0400 + + Add error handling for Frontend UPnP autodetection. + + This adds an error handling block to UPnP detection of the Frontend + connection class, to allow the remainder of the list to be returned if + one machine responding to the query cannot be connected to. + (cherry picked from commit 8c9fc7a1d3e4730c06bc0abac66be548aacbc11b) + +commit bd0f9eba93b37471bb6c3d0867b7470f6a116248 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Thu Sep 20 13:11:23 2012 -0400 + + Add check for 'No Cover' when applying coverart to videos. + + This considers a 'No Cover' value properly as non-existent, when + importing data from a VideoGrabber search result, to allow a new + cover to be downloaded in it's place, rather than refusing to + overwrite an existing image. + (cherry picked from commit 2076d12a565e120b67ed25eb68181250cd2ffe59) + +commit 099533dacc0faef47aadfbe7b45ab93ff57f5125 +Author: David Engel <dengel(a)mythtv.org&gt; +Date: Tue Sep 18 19:53:33 2012 -0500 + + Calculate current playback position using frame count and frame rate. + + According to Taylor Ralph, the code which uses timestamps is not + finished and shouldn't be used yet. For one thing, it doesn't handle + discontinuities in the timestamps. + + Note: timestamps are still used sometimes to calculate recording + lengths. That will need to be fixed in a future commit. + + (cherry picked from commit 286186281dcca4a3f25f591e6658310bc9d375fb) + +commit 96af9b06b00b749cb80589486eab6eb3d01da358 +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Sun Sep 16 23:17:57 2012 +0100 + + Add three missing SAR values defined in the H.264 spec to H264Parser::aspectRatio() fixes incorrect display aspect ratio for some videos and recordings. [...2025 lines suppressed...] +Date: Tue Apr 17 00:03:07 2012 +1000 + + Make services running on the frontend and advertised through Bonjour to listen to all interfaces + + It was previously only listening on the address used to communicate with the backend + + [cherry-picked from da49b57ac4a07da69b558b8b2660fa7963c9e238] + +commit 682e6f514bf7a69338c29959dbd746d9cea590ab +Author: Michael T. Dean <mdean(a)mythtv.org&gt; +Date: Sun Apr 15 22:14:00 2012 -0400 + + Fix metadata options editor for multiple results. + + Thanks to lomion for the patch (and apologies for the delay in applying + it). + + Fixes #10383 + (cherry picked from commit ea5aa87578e857e205291b0d95a42ceef70f6c21) + +commit 446e30b02e87458b50a3fbedf5ba18b77671fb9f +Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; +Date: Sun Apr 15 10:13:51 2012 -0700 + + Fix a compiler warning. + (cherry picked from commit d5f22eb940dca052949bfa8e3477e35e83054e1b) + +commit 8bbccaa865cd96aaecd685d815ebec9f22673666 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; +Date: Sun Apr 15 09:55:57 2012 -0700 + + This should really fix the osx build. Give up on QVector for now. + (cherry picked from commit 04e0d942ea0a1ccb14242084d3638e2ed4af5b7f) + +commit 108b52b605043324b56b7f8f5dd5049491d94954 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; +Date: Sun Apr 15 07:36:02 2012 -0700 + + Fix Live TV channel changing when using Input Groups. + + When trying to change channels (either directly or through the program + guide), an idle tuner in the same input group as the current tuner + would not be considered available. + + This is fixed by adding the excluded_cardids argument to + RemoteRequestFreeRecorderList() and + RemoteRequestFreeRecorderFromList(). + + Doing this the "right" way would require a protocol change for the + GET_FREE_RECORDER_LIST command. This is better done closer to the end + of the 0.26 release cycle, so the current implementation is less + efficient and makes multiple queries. + + There is also a lot of vector<> code here that could stand to be + converted to QVector<>. + (cherry picked from commit dc6a18af542c9de80f06cc22485d6ac8b932dfeb) + +commit d11128aff44c176885db90a3d8b0e1ee782fc03e +Author: Jonatan Lindblad <jlindblad(a)mythtv.org&gt; +Date: Sun Apr 15 12:31:04 2012 +0200 + + MythNetvision: Fix segmentation fault in NetTree::showMenu + + Fixes #10603 + + Also removed some unused code. + (cherry picked from commit ba9bcba84c386adc68815c5301f32990872e8e1f) + +commit 76df8e6c8f7b84a157607d8c25fd19f39d8dc830 +Author: Rune Evjen <rune.evjen(a)gmail.com&gt; +Date: Sat Apr 14 17:37:29 2012 -0400 + + Updated Norwegian Bokmal translation update + + Thank you Rune! + + Closes #10599 + + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org&gt; + +commit 2e7722d436dd8348d9131b069bf963a96b04a1dd +Author: Daniel Kristjansson <danielk(a)cuymedia.net&gt; +Date: Fri Apr 13 15:33:46 2012 -0400 + + Disable picture controls with Intel XVideo overlay adaptor. + + This adaptor uses defaults that vary from the norm on more than just the hue value. + Hue variance is the only thing we allow non-standard defaults on so just disable + picture controls with this adaptor. + + [cherry-picked from 0c00c0ac960df077d558959b1726c4b9801852c3] + + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; + +commit 0f8476995fe6a297ef6bae606e1600a967a4b965 +Author: Daniel Kristjansson <danielk(a)cuymedia.net&gt; +Date: Fri Apr 13 13:46:43 2012 -0400 + + Changes VideoOutput::CalcHueBase() to return 50% by default. + + This also adds some adaptors to the known list from jya. + + Thanks to skd5aner, anykey and jya on IRC for their assistance with this problem. + + [cherry-picked from b2657a1a3f8aa7210885a9699b620634e4043363] + + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; + +commit efada3f90132b3a9155b1adc07831161f4893aa4 +Author: Daniel Kristjansson <danielk(a)cuymedia.net&gt; +Date: Fri Apr 13 08:32:09 2012 -0400 + + Update PROJECT_NUMBER to 0.25 + +commit 77004d9f07c4cd90308dad87e4cdb018540460af +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Fri Apr 13 12:38:24 2012 +0100 + + Fix #10590. 'Record This' and 'Change to Channel' options not working in Guide menu. + (cherry picked from commit 19efff933a2c5f91cc3961ec8a523cc1513d9c20) + +commit 13bc14c8699bfb6077efb11d5e68623dcee7ba76 +Author: Gavin Hurlbut <ghurlbut(a)mythtv.org&gt; +Date: Thu Apr 12 20:54:20 2012 -0700 + + Fixed the version file + +commit 6967025c4f28ba564d0bb2928673310624c52470 +Author: Ilkka Tengvall <ikke(a)iki.fi&gt; +Date: Thu Apr 12 19:38:27 2012 -0400 + + Backport of c4b33d30185eb4f5396a7c0c67b507371c7506c7/mythtv: + + Updated Finnish MythFrontend and all plugins translation + from Ilkka Tengvall + + Thank you! + + Refs #10577 + + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org&gt; + +commit 5c87d03153f33f0594f657ba68efe44b9d358227 +Author: Yves Cayer <ycayer(a)gmail.com&gt; +Date: Thu Apr 12 09:56:33 2012 +0100 + + Re-enable idle timer after exiting video playback. (Copy/paste error). Fixes #10582 + + Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org&gt; + (cherry picked from commit ea953d91599a3d89e3e070732fb56a47e824d374) + +commit d3c35b3e2c9ecdecfa22b9d4f6bed848a943d8e2 +Author: Gavin Hurlbut <ghurlbut(a)mythtv.org&gt; +Date: Wed Apr 11 21:01:25 2012 -0700 + + Tweak logging around Commercial Skip -> Cutlist copying + (cherry picked from commit 73d20c4c0b1801df6b42621278bb35ad521c6bf1) + +commit 14d7a74578dfb38fa085b46db9c7647825668713 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; +Date: Wed Apr 11 12:59:34 2012 -0700 + + Fixes #10566. Reverts part of 3a51b833e to improve channel changes. + + The first half of 3a51b833e looks like a bug (the new condition means + the following "else if" branch is never taken). Removing it stops + guide-based channel changes from being forced onto a different tuner. + + Note: this fix exposes another problem with guide-based channel + changes - you can't switch to a different tuner in the current input + group. Fix is in progress. + +commit fd06548d81f12f0911538b17aa79fdb6b9ac5c6d +Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; +Date: Tue Apr 10 12:12:40 2012 -0700 + + Fix a clang-related compile issue + + Fixes #10473. + + Port the mplayer yadif filter fix (revision 32437) to mythtv port to allow compile with clang + + mplayer log: yadif: Explicit wordlength for compare. Fixes compile with clang. + + mplayer cvslog reference: + http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2010-October/040647.html + + Signed-off-by: Gavin Hurlbut <ghurlbut(a)mythtv.org&gt; + (cherry picked from commit ecda14d1d751a4aa4b8eeb903330393d0e12bc48) + +commit 773c88c3ac2c2eac4e6dbb6af0ce949df6d4ab27 +Author: Kevon <mythtv(a)reidsresidence.com&gt; +Date: Tue Apr 10 11:45:14 2012 -0700 + + Make mythtv more compatible with GCC 4.7 + + Fixes #10537 + + Signed-off-by: Gavin Hurlbut <ghurlbut(a)mythtv.org&gt; + (cherry picked from commit 19a7e0131146d38bfe384da55fc4c16193f2b54e) Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- mythtv.spec 9 Sep 2012 16:30:16 -0000 1.107 +++ mythtv.spec 29 Oct 2012 02:04:24 -0000 1.108 @@ -1,4 +1,3 @@ -# # Specfile for building MythTV and MythPlugins RPMs from a subversion checkout. # # by: Chris Petersen <rpm(a)forevermore.net&gt; @@ -33,7 +32,7 @@ # The following options are enabled by default. Use these options to disable: # # --without vdpau Disable VDPAU support -# --without crystalhd Disable Crystal HD support +# --without crystalhd Disable Crystal HD support (disabled, currently broken) # --without perl Disable building of the perl bindings # --without python Disable building of the python bindings # @@ -60,12 +59,12 @@ # Git revision and branch ID # 0.25 release: git tag v0.25.1 -%define _gitrev v0.25.2-15-g46cab93 -%define branch fixes/0.25 +%define _gitrev v0.26.0-0-g6c3ae8 +%define branch fixes/0.26 # Mythtv and plugins from github.com -%global githash1 g4e44650 -%global githash2 19087cb +%global githash1 g6c3ae81 +%global githash2 d2f9798 # # Basic descriptive tags for this package: @@ -76,12 +75,11 @@ Group: Applications/Multimedia # Version/Release info -Version: 0.25.2 +Version: 0.26.0 %if "%{branch}" == "master" -Release: 0.2.git.%{_gitrev}%{?dist} -#Release: 0.1.rc1%{?dist} +Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 3%{?dist} +Release: 1%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -134,12 +132,7 @@ # https://github.com/MythTV/mythtv/tarball/v0.25 Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz -Patch0: mythtv-0.25.2-fixes.patch - -# Fixes for PHP 5.4 -Patch1: mythtv-0.25.1-php54.patch -# Adapative HLS profile based on resolution. -Patch2: mythtv-0.25.1-hls_profile.patch +Patch0: mythtv-0.26-fixes.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -152,7 +145,6 @@ Source107: mythfrontend.desktop Source108: mythtv-setup.png Source109: mythtv-setup.desktop -Source110: mysql.txt Source111: 99-mythbackend.rules @@ -181,6 +173,7 @@ BuildRequires: qt-webkit-devel BuildRequires: qt-devel >= 4.6 BuildRequires: phonon-devel +BuildRequires: libuuid-devel BuildRequires: lm_sensors-devel BuildRequires: lirc-devel @@ -349,7 +342,8 @@ Requires: php-MythTV = %{version}-%{release} Requires: python-MythTV = %{version}-%{release} Requires: mythplugins = %{version}-%{release} -Requires: mythweb +Requires: mythweb = %{version} +Requires: mythffmpeg = %{version}-%{release} Requires: mysql-server >= 5, mysql >= 5 Requires: xmltv @@ -578,6 +572,19 @@ This package contains components needed by multiple other MythTV components. ################################################################################ +################################################################################ + +%package -n mythffmpeg +Summary: MythTV build of FFmpeg +Group: Applications/Multimedia + +%description -n mythffmpeg +Several MythTV utilities interact with FFmpeg, which changes its parameters +often enough to make it a hassle to support the variety of versions used by +MythTV users. This is a snapshot of the FFmpeg code so that MythTV utilities +can interact with a known verion. + +################################################################################ %if %{with_perl} @@ -805,14 +812,10 @@ # Replace static lib paths with %{_lib} so we build properly on x86_64 # systems, where the libs are actually in lib64. if [ "%{_lib}" != "lib" ]; then - grep -rlZ '/lib/' . | xargs -r0 sed -i -e 's,/lib/,/%{_lib}/,g' - grep -rlZ '/lib$' . | xargs -r0 sed -i -e 's,/lib$,/%{_lib},' - grep -rlZ '/lib ' . | xargs -r0 sed -i -e 's,/lib ,/%{_lib} ,g' + find \( -name 'configure' -o -name '*pro' -o -name 'Makefile' \) -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+ fi %patch0 -p1 -b .mythtv -%patch1 -p1 -b .php54 -%patch2 -p1 -b .hls_profile # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -948,6 +951,7 @@ -exec sed -i -e "s,DEPLIBS = \$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \ -exec sed -i -e "s,\$\${PREFIX}/include/mythtv,$temp%{_includedir}/mythtv," {} \; echo "INCLUDEPATH -= \$\${PREFIX}/include" >> settings.pro + echo "INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include" >> settings.pro echo "INCLUDEPATH -= %{_includedir}" >> settings.pro echo "INCLUDEPATH += $temp%{_includedir}" >> settings.pro echo "INCLUDEPATH += %{_includedir}" >> settings.pro @@ -1040,8 +1044,7 @@ # Fix permissions on executable python bindings # chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth*.py -# mysql.txt and other config/init files - install -m 0644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/ +# config/init files echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml ### SystemD based setup. ### @@ -1080,6 +1083,11 @@ popd +# Clean up some stuff we don't want to include +rm -f %{buildroot}%{_libdir}/libmythqjson.prl \ + %{buildroot}%{_libdir}/libmythzmq.la \ + %{buildroot}%{_libdir}/pkgconfig/libmythzmq.pc + # MythPlugins %if %{with_plugins} pushd mythplugins @@ -1225,6 +1233,7 @@ %{_bindir}/mythcommflag %{_bindir}/mythmetadatalookup %{_bindir}/mythutil +%{_bindir}/mythlogserver %{_bindir}/mythpreviewgen %{_bindir}/mythtranscode %{_bindir}/mythwikiscripts @@ -1234,7 +1243,6 @@ %{_datadir}/mythtv/hardwareprofile/ %attr(-,mythtv,mythtv) %dir %{_sysconfdir}/mythtv -%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt %config(noreplace) %{_sysconfdir}/mythtv/config.xml %files backend @@ -1243,8 +1251,6 @@ %{_bindir}/mythjobqueue %{_bindir}/mythmediaserver %{_bindir}/mythreplex -%{_bindir}/mythffmpeg -%{_bindir}/mythffplay %{_datadir}/mythtv/MXML_scpd.xml %{_datadir}/mythtv/backend-config/ %attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv @@ -1287,6 +1293,7 @@ %dir %{_datadir}/mythtv/i18n %dir %{_datadir}/mythtv/fonts %{_datadir}/mythtv/fonts/*.ttf +%{_datadir}/mythtv/fonts/*.otf %{_datadir}/mythtv/fonts/*.txt %{_datadir}/mythtv/i18n/mythfrontend_*.qm %{_datadir}/applications/*mythfrontend.desktop @@ -1308,6 +1315,9 @@ %dir %{_datadir}/mythtv/build %{_datadir}/mythtv/build/settings.pro +%files -n mythffmpeg +%{_bindir}/mythffmpeg + %if %{with_perl} %files -n perl-MythTV %{perl_vendorlib}/MythTV.pm @@ -1388,6 +1398,7 @@ %doc mythplugins/mythmusic/README %{_libdir}/mythtv/plugins/libmythmusic.so %attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythmusic +%{_datadir}/mythtv/mythmusic/ %{_datadir}/mythtv/musicmenu.xml %{_datadir}/mythtv/music_settings.xml %{_datadir}/mythtv/i18n/mythmusic_*.qm @@ -1441,6 +1452,12 @@ %changelog +* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.26.0-1 +- Update to latest upstream release. +- Remove mysql.txt as it is no longer used. +- Fix lib -> lib64 replacement command to be more accurate and support mythzmq +- Add mythzmq stuff + * Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.25.2-3 - Rebuilt for x264 ABI 125 Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 22 Jul 2012 18:42:46 -0000 1.55 +++ sources 29 Oct 2012 02:04:24 -0000 1.56 @@ -1 +1 @@ -05d3402459bf7380cf54cc6066c149a3 MythTV-mythtv-v0.25.2-0-g4e44650.tar.gz +5a89c1afe1fdd7584786e7bd8bbf756a MythTV-mythtv-v0.26.0-0-g6c3ae81.tar.gz --- mysql.txt DELETED --- --- mythtv-0.25.1-hls_profile.patch DELETED --- --- mythtv-0.25.1-php54.patch DELETED --- --- mythtv-0.25.2-fixes.patch DELETED ---