mythtv .21: fix is.xml and media settings being wiped when switching between myth packages.

Not a huge fan of this, but it works.

close FS#245

4 files changed, 54 insertions, 21 deletions

diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
index e7768c7..dc86f28 100644
--- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.21
-pkgrel=55
+pkgrel=58
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
@@ -13,7 +13,7 @@ source=(ftp://ftp.knoppmyth.net/R6/sources/${pkgname}-${pkgver}-fixes.tar.bz2 \
 #         'a0ecb7f476cb71c0c1ac90d349fc7695')
 
 license=('GPL2')
-makedepends=(libgl subversion)
+makedepends=(libgl subversion python perl)
 groups=('pvr')
 url="http://www.mythtv.org/"
 install=mythtv.install
diff --git a/abs/core-testing/mythtv/stable/mythtv/mythtv.install b/abs/core-testing/mythtv/stable/mythtv/mythtv.install
index e65898b..d43acf8 100644
--- a/abs/core-testing/mythtv/stable/mythtv/mythtv.install
+++ b/abs/core-testing/mythtv/stable/mythtv/mythtv.install
@@ -6,12 +6,27 @@ post_install() {
 		chown -R mythtv /var/log/mythtv
 		echo "---" > /var/log/mythtv/mythbackend.log
 		chown mythtv /var/log/mythtv/mythbackend.log
-
 	fi
+	if [ -e /tmp/is.xml ]
+	then
+		cp /tmp/is.xml /usr/share/mythtv/is.xml
+	fi
+
+	if [ -e /tmp/media_settings.xml ]
+	then
+		 cp /tmp/media_settings.xml /usr/share/mythtv/media_settings.xml 
+        fi
 }
 pre_upgrade() {
-	cp /usr/share/mythtv/is.xml /tmp
-	cp /usr/share/mythtv/media_settings.xml /tmp
+	if [ -e /usr/share/mythtv/is.xml ]
+	then
+		cp /usr/share/mythtv/is.xml /tmp
+	fi
+
+	if [ -e /usr/share/mythtv/media_settings.xml ]
+	then
+		cp /usr/share/mythtv/media_settings.xml /tmp
+	fi
 }
 
 post_upgrade() {
@@ -23,7 +38,9 @@ post_upgrade() {
 		chown -R mythtv /var/log/mythtv
 	fi
 }
-
+pre_remove () {
+	pre_upgrade
+}
 
 # arg 1:  the old package version
 post_remove() {
diff --git a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
index 881ff9b..e89a93b 100644
--- a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
+++ b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv-vdpau
 pkgver=0.21
-pkgrel=8
+pkgrel=9
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
@@ -16,7 +16,7 @@ source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-${pkgver}-fixes.tar.bz2 \
 conflicts=('mythtv')
 provides=('mythtv'=${pkgver})
 license=('GPL2')
-makedepends=(libgl subversion 'nvidia-utils>=180.29')
+makedepends=(libgl subversion 'nvidia-utils>=180.29' python perl)
 groups=('pvr')
 url="http://www.mythtv.org/"
 install=mythtv.install
diff --git a/abs/extra-testing/community/mythtv-vdpau/mythtv.install b/abs/extra-testing/community/mythtv-vdpau/mythtv.install
index 3bd6b56..a063766 100644
--- a/abs/extra-testing/community/mythtv-vdpau/mythtv.install
+++ b/abs/extra-testing/community/mythtv-vdpau/mythtv.install
@@ -1,25 +1,36 @@
 # arg 1:  the new package version
 post_install() {
-	echo
-	echo
-	echo "As is with no guarantee, please don't file any bu reports against this package."
 	if [ ! -d /var/log/mythtv ]
 	then
 		mkdir -p /var/log/mythv
 		chown -R mythtv /var/log/mythtv
 		echo "---" > /var/log/mythtv/mythbackend.log
 		chown mythtv /var/log/mythtv/mythbackend.log
-
 	fi
-}
-post_upgrade() {
-	echo
-	echo
-	echo "As is with no guarantee, please don't file any bu reports against this package."
+	if [ -e /tmp/is.xml ]
+	then
+		cp /tmp/is.xml /usr/share/mythtv/is.xml
+	fi
+
+	if [ -e /tmp/media_settings.xml ]
+	then
+		 cp /tmp/media_settings.xml /usr/share/mythtv/media_settings.xml 
+        fi
+
+        echo
+        echo
+        echo "As is with no guarantee, please don't file any bu reports against this package."
 }
 pre_upgrade() {
-	cp /usr/share/mythtv/is.xml /tmp
-	cp /usr/share/mythtv/media_settings.xml /tmp
+	if [ -e /usr/share/mythtv/is.xml ]
+	then
+		cp /usr/share/mythtv/is.xml /tmp
+	fi
+
+	if [ -e /usr/share/mythtv/media_settings.xml ]
+	then
+		cp /usr/share/mythtv/media_settings.xml /tmp
+	fi
 }
 
 post_upgrade() {
@@ -30,12 +41,17 @@ post_upgrade() {
 		mkdir -p /var/log/mythv
 		chown -R mythtv /var/log/mythtv
 	fi
-}
+        echo
+        echo
+        echo "As is with no guarantee, please don't file any bu reports against this package."
 
+}
+pre_remove () {
+	pre_upgrade
+}
 
 # arg 1:  the old package version
 post_remove() {
-	echo -e "NOTE: MySQL database was not removed.  To remove run:\nmysql -u root -e 'drop database mythconverg;'"
 	/bin/true
 
 }