From 8d3bb2327d24022fc511350937c382606a248b24 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Jan 20 2010 16:18:11 +0000 Subject: use %_isa instead of %_arch for architecture-specific dependencies --- diff --git a/gimp.spec b/gimp.spec index 20edbb4..21db98d 100644 --- a/gimp.spec +++ b/gimp.spec @@ -115,8 +115,7 @@ Requires: gimp-print-plugin Requires: hicolor-icon-theme Requires: pygtk2 >= 2.10.4 Requires: xdg-utils -Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: gimp-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2 Source1: gimp-plugin-mgr.in @@ -142,7 +141,7 @@ with multi-level undo. Summary: GIMP libraries Group: System Environment/Libraries License: LGPLv2+ -Provides: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs The gimp-libs package contains shared libraries needed for the GNU Image @@ -152,7 +151,7 @@ Manipulation Program (GIMP). Summary: GIMP plugin and extension development kit Group: Development/Libraries License: LGPLv2+ -Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gtk2-devel Requires: glib2-devel @@ -178,7 +177,7 @@ Summary: GIMP help browser plug-in Group: Applications/Multimedia License: GPLv2+ Obsoletes: gimp < 2:2.6.0-3 -Requires: gimp-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: gimp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description help-browser The gimp-help-browser package contains a lightweight help browser plugin for @@ -499,6 +498,9 @@ fi %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser %changelog +* Wed Jan 20 2010 Nils Philippsen +- use %%_isa instead of %%_arch for architecture-specific dependencies + * Fri Dec 11 2009 Nils Philippsen - 2:2.6.8-1 - version 2.6.8