Subject: [alpine-devel] [PATCH] main/cups: fix typo

From: Isaac Dunham <[email-masked]>
Date: Sun, 29 Jun 2014 07:04:51 -0700

'ldadmin' for 'lpadmin' kept cups from starting.
---
 main/cups/cups.pre-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
index f6b88cb..468163c 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -S ldadmin 2>/dev/null
+addgroup -S lpadmin 2>/dev/null
 addgroup -S lp 2>/dev/null
 adduser -S -G lp lp 2>/dev/null
 addgroup lp lp 2>/dev/null
-- 
2.0.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Isaac Dunham <[email-masked]>
Date: Sun, 29 Jun 2014 07:04:52 -0700

The utilities supplied by xpdf are the same ones supplied by poppler
---
 testing/xpdf/APKBUILD | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/testing/xpdf/APKBUILD b/testing/xpdf/APKBUILD
index 196c9d9..b2943be 100644
--- a/testing/xpdf/APKBUILD
+++ b/testing/xpdf/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Isaac Dunham <[email-masked]>
 pkgname=xpdf
 pkgver="3.04"
-pkgrel=0
+pkgrel=1
 pkgdesc="The classic X11 PDF viewer"
 url="http://foolabs.com/xpdf"
 arch="all"
@@ -48,10 +48,8 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	rm -f "$pkgdir"/usr/lib/*.la
 	#delete pdf* utils that conflict with poppler-utils.
-	for i in pdftops pdftotxt pdfinfo pdfdetach; do
-		rm -f "$pkgdir"/usr/bin/$i
-		rm -f "$pkgdir"/usr/share/man/man1/$i.1
-	done
+	rm -f "$pkgdir"/usr/bin/pdf*
+	rm -f "$pkgdir"/usr/share/man/man1/pdf*
 }
 
 md5sums="3bc86c69c8ff444db52461270bef3f44  xpdf-3.04.tar.gz
-- 
2.0.1

---