From 4c6f0f572525d99e3212aef1add78ac91809536c82e290ee40601ac3cc8efb1c Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Thu, 3 Mar 2016 15:54:43 +0000
Subject: [PATCH] Accepting request 365514 from home:jsmeix:branches:Printing

Rename beh to beh.pl to avoid a file conflict with cups-filters that now also provides a beh backend as C rewrite of the old one here

OBS-URL: https://build.opensuse.org/request/show/365514
OBS-URL: https://build.opensuse.org/package/show/Printing/cups-backends?expand=0&rev=14
---
 cups-backends.changes |  9 +++++++++
 cups-backends.spec    | 13 +++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/cups-backends.changes b/cups-backends.changes
index f5032a0..afa7856 100644
--- a/cups-backends.changes
+++ b/cups-backends.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Mar  3 16:44:47 CET 2016 - jsmeix@suse.de
+
+- Since cups-filters version 1.6.0 the beh backend is provided
+  by the cups-filters RPM as /usr/lib/cups/backend/beh which is
+  a C re-write of the beh backend written in Perl that is still
+  provided here but now named /usr/lib/cups/backend/beh.pl
+  to avoid that cups-backends conflicts with cups-filters.
+
 -------------------------------------------------------------------
 Fri Mar 28 10:36:08 CET 2014 - jsmeix@suse.de
 
diff --git a/cups-backends.spec b/cups-backends.spec
index 420faa9..8143d8c 100644
--- a/cups-backends.spec
+++ b/cups-backends.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cups-backends
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -59,14 +59,19 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/cups/backend
 # Source0: cups-pipe.sh
 install -m 755 ${RPM_SOURCE_DIR}/pipe $RPM_BUILD_ROOT/usr/lib/cups/backend/pipe
 # Source1: beh
-install -m 755 ${RPM_SOURCE_DIR}/beh $RPM_BUILD_ROOT/usr/lib/cups/backend/beh
+# Since cups-filters version 1.6.0 the beh backend is provided
+# by the cups-filters RPM as /usr/lib/cups/backend/beh which is
+# a C re-write of the beh backend written in Perl that is still
+# 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
 
-%files 
+%files
 %defattr(-,root,root,-)
 %doc ${RPM_SOURCE_DIR}/COPYING
 %dir /usr/lib/cups
 %dir /usr/lib/cups/backend
 /usr/lib/cups/backend/pipe
-/usr/lib/cups/backend/beh
+/usr/lib/cups/backend/beh.pl
 
 %changelog