From 9a30c3d0083b8330b1aa6c0f89245e68ae762ee5 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 19 May 2013 01:31:03 -0700
Subject: Sun May 19 01:30:44 PDT 2013

---
 extra/cups/PKGBUILD     |  6 +++---
 extra/cups/cups.install | 15 ++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'extra/cups')

diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 7cefbaaca..3706afac0 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180282 2013-03-19 15:32:07Z andyrtr $
+# $Id: PKGBUILD 185777 2013-05-18 15:46:13Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -46,6 +46,7 @@ build() {
   autoconf -I config-scripts
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+     --sbindir=/usr/bin \
      --libdir=/usr/lib \
      --with-systemdsystemunitdir=/usr/lib/systemd/system \
      --with-logdir=/var/log/cups \
@@ -84,7 +85,6 @@ backup=(etc/cups/client.conf)
   
   # install client.conf man page and config file
   install -dm755 ${pkgdir}/usr/share/man/man5
-  #install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
   install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
   install -dm755 ${pkgdir}/etc/cups
   touch ${pkgdir}/etc/cups/client.conf
diff --git a/extra/cups/cups.install b/extra/cups/cups.install
index fc015f951..121eeb0f3 100644
--- a/extra/cups/cups.install
+++ b/extra/cups/cups.install
@@ -1,6 +1,6 @@
 post_install() {
     if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
     fi
  echo ">> If you use an HTTPS connection to CUPS, the first time you access"
  echo ">> the interface it may take a very long time before the site comes up."
@@ -10,13 +10,9 @@ post_install() {
 
 post_upgrade() {
     if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
     fi
-  if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
-    # important upgrade notice
-    echo "daemon script has been renamed to /etc/rc.d/cupsd"
-    echo "change your entry in  /etc/rc.conf"
-  fi
+  
   if [ "`vercmp $2 1.6.0`" -lt 0 ]; then
     # important upgrade notice
     echo "* avahi-daemon should now run before you start cupsd for"
@@ -24,7 +20,8 @@ post_upgrade() {
     echo "* check your config with cupsd -t"
     echo "  and fix all Browsing related settings"
   fi
-    if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
+
+  if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
     # important upgrade notice
     echo "> It's now safe to load usblp kernel module."
     echo "> There's no more need to blacklist it."
@@ -33,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
     if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
     fi
 }
-- 
cgit v1.2.3-54-g00ecf