From 573b86591ea2608dbe381494dcc112083cf9850ddc57b7276d0d43044e45cb8d Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Thu, 9 Dec 2010 13:57:30 +0000 Subject: [PATCH] Accepting request 55382 from home:jsmeix:branches:Printing Fixed coolos unconditioned PreReq OBS-URL: https://build.opensuse.org/request/show/55382 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=210 --- cups.changes | 9 +++++++++ cups.spec | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cups.changes b/cups.changes index f5df3a2..3089add 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Dec 9 13:26:06 CET 2010 - jsmeix@suse.de + +- Fixing coolo's quick and ditry unconditioned + "PreReq: sysvinit(syslog)" stuff from below because build fails + everywhere except openSUSE:Factory (i.e. openSUSE 11.4) + because sysvinit(syslog) is nowhere else provided. + Now the PreReq is only if suse_version > 1130. + ------------------------------------------------------------------- Tue Dec 7 21:18:59 UTC 2010 - coolo@novell.com diff --git a/cups.spec b/cups.spec index ec1dcb1..8f053d1 100644 --- a/cups.spec +++ b/cups.spec @@ -23,8 +23,13 @@ BuildRequires: avahi-compat-mDNSResponder-devel dbus-1-devel gcc-c++ BuildRequires: krb5-devel libpng-devel libtiff-devel openldap2-devel BuildRequires: openslp-devel openssl-devel pam-devel pkg-config tcpd-devel BuildRequires: fdupes update-desktop-files -PreReq: textutils, fileutils, sh-utils, %insserv_prereq, -PreReq: %fillup_prereq /usr/sbin/groupadd sysvinit(syslog) +PreReq: textutils, fileutils, sh-utils, /usr/sbin/groupadd +PreReq: %insserv_prereq +PreReq: %fillup_prereq +# sysvinit(syslog) is first provided in openSUSE:Factory (i.e. openSUSE 11.4): +%if 0%{?suse_version} > 1130 +PreReq: sysvinit(syslog) +%endif Url: http://www.cups.org/ License: GPLv2+ ; LGPLv2.1+ Group: Hardware/Printing