From c5386f09a7257bae94e78e4dbcde52e232516ae7 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Mon, 12 Apr 2010 21:00:19 -0700
Subject: mythtv:latest -fixes. fix for is.xml reservation when upgrading.

---
 abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD       | 4 ++--
 abs/core-testing/mythtv/stable-0.23/mythtv/mythtv.install | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD
index 26faaaf..11e0a35 100755
--- a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.23
-pkgrel=8
+pkgrel=10
 pkgdesc="A personal video recorder for Linux"
 url="http://www.mythtv.org"
 license="GPL"
@@ -10,7 +10,7 @@ depends=('bash' 'mysql-clients>=5.0' 'qt' 'lame' 'lirc-utils' 'ffmpeg' \
 makedepends=('libgl' 'subversion')
 replaces=()
 groups=('pvr')
-backup=(/usr/share/mythtv/is.xml)
+#backup=(/usr/share/mythtv/is.xml)
 #options=(!strip)
 #MAKEFLAGS="-j6"
 install='mythtv.install'
diff --git a/abs/core-testing/mythtv/stable-0.23/mythtv/mythtv.install b/abs/core-testing/mythtv/stable-0.23/mythtv/mythtv.install
index b9899a0..0524f86 100755
--- a/abs/core-testing/mythtv/stable-0.23/mythtv/mythtv.install
+++ b/abs/core-testing/mythtv/stable-0.23/mythtv/mythtv.install
@@ -14,6 +14,8 @@ pre_upgrade() {
 	if [ ! -L /usr/share/mythtv/is.xml ]
 	then
 		mv /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.pre
+	else
+		mv /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/themes/defaultmenu/is.xml.pre
 	fi
 }
 
@@ -28,6 +30,8 @@ post_upgrade() {
 		rm -fr /usr/share/mythtv/themes/defaultmenu/is.xml
 		mv /usr/share/mythtv/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml
 		ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml
+	else
+		mv /usr/share/mythtv/themes/defaultmenu/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml
 	fi
 }
 
-- 
cgit v0.12