From 8984319b1aa484930b59f506b15e33e84f84de42 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Feb 07 2011 11:25:45 +0000
Subject: Comment hard-coded cups_serverbin (bug #674619).


---

diff --git a/cups.spec b/cups.spec
index 6a08e43..e478c16 100644
--- a/cups.spec
+++ b/cups.spec
@@ -1,9 +1,14 @@
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
+%global php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
-%define use_alternatives 1
-%define lspp 1
-%define cups_serverbin %{_exec_prefix}/lib/cups
+%global use_alternatives 1
+%global lspp 1
+
+# {_exec_prefix}/lib/cups is correct, even on x86_64.
+# It is not used for shared objects but for executables.
+# It's more of a libexec-style ({_libexecdir}) usage,
+# but we use lib for compatibility with 3rd party drivers (at upstream request).
+%global cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups