From 86a6dd5fb39aeb3332991fbc1a33b4ea394e48d51e2db830a467394380d35fd5 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Thu, 9 Mar 2017 08:23:56 +0000 Subject: [PATCH] Accepting request 477869 from home:sfalken:branches:Printing - Changed how COPYING is installed. The %doc macro is no longer properly expanding ${RPM_SOURCE_DIR}, and isn't handling things properly with having the COPYING file manually installed in this package. Clears builderror in openSUSE:Factory. OBS-URL: https://build.opensuse.org/request/show/477869 OBS-URL: https://build.opensuse.org/package/show/Printing/cups-backends?expand=0&rev=16 --- cups-backends.changes | 8 ++++++++ cups-backends.spec | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cups-backends.changes b/cups-backends.changes index afa7856..84b35eb 100644 --- a/cups-backends.changes +++ b/cups-backends.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 9 04:48:05 UTC 2017 - sfalken@opensuse.org + +- Changed how COPYING is installed. The %doc macro is no longer + properly expanding ${RPM_SOURCE_DIR}, and isn't handling things + properly with having the COPYING file manually installed in + this package. Clears builderror in openSUSE:Factory. + ------------------------------------------------------------------- Thu Mar 3 16:44:47 CET 2016 - jsmeix@suse.de diff --git a/cups-backends.spec b/cups-backends.spec index 8143d8c..e08d5f8 100644 --- a/cups-backends.spec +++ b/cups-backends.spec @@ -1,7 +1,7 @@ # # spec file for package cups-backends # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -65,13 +65,16 @@ install -m 755 ${RPM_SOURCE_DIR}/pipe $RPM_BUILD_ROOT/usr/lib/cups/backend/pipe # provided here but now named /usr/lib/cups/backend/beh.pl # to avoid that cups-backends conflicts with cups-filters: install -m 755 ${RPM_SOURCE_DIR}/beh $RPM_BUILD_ROOT/usr/lib/cups/backend/beh.pl +# Source100: COPYING +install -Dm 644 %{S:1} %{buildroot}%{_docdir}/%{name}/COPYING %files %defattr(-,root,root,-) -%doc ${RPM_SOURCE_DIR}/COPYING %dir /usr/lib/cups %dir /usr/lib/cups/backend +%dir %{_docdir}/%{name} /usr/lib/cups/backend/pipe /usr/lib/cups/backend/beh.pl +%{_docdir}/%{name}/COPYING %changelog