pool/cups
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 213204 from home:jsmeix:branches:Printing

Browse Source 
cups fixes for bnc#857372 and bnc#856731

OBS-URL: https://build.opensuse.org/request/show/213204
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=269
This commit is contained in:
Johannes Meixner
2014-01-08 15:52:25 +00:00
committed by Git OBS Bridge
parent 056668eb06
commit 77d03bb05f
3 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cups.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package cups
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -183,6 +183,9 @@ Patch109: str4190.patch
# Patch110 avoids any possible busy loop in cups-polld in case of unusual issues
# by sleeping interval seconds see https://bugzilla.novell.com/show_bug.cgi?id=828228
Patch110: cups-polld_avoid_busy_loop.patch
# Patch111 fixes the systemd cups.socket file so that systemd listens only on localhost
# (i.e. where the cupsd itself listens by default). Patch111 must be applied on top of Patch105.
Patch111: cups-0002-systemd-listen-only-on-localhost-for-socket-activation.patch
# Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -329,6 +332,9 @@ printer drivers for CUPS.
%patch109
# Patch110 avoids any possible busy loop in cups-polld
%patch110
# Patch111 fixes the systemd cups.socket file so that systemd listens only on localhost
# (i.e. where the cupsd itself listens by default). Patch111 must be applied on top of Patch105.
%patch111
%build
# Disable SILENT run of make so that make runs verbose as usual:
@@ -388,10 +394,6 @@ sed -i -e 's|/var/lock|/run/lock|g' $RPM_BUILD_ROOT/etc/init.d/cups
# Source103: cups.sysconfig
install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cups
# Use Ghostscript fonts instead of CUPS fonts:
rm -r $RPM_BUILD_ROOT/usr/share/cups/fonts
mkdir -p $RPM_BUILD_ROOT/usr/share/ghostscript/fonts
ln -sf /usr/share/ghostscript/fonts $RPM_BUILD_ROOT/usr/share/cups/
# Make directory for ssl files:
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
# Add a client.conf as template (Source108: cups-client.conf):