rpms/globus-openssl-module/devel globus-openssl-module.spec, 1.2, 1.3
Mattias Ellert
ellert at fedoraproject.org
Sat Jul 25 07:39:46 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-openssl-module/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9869
Modified Files:
globus-openssl-module.spec
Log Message:
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-3
- Add instruction set architecture (isa) tags
- Make doc subpackage noarch
Index: globus-openssl-module.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/devel/globus-openssl-module.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- globus-openssl-module.spec 15 Jun 2009 16:27:40 -0000 1.2
+++ globus-openssl-module.spec 25 Jul 2009 07:39:45 -0000 1.3
@@ -7,7 +7,7 @@
Name: globus-openssl-module
%global _name %(tr - _ <<< %{name})
Version: 0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Globus Toolkit - Globus OpenSSL Module Wrapper
Group: System Environment/Libraries
@@ -35,42 +35,41 @@ Patch1: %{name}-typo.patch
Patch2: %{name}-mingw.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-proxy-ssl-devel >= 1
-BuildRequires: globus-common-devel >= 3
-BuildRequires: globus-gsi-openssl-error-devel
-BuildRequires: globus-openssl-devel >= 1
-BuildRequires: globus-core >= 4
+BuildRequires: globus-gsi-proxy-ssl-devel%{?_isa} >= 1
+BuildRequires: globus-common-devel%{?_isa} >= 3
+BuildRequires: globus-gsi-openssl-error-devel%{?_isa}
+BuildRequires: globus-openssl-devel%{?_isa} >= 1
+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 OpenSSL Module Wrapper Development Files
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: globus-gsi-proxy-ssl-devel >= 1
-Requires: globus-common-devel >= 3
-Requires: globus-gsi-openssl-error-devel
-Requires: globus-openssl-devel >= 1
-Requires: globus-core >= 4
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: globus-gsi-proxy-ssl-devel%{?_isa} >= 1
+Requires: globus-common-devel%{?_isa} >= 3
+Requires: globus-gsi-openssl-error-devel%{?_isa}
+Requires: globus-openssl-devel%{?_isa} >= 1
+Requires: globus-core%{?_isa} >= 4
%package doc
Summary: Globus Toolkit - Globus OpenSSL Module Wrapper Documentation Files
Group: Documentation
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch: noarch
+%endif
Requires: %{name} = %{version}-%{release}
%description
@@ -206,6 +205,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-3
+- Add instruction set architecture (isa) tags
+- Make doc subpackage noarch
+
* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-2
- Update to official Fedora Globus packaging guidelines
More information about the fedora-extras-commits
mailing list