From 5b595e87ba1966ae12d1caea81e0c0e4db34c15160fe20714459949e0073d474 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 10 Jan 2012 10:02:58 +0000 Subject: [PATCH] Accepting request 99539 from home:elvigia:branches:Printing - Use explicit buildrequires on the needed libraries. otherwise build will fail after libtiff-devel deps cleanup - Cleanup requires of -devel package, which only needs glibc-devel - Fix up, cups-config script, which with option --libs adds: LIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lssl -lcrypto -lz -lpthread -lm -lcrypt " IMGLIBS="-ltiff -ljpeg -lpng" This only makes sense when using static linking but we dont ship static libraries and will only help bloating dependant packages. OBS-URL: https://build.opensuse.org/request/show/99539 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=232 --- cups-config-libs.patch | 13 +++++++++++++ cups.changes | 13 +++++++++++++ cups.spec | 26 ++++++++++++++++++++------ 3 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 cups-config-libs.patch diff --git a/cups-config-libs.patch b/cups-config-libs.patch new file mode 100644 index 0000000..20e7af3 --- /dev/null +++ b/cups-config-libs.patch @@ -0,0 +1,13 @@ +--- cups-config.in.orig ++++ cups-config.in +@@ -35,8 +35,8 @@ INSTALLSTATIC=@INSTALLSTATIC@ + # flags for C++ compiler: + CFLAGS="" + LDFLAGS="@EXPORT_LDFLAGS@" +-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@" +-IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@" ++LIBS="" ++IMGLIBS="" + + # Check for local invocation... + selfdir=`dirname $0` diff --git a/cups.changes b/cups.changes index 0ffca85..9fd9710 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jan 10 04:58:44 UTC 2012 - crrodriguez@opensuse.org + +- Use explicit buildrequires on the needed libraries. + otherwise build will fail after libtiff-devel deps cleanup +- Cleanup requires of -devel package, which only needs glibc-devel +- Fix up, cups-config script, which with option --libs adds: + LIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lssl -lcrypto + -lz -lpthread -lm -lcrypt " + IMGLIBS="-ltiff -ljpeg -lpng" + This only makes sense when using static linking but we dont ship + static libraries and will only help bloating dependant packages. + ------------------------------------------------------------------- Sat Dec 17 18:19:14 UTC 2011 - crrodriguez@opensuse.org diff --git a/cups.spec b/cups.spec index ebcdc7d..f3b1f15 100644 --- a/cups.spec +++ b/cups.spec @@ -1,7 +1,7 @@ # # spec file for package cups # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -18,10 +18,22 @@ Name: cups -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 pkgconfig update-desktop-files +BuildRequires: avahi-compat-mDNSResponder-devel +BuildRequires: dbus-1-devel +BuildRequires: gcc-c++ +BuildRequires: krb5-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: zlib-devel +BuildRequires: libjpeg-devel +BuildRequires: openldap2-devel +BuildRequires: openslp-devel +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: tcpd-devel +BuildRequires: fdupes +BuildRequires: update-desktop-files # Have libtool as explicit buildrequirement to no longer depend # on a "hidden" buildrequirement in the OBS project definition: BuildRequires: libtool @@ -114,6 +126,7 @@ Patch103: cups-1.4-do_not_strip_recommended_from_PPDs.patch # see https://fate.novell.com/303515 Patch104: cups-1.5-additional_policies.patch Patch105: cups-0001-systemd-add-systemd-socket-activation-and-unit-files.patch +Patch106: cups-config-libs.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -180,7 +193,7 @@ Group: Development/Libraries/C and C++ # there are no CUPS-internal dependencies via CUPS private API calls # (the latter would require the exact matching cups-libs version-release): Requires: cups-libs = %{version} -Requires: openssl-devel glibc-devel krb5-devel +Requires: glibc-devel # https://bugzilla.novell.com/show_bug.cgi?id=437293 %ifarch ppc64 Obsoletes: cups-devel-64bit @@ -243,6 +256,7 @@ printer drivers for CUPS. # Patch104 adds the 'allowallforanybody' policy to cupsd.conf: %patch104 %patch105 +%patch106 %build # Disable SILENT run of make so that make runs verbose as usual: