[arch-commits] Commit in thttpd/trunk (PKGBUILD)

[Gaetan Bisson]

    Date: Monday, July 8, 2013 @ 13:40:13
  Author: bisson
Revision: 93679

fix FS#36030

Modified:
  thttpd/trunk/PKGBUILD

----------+
 PKGBUILD |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-08 11:29:22 UTC (rev 93678)
+++ PKGBUILD	2013-07-08 11:40:13 UTC (rev 93679)
@@ -5,7 +5,7 @@
 
 pkgname=thttpd
 pkgver=2.25b
-pkgrel=10
+pkgrel=11
 pkgdesc='Simple, small, portable, fast, and secure HTTP server'
 url='http://www.acme.com/software/thttpd/'
 license=('custom:BSD')
@@ -64,4 +64,8 @@
 	install -d "${pkgdir}"/var/log/thttpd
 	install -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
 	head -n 26 thttpd.c > "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
+
+	# conflicts with apache
+	mv "${pkgdir}"/usr/bin/htpasswd{,-thttpd}
+	mv "${pkgdir}"/usr/share/man/man1/htpasswd{,-thttpd}.1
 }