rpms/globus-libtool/F-11 globus-libtool.spec,1.3,1.4

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-libtool/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9284

Modified Files:
	globus-libtool.spec 
Log Message:
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-4
- Add instruction set architecture (isa) tags



Index: globus-libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-libtool/F-11/globus-libtool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-libtool.spec	15 Jun 2009 15:20:23 -0000	1.3
+++ globus-libtool.spec	25 Jul 2009 07:38:29 -0000	1.4
@@ -9,7 +9,7 @@
 Name:		globus-libtool
 %global _name %(tr - _ <<< %{name})
 Version:	1.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus libtool package
 
 Group:		System Environment/Libraries
@@ -25,31 +25,23 @@ URL:		http://www.globus.org/
 Source:		%{name}-pkg_data_src.gpt.in
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{?fedora}%{!?fedora:0} >= 4
-Requires:	libtool-ltdl
-%else
-%if %{?rhel}%{!?rhel:0} >= 5
-Requires:	libtool-ltdl
+%if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
+Requires:	libtool-ltdl%{?_isa}
 %else
 Requires:	libtool-libs
 %endif
-%endif
 BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-core
+BuildRequires:	globus-core%{?_isa}
 
 %package devel
 Summary:	Globus Toolkit - Globus libtool package Development Files
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-%if %{?fedora}%{!?fedora:0} >= 4
-Requires:	libtool-ltdl-devel
-%else
-%if %{?rhel}%{!?rhel:0} >= 5
-Requires:	libtool-ltdl-devel
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+%if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
+Requires:	libtool-ltdl-devel%{?_isa}
 %else
 Requires:	libtool
 %endif
-%endif
 Requires:	pkgconfig
 
 %description
@@ -129,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-4
+- Add instruction set architecture (isa) tags
+
 * Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.2-3
 - Update to official Fedora Globus packaging guidelines