Accepting request 497323 from home:dimstar:Factory
Resubmit - only conditionally change to pkgconfig; openSUSE 13.1 did not yet support this. I enabled build targets as requested in home:dimstar:Factory/cups" OBS-URL: https://build.opensuse.org/request/show/497323 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=328
This commit is contained in:
parent
6f9127aa90
commit
a4cb636138
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 20 08:24:11 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- Replace krb5-devel BuildRequires with pkgconfig(krb5) on
|
||||
suse_version >= 1315: give OBS a better chance to break up build
|
||||
cycles.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 20 16:26:52 UTC 2017 - alarrosa@suse.com
|
||||
|
||||
|
16
cups.spec
16
cups.spec
@ -70,7 +70,6 @@ BuildRequires: dbus-1-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libavahi-devel
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
@ -81,6 +80,11 @@ BuildRequires: libusb-1_0-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: zlib-devel
|
||||
%if 0%{?suse_version} >= 1315
|
||||
BuildRequires: pkgconfig(krb5)
|
||||
%else
|
||||
BuildRequires: krb5-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1310
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
%else
|
||||
@ -139,9 +143,9 @@ browsing". This is now handled by cups-browsed service.
|
||||
|
||||
%package libs
|
||||
Summary: Libraries for CUPS
|
||||
# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun:
|
||||
License: GPL-2.0 and LGPL-2.1
|
||||
Group: Hardware/Printing
|
||||
# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun:
|
||||
Requires(pre): /sbin/ldconfig
|
||||
%if 0%{?suse_version} >= 1330
|
||||
Requires(pre): group(lp)
|
||||
@ -163,8 +167,6 @@ browsing". This is now handled by cups-browsed service.
|
||||
|
||||
%package client
|
||||
Summary: CUPS Client Programs
|
||||
License: GPL-2.0
|
||||
Group: Hardware/Printing
|
||||
# Require the exact matching version-release of the cups-libs sub-package because
|
||||
# non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
|
||||
# because all CUPS software is built from the one same CUPS source tar ball
|
||||
@ -174,6 +176,8 @@ Group: Hardware/Printing
|
||||
# on the same package repository where the cups package is because
|
||||
# all are built simulaneously from the same cups source package
|
||||
# and all required packages are provided on the same repository:
|
||||
License: GPL-2.0
|
||||
Group: Hardware/Printing
|
||||
Requires: cups-libs = %{version}-%{release}
|
||||
# Conflicts with other print spoolers which provide same binaries like /usr/bin/lp and so on:
|
||||
Conflicts: lprng
|
||||
@ -196,13 +200,13 @@ browsing". This is now handled by cups-browsed service.
|
||||
|
||||
%package devel
|
||||
Summary: Development Environment for CUPS
|
||||
License: GPL-2.0
|
||||
Group: Development/Libraries/C and C++
|
||||
# Do not require the exact matching version-release of cups-libs
|
||||
# but only a cups-libs package with matching version because
|
||||
# for building third-party software which uses only the CUPS public API
|
||||
# there are no CUPS-internal dependencies via CUPS private API calls
|
||||
# (the latter would require the exact matching cups-libs version-release):
|
||||
License: GPL-2.0
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: cups-libs = %{version}
|
||||
Requires: glibc-devel
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user