version 2.3.0-1

2 files changed, 10 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bab059240655..1d671dfa21e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
-# Generated by mksrcinfo v8
-# Sat Aug 17 06:03:05 UTC 2019
 pkgbase = cups-nosystemd
 	pkgdesc = The CUPS Printing System - daemon package
-	pkgver = 2.2.12
+	pkgver = 2.3.0
 	pkgrel = 1
 	url = https://www.cups.org/
 	install = cups-nosystemd.install
 	arch = i686
 	arch = x86_64
 	groups = eudev-base
-	license = GPL
+	license = Apache
+	license = custom
 	makedepends = libtiff>=4.0.0
 	makedepends = libpng>=1.5.7
 	makedepends = xdg-utils
@@ -22,7 +21,7 @@ pkgbase = cups-nosystemd
 	makedepends = inetutils
 	depends = acl
 	depends = pam
-	depends = libcups>=2.2.12
+	depends = libcups>=2.3.0
 	depends = cups-filters
 	depends = bc
 	depends = dbus
@@ -31,7 +30,7 @@ pkgbase = cups-nosystemd
 	optdepends = xdg-utils: xdg .desktop file support
 	optdepends = colord: for ICC color profile support
 	optdepends = cups-openrc: cups openrc initscript
-	provides = cups=2.2.12
+	provides = cups=2.3.0
 	conflicts = cups
 	conflicts = cups-eudev
 	replaces = cups
@@ -44,19 +43,17 @@ pkgbase = cups-nosystemd
 	backup = etc/cups/subscriptions.conf
 	backup = etc/logrotate.d/cups
 	backup = etc/pam.d/cups
-	source = https://github.com/apple/cups/releases/download/v2.2.12/cups-2.2.12-source.tar.gz
+	source = https://github.com/apple/cups/releases/download/v2.3.0/cups-2.3.0-source.tar.gz
 	source = cups
 	source = cups.logrotate
 	source = cups.pam
 	source = cups-no-export-ssllibs.patch
-	source = cups-no-gzip-man.patch
 	source = cups-1.6.2-statedir.patch
-	sha256sums = 0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8
+	sha256sums = acaf0229cf008ea8f06353ffd1bbd62d71dbe88990dd3330650ef87edb95a1a5
 	sha256sums = 87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b
 	sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
 	sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
-	sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
 	sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
 
 pkgname = cups-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 62459a9f0161..3de289fe0068 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname="cups-nosystemd"
-pkgver=2.2.12
+pkgver=2.3.0
 pkgrel=1
 pkgdesc="The CUPS Printing System - daemon package"
 arch=('i686' 'x86_64')
-license=('GPL')
+license=('Apache' 'custom')
 url="https://www.cups.org/"
 groups=('eudev-base')
 depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc'
@@ -33,15 +33,13 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
         cups cups.logrotate cups.pam
         # improve build and linking
         cups-no-export-ssllibs.patch
-        cups-no-gzip-man.patch
         cups-1.6.2-statedir.patch
         )
-sha256sums=('0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8'
+sha256sums=('acaf0229cf008ea8f06353ffd1bbd62d71dbe88990dd3330650ef87edb95a1a5'
             '87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
-            'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af')
 
 prepare() {
@@ -51,9 +49,6 @@ prepare() {
   # Do not export SSL libs in cups-config
   patch -Np1 -i "$srcdir"/cups-no-export-ssllibs.patch
 
-  # don't zip man pages in make install, let makepkg do that / Fedora
-  patch -Np1 -i "$srcdir"/cups-no-gzip-man.patch
-
   # move /var/run -> /run for pid file
   patch -Np1 -i "$srcdir"/cups-1.6.2-statedir.patch