summaryrefslogtreecommitdiffstats
path: root/main/cups
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-02-19 12:43:09 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-02-19 12:43:09 +0000
commit22bce435337177370455f5e994bd783f2806442e (patch)
tree0037c2a438d1830ca9660d1e095dde8180a97910 /main/cups
parentb481f65765ced6e5513dd371ffa540fb622a2aba (diff)
downloadaports-22bce435337177370455f5e994bd783f2806442e.tar.bz2
aports-22bce435337177370455f5e994bd783f2806442e.tar.xz
main/cups: misc fixes
- the doc files is needed for the web interface - we need openssl for automatic https - create lpadmin group from pre-install
Diffstat (limited to 'main/cups')
-rw-r--r--main/cups/APKBUILD9
-rw-r--r--main/cups/cups.pre-install7
2 files changed, 12 insertions, 4 deletions
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 9ba85a5a2..9cec7401b 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,17 +1,18 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
pkgver=1.5.2
-pkgrel=0
+pkgrel=1
pkgdesc="The CUPS Printing System"
url="http://www.cups.org/"
arch="all"
license="GPL"
subpackages="$pkgname-dev $pkgname-doc libcups $pkgname-client $pkgname-lang"
makedepends="openssl-dev libpaper-dev dbus-dev jpeg-dev>=8 zlib-dev"
-depends="cups-client poppler-utils"
-install=
+depends="cups-client poppler-utils openssl"
+install="cups.pre-install"
pkggroups="lp lpadmin"
pkgusers="lp"
+replaces="cups-doc"
source="ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2
$pkgname.logrotate
cupsd.initd
@@ -37,7 +38,7 @@ build() {
--sysconfdir=/etc \
--localstatedir=/var \
--with-logdir=/var/log/cups \
- --with-docdir=/usr/share/doc/cups \
+ --with-docdir=/usr/share/cups \
--with-cups-user=lp \
--with-cups-group=lp \
--with-system-groups=lpadmin \
diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
new file mode 100644
index 000000000..f6b88cbd2
--- /dev/null
+++ b/main/cups/cups.pre-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+addgroup -S ldadmin 2>/dev/null
+addgroup -S lp 2>/dev/null
+adduser -S -G lp lp 2>/dev/null
+addgroup lp lp 2>/dev/null
+exit 0