Date: Saturday, February 6, 2010 @ 18:25:02 Author: giovanni Revision: 67429
Merged revisions 67428 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mythplugins/trunk ........ r67428 | giovanni | 2010-02-07 00:24:24 +0100 (dom, 07 feb 2010) | 2 lines upgpkg: mythplugins 0.22-2 Fixed deps ........ Modified: mythplugins/repos/extra-i686/ (properties) mythplugins/repos/extra-i686/PKGBUILD ----------+ PKGBUILD | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) Property changes on: mythplugins/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /mythplugins/trunk:1-67239 + /mythplugins/trunk:1-67428 Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2010-02-06 23:24:24 UTC (rev 67428) +++ extra-i686/PKGBUILD 2010-02-06 23:25:02 UTC (rev 67429) @@ -15,14 +15,13 @@ 'mythplugins-mythweb' 'mythplugins-mythzoneminder') pkgver=0.22 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') groups=('mythplugins') -makedepends=("mythtv>=${pkgver}" 'mplayer' 'mysql-python' 'fftw' 'dvdauthor' - 'libexif' 'pil' 'libcdaudio' 'taglib' 'php-apache' 'perl-libwww' - 'perl-xml-simple' 'perl-dbd-mysql') +makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw' 'dvdauthor' 'libexif' 'pil' + 'libcdaudio' 'taglib' 'php-apache' 'perl-xml-simple') source=(ftp://ftp.osuosl.org/pub/mythtv/${pkgbase}-${pkgver}.tar.bz2 mtd mythweb.conf.apache) @@ -41,7 +40,7 @@ package_mythplugins-mytharchive() { pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows" - depends=("mythtv>=${pkgver}" 'libxmu' 'mysql-python' 'pil' 'dvdauthor') + depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor') replaces=('mytharchive') cd "${srcdir}/${pkgbase}-${pkgver}/mytharchive" make INSTALL_ROOT="${pkgdir}" install || return 1 @@ -49,7 +48,7 @@ package_mythplugins-mythbrowser() { pkgdesc="Mini web browser for MythTV" - depends=("mythtv>=${pkgver}" 'wget') + depends=("mythtv>=${pkgver}") replaces=('mythbrowser') cd "${srcdir}/${pkgbase}-${pkgver}/mythbrowser" make INSTALL_ROOT="${pkgdir}" install || return 1 @@ -65,7 +64,7 @@ package_mythplugins-mythgallery() { pkgdesc="Image gallery plugin for MythTV" - depends=("mythtv>=${pkgver}" 'libexif' 'libtiff') + depends=("mythtv>=${pkgver}" 'libexif') replaces=('mythgallery') cd "${srcdir}/${pkgbase}-${pkgver}/mythgallery" make INSTALL_ROOT="${pkgdir}" install || return 1 @@ -89,8 +88,7 @@ package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=("mythtv>=${pkgver}" 'cdparanoia' 'faad2' 'fftw' 'flac' 'lame' - 'libcdaudio' 'libid3tag' 'libmad' 'libvorbis' 'sdl' 'taglib') + depends=("mythtv>=${pkgver}" 'fftw' 'flac' 'libcdaudio' 'libmad' 'taglib') replaces=('mythmusic') cd "${srcdir}/${pkgbase}-${pkgver}/mythmusic" make INSTALL_ROOT="${pkgdir}" install || return 1 @@ -106,7 +104,7 @@ package_mythplugins-mythvideo() { pkgdesc="Video playback and browsing plugin for MythTV" - depends=("mythtv>=${pkgver}" 'mplayer' 'perl-libwww' 'perl-xml-simple') + depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple') replaces=('mythvideo') cd "${srcdir}/${pkgbase}-${pkgver}/mythvideo" make INSTALL_ROOT="${pkgdir}" install || return 1 @@ -115,7 +113,7 @@ package_mythplugins-mythweather() { pkgdesc="Weather checking plugin for MythTV" - depends=("mythtv>=${pkgver}" 'wget') + depends=("mythtv>=${pkgver}") replaces=('mythweather') cd "${srcdir}/${pkgbase}-${pkgver}/mythweather" make INSTALL_ROOT="${pkgdir}" install || return 1 @@ -123,12 +121,11 @@ package_mythplugins-mythweb() { pkgdesc="Web interface for MythTV's backend" - depends=("mythtv>=${pkgver}" 'php-apache' 'perl-dbd-mysql') + depends=("mythtv>=${pkgver}" 'php-apache') replaces=('mythweb') install=mythplugins-mythweb.install mkdir -p ${pkgdir}/srv/http/mythweb/{image_cache,php_sessions} cp -r ${srcdir}/mythplugins-$pkgver/mythweb/* ${pkgdir}/srv/http/mythweb -# cp ${srcdir}/mythplugins-$pkgver/mythweb/data/.htaccess ${pkgdir}/srv/http/mythweb rm ${pkgdir}/srv/http/mythweb/README install -m644 ${srcdir}/mythweb.conf.apache ${pkgdir}/srv/http/mythweb/mythweb.conf.apache chown -R http:http ${pkgdir}/srv/http/mythweb