From 758ff8f0dff359e4ce366ede91c9b502d182bc61 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Wed, 8 Oct 2014 00:13:00 -0400
Subject: [PATCH] fix cups-filter systemd service unit

---
 cups-filters/PKGBUILD                         | 35 +++++++++++--------
 ttf-malayalam-fonts/PKGBUILD                  | 32 -----------------
 .../ttf-malayalam-fonts.install               | 15 --------
 3 files changed, 20 insertions(+), 62 deletions(-)
 delete mode 100644 ttf-malayalam-fonts/PKGBUILD
 delete mode 100644 ttf-malayalam-fonts/ttf-malayalam-fonts.install

diff --git a/cups-filters/PKGBUILD b/cups-filters/PKGBUILD
index 126609d60..13b3c1a8d 100644
--- a/cups-filters/PKGBUILD
+++ b/cups-filters/PKGBUILD
@@ -1,45 +1,50 @@
 # Maintainer: Neophytos Kolokotronis <tetris4ATgmailDOTcom>
 
 pkgname=cups-filters
-pkgver=1.0.58
+pkgver=1.0.59
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
 depends=('lcms2' 'poppler' 'qpdf')
-makedepends=('ghostscript' 'ttf-dejavu') 
+makedepends=('ghostscript')
+checkdepends=('ttf-dejavu')
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly')
-backup=(etc/fonts/conf.d/99pdftoopvp.conf)
-source=("http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz")
-md5sums=('0143ef62cd229e99fd3b03e827b1c122')
+backup=(etc/fonts/conf.d/99pdftoopvp.conf
+        etc/cups/cups-browsed.conf)
+source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz)
+md5sums=('dcd00a9362d8374e15e3864a3e39a482')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
+    --localstatedir=/var \
     --with-rcdir=no \
     --enable-avahi \
-    --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf \
-    --with-browseremoteprotocols=DNSSD,CUPS
+    --with-browseremoteprotocols=DNSSD,CUPS \
+    --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
   make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
+  cd $pkgname-$pkgver
+  make check
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
-  # drop static lib
-  rm -f ${pkgdir}/usr/lib/*.a
-  # systemd service
+  
+  # add upstream systemd support file
   install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  
+  # use lp group from cups pkg FS#36769
+  chgrp -R lp ${pkgdir}/etc/cups
 }
diff --git a/ttf-malayalam-fonts/PKGBUILD b/ttf-malayalam-fonts/PKGBUILD
deleted file mode 100644
index 32a61e8ad..000000000
--- a/ttf-malayalam-fonts/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer abveritas@chakra-project.org
-# ontributor CCR: Sebin A Jacob  sebinajacob at gmail dot com
-# ontributor AUR: Aashik S  aashiks at gmail dot com
-
-pkgname=ttf-malayalam-fonts
-# This variable had to be introduced to deal with the peculiar naming scheme and 
-# the directory structure of the source when extracted folder
-pkgver="5.0.1"
-pkgrel=1
-pkgdesc=" This is a set of TrueType and OpenType fonts released under the GNU General Public License for Malayalam Language."
-arch=('i686' 'x86_64')
-url="http://smc.org.in/"
-license=('GPL')
-depends=('fontconfig' 'xorg-fonts-encodings')
-install=ttf-malayalam-fonts.install
-source=(http://download.savannah.gnu.org/releases-noredirect/smc/fonts/malayalam-fonts-${pkgver}.zip)
-md5sums=('b459a03b91fd42d16c71370e21f0cf77')
-
-
-build() {
-  cd "${srcdir}/malayalam-fonts-${pkgver}" 
-  mkdir -p "${pkgdir}/usr/share/fonts/TTF" 
-  for f in `ls ./*/*.ttf`
-  do
-    install -m644 $f "${pkgdir}/usr/share/fonts/TTF" 
-  done
-  mkdir -p "${pkgdir}/etc/fonts/conf.d" 
-  install *.conf "${pkgdir}/etc/fonts/conf.d" 
-}
diff --git a/ttf-malayalam-fonts/ttf-malayalam-fonts.install b/ttf-malayalam-fonts/ttf-malayalam-fonts.install
deleted file mode 100644
index 26e912fe9..000000000
--- a/ttf-malayalam-fonts/ttf-malayalam-fonts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo "Running fc-cache to update font cache"
-  fc-cache -fs
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
-  echo "Finished updating font cache"
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}