rpms/globus-xio/EL-4 globus-xio.spec,1.3,1.4
Mattias Ellert
ellert at fedoraproject.org
Sat Jul 25 07:45:20 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-xio/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12348
Modified Files:
globus-xio.spec
Log Message:
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-5
- Add instruction set architecture (isa) tags
- Make doc subpackage noarch
Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/EL-4/globus-xio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-xio.spec 15 Jun 2009 17:59:06 -0000 1.3
+++ globus-xio.spec 25 Jul 2009 07:45:19 -0000 1.4
@@ -7,7 +7,7 @@
Name: globus-xio
%global _name %(tr - _ <<< %{name})
Version: 2.7
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Globus Toolkit - Globus XIO Framework
Group: System Environment/Libraries
@@ -42,34 +42,33 @@ BuildRoot: %{_tmppath}/%{name}-%{version
Requires: globus-common
BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel >= 4
-BuildRequires: globus-core >= 4
+BuildRequires: globus-common-devel%{?_isa} >= 4
+BuildRequires: globus-core%{?_isa} >= 4
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 - Globus XIO Framework Development Files
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: globus-common-devel >= 4
-Requires: globus-core >= 4
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: globus-common-devel%{?_isa} >= 4
+Requires: globus-core%{?_isa} >= 4
%package doc
Summary: Globus Toolkit - Globus XIO Framework Documentation Files
Group: Documentation
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch: noarch
+%endif
Requires: %{name} = %{version}-%{release}
%description
@@ -215,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-5
+- Add instruction set architecture (isa) tags
+- Make doc subpackage noarch
+
* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-4
- Update to official Fedora Globus packaging guidelines
More information about the fedora-extras-commits
mailing list