[arch-commits] Commit in cups/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Friday, April 17, 2009 @ 10:58:12
  Author: andyrtr
Revision: 35832

Merged revisions 35831 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/cups/trunk

........
  r35831 | andyrtr | 2009-04-17 14:57:27 +0000 (Fr, 17 Apr 2009) | 2 lines
  
  upgpkg: cups 1.3.10-1
      new version 1.3.10
........

Modified:
  cups/repos/extra-x86_64/	(properties)
  cups/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)


Property changes on: cups/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /cups/trunk:1-24518
   + /cups/trunk:1-35831

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-17 14:57:27 UTC (rev 35831)
+++ extra-x86_64/PKGBUILD	2009-04-17 14:58:12 UTC (rev 35832)
@@ -2,34 +2,31 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=cups
-pkgver=1.3.9
-pkgrel=4
+pkgver=1.3.10
+pkgrel=1
 pkgdesc="The CUPS Printing System"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'avahi' 'heimdal>=1.2.1-3' 'gnutls>=2.6.3')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'avahi' 'heimdal>=1.2.1-3' 'gnutls>=2.6.5')
 makedepends=('xinetd')
 install=cups.install
 backup=(etc/cups/{printers.conf,client.conf,cupsd.conf,mime.types,mime.convs}
         etc/cups/classes.conf etc/logrotate.d/cups etc/pam.d/cups
         etc/xinetd.d/cups-lpd)
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-	http://www.cups.org/strfiles/2974/str2974.patch
         cups cups.logrotate cups.pam cupsd.conf cups-1.3.7-peercred.patch)
-md5sums=('cf63f451c356e6cabb08972d4d11c365'
-         'a601f6fd4f4c2dac889b970a68a53b4b'
+options=('!emptydirs' '!makeflags')
+md5sums=('84fffe96b8537c81a463faccead80026'
          '5c85b7d8d2ddd02c2c64955cebbf55ea'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
          '3a55ba2b942182ab0bd2584c2138cb2d'
          '99e54c2fc138360bb7622bea4f0977bc')
-options=('!emptydirs' '!makeflags')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -p1 < ../cups-1.3.7-peercred.patch || return 1
-  patch -Np0 -i ${srcdir}/str2974.patch || return 1
   # fix french search template
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \