Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=477cd53e4ca834f9ef43f86fe26506a3d87f09db

commit 477cd53e4ca834f9ef43f86fe26506a3d87f09db
Author: DeX77 <[email protected]>
Date:   Tue Jan 5 15:32:07 2016 +0100

cups-2.1.2-2-x86_64

* rebuild / fix depends / cleanup

diff --git a/source/xapps/cups/FrugalBuild b/source/xapps/cups/FrugalBuild
index 867ce5e..4a3f4c3 100644
--- a/source/xapps/cups/FrugalBuild
+++ b/source/xapps/cups/FrugalBuild
@@ -4,12 +4,12 @@

pkgname=cups
pkgver=2.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="The CUPS Printing System"
url="http://www.cups.org/";
-depends=('libtiff' 'libpng>=1.4.1' 'libjpeg>=8a' 'systemd' 
'poppler-pdftools>=0.18.0' 'xdg-utils')
-makedepends=('gnutls>=3.4.2')
+depends=('avahi' 'libusb1>=1.0.20-4')
rodepends=('libcups')
+makedepends=('xdg-utils' 'hicolor-icon-theme')
groups=('xapps')
archs=('i686' 'x86_64' 'arm')
backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs})
@@ -24,27 +24,26 @@ conflicts=("${provides[@]}")

subpkgs=('libcups')
subdescs=('Main library of the CUPS printing system.')
-subdepends=('gnutls>=3.4.2 zlib')
subgroups=('lib')
+subdepends=('gnutls>=3.4.7-3 avahi')
subarchs=('i686 x86_64 arm')

+# Do NOT remove --libdir option, needed for x86_64 to put libs into /usr/lib
+Fconfopts+="   --with-cups-user=lp \
+                --with-cups-group=lp \
+                --with-logdir=/var/log/cups \
+                --with-docdir=/usr/share/cups/doc \
+                --disable-pam \
+                --enable-ssl \
+                --enable-threads \
+                --libdir=/usr/lib"
+
+_F_make_opts="${_F_make_opts} "
+
build() {
Fsed "Icon=cups" "Icon=/usr/share/pixmaps/cups-128.png" desktop/cups.desktop.in

-       Fpatchall
-       aclocal -I config-scripts
-       autoconf -I config-scripts
-
-       # Do NOT remove --libdir option, needed for x86_64 to put libs into 
/usr/lib
-       Fmake --with-cups-user=lp \
-               --with-cups-group=lp \
-               --with-logdir=/var/log/cups \
-               --with-docdir=/usr/share/cups/doc \
-               --disable-pam \
-               --enable-ssl \
-               --enable-threads \
-               --libdir=/usr/lib \
-               --disable-ldap
+       Fmake
make BUILDROOT=$Fdestdir install || Fdie

Ficonrel desktop/cups-128.png
@@ -55,7 +54,7 @@ build() {
fi )

# fix perms on /var/spool
-       chmod 755 $Fdestdir/var/spool
+       Fchmod 755 var/spool

Frm /etc/rc.d
Frm /usr/share/cups/{banners,data}/ # Conflicts with cups-filters
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to