rpms/globus-gssapi-gsi/EL-5 globus-gssapi-gsi.spec,1.2,1.3

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-gssapi-gsi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8386

Modified Files:
	globus-gssapi-gsi.spec 
Log Message:
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-4
- Add instruction set architecture (isa) tags
- Make doc subpackage noarch



Index: globus-gssapi-gsi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/EL-5/globus-gssapi-gsi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- globus-gssapi-gsi.spec	15 Jun 2009 17:34:45 -0000	1.2
+++ globus-gssapi-gsi.spec	25 Jul 2009 07:36:39 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-gssapi-gsi
 %global _name %(tr - _ <<< %{name})
 Version:	5.9
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - GSSAPI library
 
 Group:		System Environment/Libraries
@@ -40,50 +40,49 @@ Patch2:		%{name}-sslinit.patch
 Patch3:		%{name}-type-punned-pointer.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-openssl >= 1
+Requires:	globus-openssl%{?_isa} >= 1
 BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-gsi-credential-devel >= 1
-BuildRequires:	globus-gsi-callback-devel
-BuildRequires:	globus-openssl-module-devel
-BuildRequires:	globus-gsi-openssl-error-devel
-BuildRequires:	globus-openssl-devel >= 1
-BuildRequires:	globus-gsi-proxy-core-devel >= 1
-BuildRequires:	globus-core >= 4
-BuildRequires:	globus-gsi-cert-utils-devel >= 5
-BuildRequires:	globus-common-devel >= 3
+BuildRequires:	globus-gsi-credential-devel%{?_isa} >= 1
+BuildRequires:	globus-gsi-callback-devel%{?_isa}
+BuildRequires:	globus-openssl-module-devel%{?_isa}
+BuildRequires:	globus-gsi-openssl-error-devel%{?_isa}
+BuildRequires:	globus-openssl-devel%{?_isa} >= 1
+BuildRequires:	globus-gsi-proxy-core-devel%{?_isa} >= 1
+BuildRequires:	globus-core%{?_isa} >= 4
+BuildRequires:	globus-gsi-cert-utils-devel%{?_isa} >= 5
+BuildRequires:	globus-common-devel%{?_isa} >= 3
 BuildRequires:	doxygen
 BuildRequires:	graphviz
-BuildRequires:	ghostscript
 %if "%{?rhel}" == "5"
 BuildRequires:	graphviz-gd
 %endif
-%if %{?fedora}%{!?fedora:0} >= 9
-BuildRequires:	tex(latex)
-%else
-%if %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:	ghostscript
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	tex(latex)
 %else
 BuildRequires:	tetex-latex
 %endif
-%endif
 
 %package devel
 Summary:	Globus Toolkit - GSSAPI library Development Files
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	globus-gsi-credential-devel >= 1
-Requires:	globus-gsi-callback-devel
-Requires:	globus-openssl-module-devel
-Requires:	globus-gsi-openssl-error-devel
-Requires:	globus-openssl-devel >= 1
-Requires:	globus-gsi-proxy-core-devel >= 1
-Requires:	globus-core >= 4
-Requires:	globus-gsi-cert-utils-devel >= 5
-Requires:	globus-common-devel >= 3
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	globus-gsi-credential-devel%{?_isa} >= 1
+Requires:	globus-gsi-callback-devel%{?_isa}
+Requires:	globus-openssl-module-devel%{?_isa}
+Requires:	globus-gsi-openssl-error-devel%{?_isa}
+Requires:	globus-openssl-devel%{?_isa} >= 1
+Requires:	globus-gsi-proxy-core-devel%{?_isa} >= 1
+Requires:	globus-core%{?_isa} >= 4
+Requires:	globus-gsi-cert-utils-devel%{?_isa} >= 5
+Requires:	globus-common-devel%{?_isa} >= 3
 
 %package doc
 Summary:	Globus Toolkit - GSSAPI library Documentation Files
 Group:		Documentation
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch:	noarch
+%endif
 Requires:	%{name} = %{version}-%{release}
 
 %description
@@ -224,6 +223,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-4
+- Add instruction set architecture (isa) tags
+- Make doc subpackage noarch
+
 * Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-3
 - Update to official Fedora Globus packaging guidelines