4 files changed, 38 insertions, 16 deletions
diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.22.bb
index 82b61db469..aab859c02b 100644
--- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb
+++ b/recipes/mythtv/mythplugins_0.22.bb
@@ -1,20 +1,19 @@
-# todo: add mythweb
 DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia"
-RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \
-        mythgame mythmusic mythmovies mythnews mythvideo mythweather mythzoneminder"
-PV = "0.21+0.22rc2"
-PR = "r4"
+RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery mythgame \
+                  mythmusic mythmovies mythnews mythvideo mythweather mythweb mythzoneminder"
+PV = "0.22"
+PR = "r0"
 
 QMAKE_PROFILES = "mythplugins.pro"
 
-SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2 \
+SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22.tar.bz2 \
         file://sysroot.patch;patch=1 \
         file://mythplugins_wo_qtopengl.diff;patch=1 \
         file://configure.patch;patch=1 \
         file://mytharchive.pro.patch;patch=1 \
         "
 
-S = "${WORKDIR}/mythplugins-0.22rc2"
+S = "${WORKDIR}/mythplugins-0.22"
 
 inherit qmake2 qt4x11
 
@@ -36,8 +35,24 @@ do_configure() {
 }
 do_install () {
         oe_runmake install INSTALL_ROOT="${D}"
+	install -d  ${D}${datadir}/apache2
+	install -d  ${D}${datadir}/apache2/htdocs
+	install -d  ${D}/etc/apache2
+	install -d  ${D}/etc/apache2/extra
+	cp -r ${S}/mythweb/* ${D}${datadir}/apache2/htdocs/
+	cp -r ${S}/mythweb/mythweb.conf.apache ${D}/etc/apache2/extra/mythweb.conf
+	sed -i -e s:/var/www/html:/usr/share/apache2/htdocs:g ${D}/etc/apache2/extra/mythweb.conf
 }
 
+pkg_postinst_${PN}() {
+        chgrp -R apache /usr/share/apache2/htdocs/data
+        chmod g+rw /usr/share/apache2/htdocs/data
+        grep mythweb.conf /etc/apache2/httpd.conf || \
+              echo "Include /etc/apache2/extra/mythweb.conf" >>/etc/apache2/httpd.conf
+
+}
+
+
 PACKAGES =+ "mytharchive mytharchive-dbg \
         mythbrowser mythbrowser-dbg \
         mythflix mythflix-dbg \
@@ -48,6 +63,7 @@ PACKAGES =+ "mytharchive mytharchive-dbg \
         mythnews mythnews-dbg \
         mythvideo mythvideo-dbg \
         mythweather mythweather-dbg \
+        mythweb \
         mythzoneminder mythzoneminder-dbg"
 
 FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \
@@ -258,6 +274,9 @@ FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \
         "
 FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so"
 
+FILES_mythweb = "${datadir}/apache2/htdocs \
+        /etc/apache2/extra/mythweb.conf"
+
 FILES_mythzoneminder = "${libdir}/mythtv/plugins/libmythzoneminder.so \
         ${datadir}/mythtv/zonemindermenu.xml \
         ${datadir}/mythtv/i18n/mythzoneminder* \
diff --git a/recipes/mythtv/myththemes_0.21+0.22rc2.bb b/recipes/mythtv/myththemes_0.22.bb
index a3be987fe9..444786a434 100644
--- a/recipes/mythtv/myththemes_0.21+0.22rc2.bb
+++ b/recipes/mythtv/myththemes_0.22.bb
@@ -1,13 +1,13 @@
 inherit qmake2
 
-PV = "0.21+0.22rc2"
+PV = "0.22"
 PR = "r0"
 
 FILES_${PN} =+ "${datadir}"
 
-SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2"
+SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2"
 
-S = "${WORKDIR}/myththemes-0.22rc2"
+S = "${WORKDIR}/myththemes-0.22"
 
 do_configure() {
         ${S}/configure  --qmake=qmake2 --sysroot=${STAGING_DIR_HOST} --prefix=${prefix} 
diff --git a/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch b/recipes/mythtv/mythtv-0.22/configure.patch
index 748c88d9fc..748c88d9fc 100644
--- a/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch
+++ b/recipes/mythtv/mythtv-0.22/configure.patch
diff --git a/recipes/mythtv/mythtv_0.21+0.22rc2.bb b/recipes/mythtv/mythtv_0.22.bb
index bc85a1ad86..0ff2b4d0c6 100644
--- a/recipes/mythtv/mythtv_0.21+0.22rc2.bb
+++ b/recipes/mythtv/mythtv_0.22.bb
@@ -1,22 +1,25 @@
 require mythtv.inc
 
-RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database"
+RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database \
+mysql5-server mysql5-client"
 RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16"
 
-PV = "0.21+0.22rc2"
-PR = "r3"
+PV = "0.22"
+PR = "r0"
+# REALPV is here to support release candidates
+# OE in that case has as PV something like 0.21+0.22rc1
+# but for packaging the real PV is needed
 REALPV = "0.22"
 
-DEFAULT_PREFERENCE = "-1"
 ALLOW_EMPTY_${PN} = "1"
 
 QMAKE_PROFILES = "mythtv.pro"
 
-SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2 \
+SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22.tar.bz2 \
         file://configure.patch;patch=1 \
         "
 
-S = "${WORKDIR}/mythtv-0.22rc2"
+S = "${WORKDIR}/mythtv-0.22"
 
 inherit qmake2 qt4x11