From a5487427e253f49af706d2a823662241fb40f5bb Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Jan 17 2013 11:37:08 +0000
Subject: Use arch-specific dependency when requiring base package.


---

diff --git a/gutenprint.spec b/gutenprint.spec
index 2b57a40..8691e3c 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -20,8 +20,8 @@ Patch5:         gutenprint-ui2-libdeps.patch
 Patch6:         gutenprint-yyin.patch
 License:        GPLv2+
 
-BuildRequires:  cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 
-BuildRequires:  gettext-devel,cups-devel,pkgconfig,gimp-devel
+BuildRequires:  cups-libs, cups-devel, cups
+BuildRequires:  gettext-devel,pkgconfig,gimp-devel
 BuildRequires:  libtiff-devel,libjpeg-devel,libpng-devel
 BuildRequires:  foomatic,gtk2-devel
 %if %{build_with_ijs_support}
@@ -33,7 +33,7 @@ Obsoletes:      gimp-print-utils < 4.2.7-25
 Provides:       gimp-print-utils = 4.2.7-25
 
 # Make sure we get postscriptdriver tags.
-BuildRequires:  python-cups, cups
+BuildRequires:  python-cups
 
 ## NOTE ##
 # The README file in this package contains suggestions from upstream
@@ -55,7 +55,7 @@ Documentation for gutenprint.
 %package devel
 Summary:        Library development files for gutenprint
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       gtk2-devel
 Obsoletes:      gimp-print-devel < 4.2.7-25
 Provides:       gimp-print-devel = 4.2.7-25
@@ -67,7 +67,7 @@ uses gutenprint package.
 %package plugin
 Summary:        GIMP plug-in for gutenprint
 Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       gimp
 Obsoletes:      gimp-print-plugin < 4.2.7-25
 Provides:       gimp-print-plugin = 4.2.7-25
@@ -78,7 +78,7 @@ This package contains the gutenprint GIMP plug-in.
 %package foomatic
 Summary:        Foomatic printer database information for gutenprint
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires(post): foomatic
 # python-cups is required for the update script (bug #246865)
 Requires(post): python-cups
@@ -93,7 +93,7 @@ and driver descriptions.
 %package extras
 Summary:        Sample test pattern generator for gutenprint-devel
 Group:          Applications/Publishing
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description extras
 This package contains test pattern generator and the sample test pattern
@@ -103,7 +103,7 @@ that is used by gutenprint-devel package.
 Summary:        CUPS drivers for Canon, Epson, HP and compatible printers
 Group:          Applications/Publishing
 Requires:       cups >= 1.2.1-1.7
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Obsoletes: gimp-print-cups < 4.2.7-26
 Provides: gimp-print-cups = %{version}-%{release}
 Obsoletes: gutenprint-ppds-cs < 5.0.0-8
@@ -254,7 +254,6 @@ exit 0
 %{_datadir}/locale/*/gutenprint_*.po
 
 %files doc
-%defattr(-,root,root,-)
 %doc COPYING AUTHORS NEWS README doc/FAQ.html doc/gutenprint-users-manual.odt doc/gutenprint-users-manual.pdf
 
 %files devel
@@ -303,6 +302,7 @@ fi
 %changelog
 * Thu Jan 17 2013 Jiri Popelka <jpopelka@redhat.com> 5.2.9-2
 - Added IEEE 1284 Device ID for Kyocera FS-1118MFP (bug #782379).
+- Use arch-specific dependency when requiring base package.
 
 * Tue Dec 18 2012 Tim Waugh <twaugh@redhat.com> 5.2.9-7
 - Don't export yy* symbols (bug #882194).