rpms/mythtv/EL-6 ChangeLog, 1.2, 1.3 mythbackend.service, 1.2, 1.3 mythtv.logrotate.sysd, 1.1, 1.2 mythtv.logrotate.sysv, 1.1, 1.2 mythtv.spec, 1.88, 1.89 sources, 1.54, 1.55 mysql.txt, 1.1, NONE mythtv-0.25.1-hls_profile.patch, 1.1, NONE mythtv-0.25.1-php54.patch, 1.1, NONE mythtv-0.25.2-fixes.patch, 1.1, NONE
Richard Shaw
hobbes1069 at rpmfusion.org
Mon Dec 10 15:42:40 CET 2012
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26679
Modified Files:
ChangeLog mythbackend.service mythtv.logrotate.sysd
mythtv.logrotate.sysv 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:
* Tue Dec 4 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-3
- Update to latest upstream release.
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 26 Aug 2012 12:02:38 -0000 1.2
+++ ChangeLog 10 Dec 2012 14:42:38 -0000 1.3
@@ -1,129 +1,282802 @@
-commit 46cab93562429cd19029402a2387f63a72aeb898
+commit 6c3ae81b967ff21235c82481b6c6244ad97b6d20
+Author: Stuart Morgan <smorgan at mythtv.org>
+Date: Tue Oct 2 11:30:24 2012 +0100
+
+ Setting VERSION to v0.26.0
+
+commit cb1e2844f3bd6147f92d8189b4f87c5fe212f826
Author: Raymond Wagner <rwagner at mythtv.org>
-Date: Tue Jul 31 14:21:22 2012 -0400
+Date: Tue Oct 2 02:55:07 2012 -0400
- Correct --printexpire option in mythbackend.
+ Cause backend to terminate if requested IP address is unavailable.
- This corrects logic that was accidentally inverted in 8bc8dd54, and
- allows `mythbackend --printexpire` to be used again.
- (cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)
+ This performs a check within mainserver to ensure the the selected IP
+ addresses that the backend should be available on are detected on the
+ system, and will otherwise immediately terminate rather than continue to
+ operate in a potentially inaccessible fashion.
+
+commit 1a66ff9bee9d1029e3400d750c84a2f2c3d5c47e
+Author: Gavin Hurlbut <ghurlbut at mythtv.org>
+Date: Mon Oct 1 16:28:49 2012 -0700
+
+ Please let this be all. More Windows fixes.
+
+commit f1d851b7cd736c661f62f8d697a7726439e35453
+Author: Gavin Hurlbut <ghurlbut at mythtv.org>
+Date: Mon Oct 1 15:03:56 2012 -0700
+
+ More windows-related fixes.
+
+commit 0c22b9222ce2122af66b3438362d47a63b80b1c9
+Merge: 907bd2d faf4c11
+Author: Nicolas Riendeau <nriendeau at mythtv.org>
+Date: Mon Oct 1 17:53:56 2012 -0400
+
+ Merge branch 'master' of code.mythtv.org:mythtv
+
+commit 907bd2d0e6a6b6a8eff1754daef4db2a217ef850
+Author: Walter Cheuk <wwycheuk at gmail.com>
+Date: Mon Oct 1 17:52:04 2012 -0400
+
+ New Chinese/Taiwan locale file
+ from Walter Cheuk
+
+ Thank you Walter!
+
+ Closes #11129
+
+ Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
+
+commit faf4c11aa7753830083bd583d3bfa470bf8f5010
+Author: Gavin Hurlbut <ghurlbut at mythtv.org>
+Date: Mon Oct 1 14:09:14 2012 -0700
+
+ Forgot a lousy ;. Been doing too much python lately.
+
+commit aaa9fc27e2524419e0ef1c132b58bea9e18ea4bc
+Author: Gavin Hurlbut <ghurlbut at mythtv.org>
+Date: Mon Oct 1 12:57:22 2012 -0700
+
+ Fix signalhandling to compile for FreeBSD as well
+
+commit 62aa75b3718475560ef71dd327dc3b59f0d521a5
+Author: Gavin Hurlbut <ghurlbut at mythtv.org>
+Date: Mon Oct 1 12:47:34 2012 -0700
+
+ Fix signalhandling to compile for Windows (sorry)
+
+commit a1ff1f2df9e9453066f846f9a47cf562f3a2a4b0
+Author: Kenni Lund <kenni at mythtv.org>
+Date: Mon Oct 1 19:55:41 2012 +0200
+
+ Generate binary translation files for the Italian translation, following dfefee4749.
+
+ Fixes #11120.
+
+commit dfefee4749ed3c3f87a73bcc950ea833a7b624e3
+Author: Morris Cavestro <morriscavestro at yahoo.it>
+Date: Mon Oct 1 19:54:27 2012 +0200
+
+ Update the Italian translation of mythgallery, mythmusic and mythfrontend.
+
+ Signed-off-by: Kenni Lund <kenni at mythtv.org>
+
+commit 0de360e6aa6adc0e70115a7b8b0681fb48181cc3
+Author: Kenni Lund <kenni at mythtv.org>
+Date: Mon Oct 1 19:37:30 2012 +0200
+
+ Update the Danish translation of mythgallery, mythgame, mythnews and mythweather.
-commit 8ab229a8bed860fb0855797c683655a7465e2ee4
-Merge: a4cdc9e 1c496c8
+commit 6596484ebcbb6b3df482cdc15db04c70f683128d
+Author: Jonatan Lindblad <jlindblad at mythtv.org>
+Date: Sun Sep 30 12:47:50 2012 +0200
+
+ Update the Swedish translation.
+
+ Update of the Swedish translation for mythfrontend and all plugins made
+ by me and Roger MÃ¥rtensson (thank you!).
+
+commit d6ec9e4eefcb974a84a5cf579afce4dbed0605c7
+Author: Rune Evjen <rune.evjen at gmail.com>
+Date: Sat Sep 29 16:27:00 2012 -0400
+
+ Updated Norwegian Bokmal MythFrontend, MythGallery, MythGame,
+ MythMusic, MythNetvision, MythZoneminder tanslation
+ from Rune Evjen
+
+ Thank you Rune!
+
+ Closes #11130
+
+ Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
+
+commit 060383fa4f3dcd1b63127dbdf0877a237ba9d1b0
+Author: Kenni Lund <kenni at mythtv.org>
+Date: Sat Sep 29 18:04:17 2012 +0200
+
+ Update the Danish translation of mythfrontend.
+
+commit 9c4e49c0cb14b94eca4371b7c0e89f9b2c168eef
Author: Raymond Wagner <rwagner at mythtv.org>
-Date: Tue Jul 31 14:22:32 2012 -0400
+Date: Fri Sep 28 16:43:29 2012 -0400
- Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+ Force all datetime objects to be timezone aware.
+
+ This works around some strangeness in the modified datetime class due to
+ it being derived from a native C object. The timezone was being set to
+ None in the base class's __new__ function, and the corrected timezone
+ was ignored when set by the derived class's __init__.
-commit 1c496c81662eabda444452071eb18f2fd375d4d0
-Author: Kyle <klillis at gmail.com>
-Date: Mon Jul 30 13:34:11 2012 -0400
+commit 358af8a26dcb6de01a9547767d9015e97a662be7
+Author: French Language Translation Team <knight at teksavvy.com>
+Date: Thu Sep 27 21:48:32 2012 -0400
- Fixes #10897. Clear paused when we unpause FirewireRecorder.
+ Updated French MythFrontend, MythArchive, MythMusic and MythWeather
+ translation from the French Language Translation Team
- Signed-off-by: Daniel Thor Kristjansson <danielk at cuymedia.net>
+ Thank you!
+
+ Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
-commit 9c199a42258f2a19dd1c8d3b934e6eb04f1757ce
-Author: Daniel Thor Kristjansson <dkristjansson at mythtv.org>
-Date: Tue Jul 24 12:13:16 2012 -0400
+commit 73f41b03442fa8eb2b0c45d2e381f13917826a49
+Author: Florian Bittner <mythtv at daschatten.de>
+Date: Thu Sep 27 18:50:16 2012 -0400
- Fixes #10870. Fix Start/Stop race condition in StreamHandler.
+ Updated German MythFrontend and MythWeather translation
+ from Florian Bittner
+
+ Thank you Florian!
- This is a backport of [445faaa47].
+ Closes #11125
+
+ PS: Now that your translation is complete you might want to run
+ lupdate with --no-obsolete to remove the obsolete entries.
+
+ Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
-commit a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
+commit 6c5378c4edb4eb20b26f637fc9604f5ac5cdc1de
Author: Stuart Morgan <smorgan at mythtv.org>
-Date: Sun Jul 29 12:42:41 2012 +0100
+Date: Thu Sep 27 23:16:07 2012 +0100
- Restore setup pincode following [57adc5d120] - 'Flatten the Setup Menus in the default menu theme' which dropped util_menu.xml but failed to carry over the <password> markup.
- (cherry picked from commit 134417fe3bf7170f3419d2388a6c26afe16c4927)
+ Remove/replace some of the outdated information in the Doxygen documentation landing page.
-commit 3256849b14cc882536a153e7fbe4724adf03260c
-Author: Jim Stichnoth <jstichnoth at mythtv.org>
-Date: Tue Jul 24 10:56:15 2012 -0700
+commit be113a269e6bf8d8847c3af2364938211a423746
+Author: Robert Kulagowski <rkulagow at mythtv.org>
[...282489 lines suppressed...]
+Date: Sat May 18 22:41:06 2002 +0000
+
+ Add text to the OSD -- channel number, and placeholder program info.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@24 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 3c85e1c6e99fedd58b582f30b048dabe32920b70
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sat May 18 20:14:38 2002 +0000
+
+ Darken a rectangle of video on channel change for eventual program info display.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@23 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit b48adfd2f1afe69a16beb9496a1b684f3d80e9bd
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Thu May 16 20:17:37 2002 +0000
+
+ small reorg or file layout
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@22 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 813fc61c0acd5d9092ff98fea0889db37303a1d8
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Thu May 16 01:36:29 2002 +0000
+
+ Change the default settings to low quality, keyframes every other frame.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@21 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 87afb9ad9183502d71bcb22195d0e8e9da44626c
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Tue May 7 16:57:15 2002 +0000
+
+ Channel changing shouldn't segfault anymore.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@20 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 9575a1c1598f634b9a78b096e203e5553d3f155b
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Tue May 7 05:18:35 2002 +0000
+
+ Added changing the channel with the up/down arrows.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@19 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 8a5dea88fa274c3ff03940a30c9ae71a851f7f30
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Mon May 6 20:01:47 2002 +0000
+
+ Fix the max rewind constraint, and use the smudge in the pause buffer calcs.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@18 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 61128279a8c5f294a15ade9d69a54f9a525971ae
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Mon May 6 07:08:08 2002 +0000
+
+ Change the default settings, turn back on fullscreen mode.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@17 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit b40b2bcf2c69f6776263d6fc3c8029c0cfe44cf2
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Mon May 6 06:45:50 2002 +0000
+
+ FF/REW seem to work now.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@16 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 54a8b3201795d354c10aebbdf1c8ae81f9943288
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Mon May 6 06:21:49 2002 +0000
+
+ Add setting for mp3 quality, add half working ff/rew
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@15 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 1608e03455e0c49872a7b71b6b7891bf057ef75a
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sun May 5 22:40:21 2002 +0000
+
+ Added a setting for deinterlacing, and fixed the build process slightly.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@14 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 3c4461ea20c5ca1bdd580b192fa63f4e35e462c0
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sun May 5 21:56:09 2002 +0000
+
+ Add a simple settings class, and use it for the defaults.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@13 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit b397a405159c2e76707931d28c5e643926d83392
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sun May 5 21:33:07 2002 +0000
+
+ Moved the forced unpause calculation into the Player class.
+ Fixed the calculation of max size of the ring buffer.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@12 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 5ffc03899a829ab382b94ec3c764d266790a3745
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sun May 5 06:22:38 2002 +0000
+
+ Added the ability to pause "live" tv.
+ It forces an unpause when the ring buffer fills up. Need to move the
+ forced unpause logic into the player library.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@11 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 8dac78628005f497b06b4bbd07b0ea6b5a7caa67
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sun May 5 03:46:22 2002 +0000
+
+ fixing the last few problems with the RingBuffer
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@10 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 6fb8538e69520fe9a0e4b10a3e0e110bf8c3f886
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sun May 5 01:48:50 2002 +0000
+
+ Now the ringbuffer, well, rings.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@9 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 589164c833c69b5c61ec943f6a039438980a2a98
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sun May 5 00:37:39 2002 +0000
+
+ Add a RingBuffer class, for the TV app. Make the TV app work.
+
+ The RingBuffer doesn't cycle yet.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@8 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit e2a5539b206f644f902d424052fa1bf4ba5a2ffe
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sat May 4 19:42:01 2002 +0000
+
+ - Converted the playback stuff to a class. Much cleaner.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@7 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 84103e00fde1bab9007093e832302f7290c836f3
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sat May 4 08:06:24 2002 +0000
+
+ - new class 'NuppelVideoRecorder'
+ main changes: uses pthreads instead of forking + lots of shm, easy interface
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@6 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 39ebee28eb13a7c61331afa32ee886f821d02643
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Sat May 4 04:28:07 2002 +0000
+
+ - converted RTjpeg.N to a c++ class. cleaner now.
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@5 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit 654df6845fd347d1e9794277f46d8270a92ed7ad
+Author: Isaac Richards <irichards at mythtv.org>
+Date: Fri May 3 19:14:12 2002 +0000
+
+ Initial revision
+
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@2 7dbf422c-18fa-0310-86e9-fd20926502f2
+
+commit ce7a5f624939970a5b095698adb6da23babc930f
+Author: Janne Grunau <jgrunau at mythtv.org>
+Date: Fri May 3 19:14:12 2002 +0000
+
+ New repository initialized by cvs2svn.
+
+ git-svn-id: http://svn.mythtv.org/svn/trunk@1 7dbf422c-18fa-0310-86e9-fd20926502f2
Index: mythbackend.service
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythbackend.service,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythbackend.service 26 Aug 2012 12:02:38 -0000 1.2
+++ mythbackend.service 10 Dec 2012 14:42:39 -0000 1.3
@@ -59,7 +59,7 @@
ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv
# Whether systemd will continue over-watch and restart on any halt
-#Restart=Restart-always
+#Restart=always
[Install]
WantedBy=multi-user.target
Index: mythtv.logrotate.sysd
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.logrotate.sysd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv.logrotate.sysd 6 Jul 2012 18:13:11 -0000 1.1
+++ mythtv.logrotate.sysd 10 Dec 2012 14:42:39 -0000 1.2
@@ -1,14 +1,45 @@
-/var/log/mythtv/mythbackend.log /var/log/mythtv/myth*.*.*.log {
- notifempty
+#
+# logrotate doesn't support pattern precedence, so they have to be explicit
+#
+# logs that should be deleted every day
+/var/log/mythtv/mythcommflag.*.*.log
+/var/log/mythtv/mythpreviewgen.*.*.log
+/var/log/mythtv/mythtranscode.*.*.log
+{
+ daily
+ rotate 0
+ nocreate
missingok
+ ifempty
+}
+
+# all other non-backend logs are kept for a week
+/var/log/mythtv/mythfilldatabase*.*.*.log
+/var/log/mythtv/mythmetadatalookup*.*.*.log
+{
+ weekly
+ rotate 0
+ nocreate
+ missingok
+ ifempty
+}
+
+# backend log: keep for 4 weeks & compress
+/var/log/mythtv/mythbackend.*.*.log {
+ weekly
+ rotate 4
+ nocreate
+ missingok
+ ifempty
compress
compresscmd /usr/bin/bzip2
uncompresscmd /usr/bin/bunzip2
compressext .bz2
- weekly
- rotate 4
- size 10M
- postrotate
- /bin/systemctl kill mythbackend.service --signal=HUP --kill-who=main 2>/dev/null || true
+ firstaction
+ /bin/systemctl kill mythbackend.service --signal=HUP --kill-who=main 2>/dev/null || true
+ endscript
+ # general cleanup after 4 weeks of anything we might have missed
+ lastaction
+ find /var/log/mythtv -type f -mtime +28 -delete
endscript
}
Index: mythtv.logrotate.sysv
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.logrotate.sysv,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv.logrotate.sysv 6 Jul 2012 18:13:11 -0000 1.1
+++ mythtv.logrotate.sysv 10 Dec 2012 14:42:39 -0000 1.2
@@ -1,14 +1,45 @@
-/var/log/mythtv/myth*.log {
- notifempty
+#
+# logrotate doesn't support pattern precedence, so they have to be explicit
+#
+# logs that should be deleted every day
+/var/log/mythtv/mythcommflag.*.*.log
+/var/log/mythtv/mythpreviewgen.*.*.log
+/var/log/mythtv/mythtranscode.*.*.log
+{
+ daily
+ rotate 0
+ nocreate
missingok
+ ifempty
+}
+
+# all other non-backend logs are kept for a week
+/var/log/mythtv/mythfilldatabase*.*.*.log
+/var/log/mythtv/mythmetadatalookup*.*.*.log
+{
+ weekly
+ rotate 0
+ nocreate
+ missingok
+ ifempty
+}
+
+# backend log: keep for 4 weeks & compress
+/var/log/mythtv/mythbackend.*.*.log {
+ weekly
+ rotate 4
+ nocreate
+ missingok
+ ifempty
compress
compresscmd /usr/bin/bzip2
uncompresscmd /usr/bin/bunzip2
compressext .bz2
- weekly
- rotate 4
- size 10M
- postrotate
+ firstaction
/bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true
endscript
+ # general cleanup after 4 weeks of anything we might have missed
+ lastaction
+ find /var/log/mythtv -type f -mtime +28 -delete
+ endscript
}
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- mythtv.spec 26 Aug 2012 12:02:38 -0000 1.88
+++ mythtv.spec 10 Dec 2012 14:42:39 -0000 1.89
@@ -1,4 +1,3 @@
-#
# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
#
# by: Chris Petersen <rpm at forevermore.net>
@@ -59,13 +58,12 @@
%define desktop_vendor RPMFusion
# 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-55-g09ac5b2
+%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 +74,11 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.25.2
+Version: 0.26.0
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
-#Release: 0.1.rc1%{?dist}
%else
-Release: 2%{?dist}
+Release: 3.1%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -131,15 +128,10 @@
################################################################################
-# https://github.com/MythTV/mythtv/tarball/v0.25
+# https://github.com/MythTV/mythtv/tarball/v0.26
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
-Patch0: mythtv-0.25.2-fixes.patch
-
-# Fixes for PHP 5.4
-Patch1: mythtv-0.25.1-php54.patch
-# Adapative HLS profile based on resolution.
-Patch2: mythtv-0.25.1-hls_profile.patch
+Patch0: mythtv-0.26-fixes.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -152,7 +144,6 @@
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
Source109: mythtv-setup.desktop
-Source110: mysql.txt
Source111: 99-mythbackend.rules
@@ -180,7 +171,8 @@
BuildRequires: mysql-devel >= 5
BuildRequires: qt-webkit-devel
BuildRequires: qt-devel >= 4.6
-BuildRequires: phonon-devel
+BuildRequires: phonon-devel phonon-backend-gstreamer
+BuildRequires: libuuid-devel
BuildRequires: lm_sensors-devel
BuildRequires: lirc-devel
@@ -349,7 +341,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 +571,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 +811,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} .
@@ -886,7 +888,7 @@
--enable-libtheora --enable-libvorbis \
--enable-libxvid \
%if %{with_vdpau}
- --enable-vdpau \
+ --enable-vdpau \
%endif
%if %{with_vaapi}
--enable-vaapi \
@@ -948,6 +950,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 +1043,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 +1082,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 +1232,7 @@
%{_bindir}/mythcommflag
%{_bindir}/mythmetadatalookup
%{_bindir}/mythutil
+%{_bindir}/mythlogserver
%{_bindir}/mythpreviewgen
%{_bindir}/mythtranscode
%{_bindir}/mythwikiscripts
@@ -1234,7 +1242,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 +1250,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 +1292,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 +1314,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 +1397,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 +1451,21 @@
%changelog
+* Tue Dec 4 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-3
+- Update to latest upstream release.
+
+* Fri Nov 23 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.26.0-2
+- Rebuilt for x264
+
+* Sun Oct 28 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-1
+- Update to latest upstream release.
+- Remove mysql.txt as it is no longer used.
+- Fix lib -> lib64 replacement command to be more accurate and support mythzmq
+- Add mythzmq stuff
+
+* Wed Sep 05 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.25.2-3
+- Rebuilt for x264 ABI 125
+
* Sat Aug 25 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.2-2
- Update to latest fixes/0.25.
- Fix mythbackend looking in the wrong directory for config.xml (BZ#2450).
@@ -1484,7 +1509,7 @@
* Tue Mar 20 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25-1
- Update to latest release 0.25.
-* Fri Mar 03 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.24.2-2
+* Sat Mar 03 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.24.2-2
- Remove transcode as build requirement.
- Misc. spec file cleanup.
@@ -1512,7 +1537,7 @@
- Changes default user for mythbackend from root to mythtv on
Fedora 16+. See http://rpmfusion.org/Package/mythtv for additonal information.
-* Sun Oct 20 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.24.1-3
+* Thu Oct 20 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.24.1-3
- Update to latest 0.24.1-fixes, git revision e89d6a9f7e.
- Fixes BZ#1993, FTBFS on Fedora 16.
- Moves from sysv init to systemd unit file for mythbackend on Fedora 16+
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources 26 Aug 2012 12:02:38 -0000 1.54
+++ sources 10 Dec 2012 14:42:39 -0000 1.55
@@ -1 +1 @@
-05d3402459bf7380cf54cc6066c149a3 MythTV-mythtv-v0.25.2-0-g4e44650.tar.gz
+5a89c1afe1fdd7584786e7bd8bbf756a MythTV-mythtv-v0.26.0-0-g6c3ae81.tar.gz
--- mysql.txt DELETED ---
--- mythtv-0.25.1-hls_profile.patch DELETED ---
--- mythtv-0.25.1-php54.patch DELETED ---
--- mythtv-0.25.2-fixes.patch DELETED ---
More information about the rpmfusion-commits
mailing list