summaryrefslogtreecommitdiffstats
path: root/testing/phpmyadmin
diff options
context:
space:
mode:
authorMatt Smith <mcs@darkregion.net>2011-04-08 11:14:20 -0500
committerMatt Smith <mcs@darkregion.net>2011-04-08 11:14:20 -0500
commitb32097b4639d8c6da64fdf996ae42a1dc1ca9886 (patch)
tree399db1083f8c2d3c22a959ba7ced0964a381c2ff /testing/phpmyadmin
parent02eb37f59a022e9f1563d1f766a9cbbfe2bec863 (diff)
testing/phpmyadmin: moved sample config, updated post-install again
Diffstat (limited to 'testing/phpmyadmin')
-rw-r--r--testing/phpmyadmin/APKBUILD9
-rw-r--r--testing/phpmyadmin/phpmyadmin.post-install2
2 files changed, 6 insertions, 5 deletions
diff --git a/testing/phpmyadmin/APKBUILD b/testing/phpmyadmin/APKBUILD
index 97244325ba1..113a70de356 100644
--- a/testing/phpmyadmin/APKBUILD
+++ b/testing/phpmyadmin/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=phpmyadmin
pkgver=3.3.10
-pkgrel=1
+pkgrel=2
pkgdesc="A Web-based PHP tool for administering MySQL"
url="http://www.phpmyadmin.net/"
arch="noarch"
@@ -64,6 +64,10 @@ package() {
|| return 1
done
rm -rf "$pkgdir"/usr/share/webapps/$pkgname/contrib || return 1
+
+ # copy sample config
+ mv "$pkgdir"/usr/share/webapps/$pkgname/config.sample.inc.php \
+ "$pkgdir"/usr/share/$pkgname/ || return 1
}
doc() {
@@ -78,9 +82,6 @@ doc() {
"$subpkgdir"/usr/share/doc/$pkgname/ \
|| return 1
done
-
- mv "$pkgdir"/usr/share/webapps/$pkgname/config.sample.inc.php \
- "$subpkgdir"/usr/share/doc/$pkgname/ || return 1
}
md5sums="2e93375a92a86ef36e561b0087f6b8e3 phpMyAdmin-3.3.10-all-languages.tar.gz
diff --git a/testing/phpmyadmin/phpmyadmin.post-install b/testing/phpmyadmin/phpmyadmin.post-install
index 6403c706cff..e3dbc3524ae 100644
--- a/testing/phpmyadmin/phpmyadmin.post-install
+++ b/testing/phpmyadmin/phpmyadmin.post-install
@@ -10,7 +10,7 @@ echo "* 1) Change the ownership of the config directory:" >&2
echo "* chown -R apache:apache /etc/phpmyadmin" >&2
echo "* 2) See if you need to modify the apache2 config:" >&2
echo "* /etc/apache2/conf.d/phpmyadmin.conf" >&2
-echo "* 3) Restart apache2 if changes were made in step 2." >&2
+echo "* 3) Restart apache2 when done." >&2
echo "*" >&2
exit 0