rpms/globus-common/F-10 globus-common.spec,1.5,1.6
Mattias Ellert
ellert at fedoraproject.org
Sat Jul 25 07:26:22 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2834
Modified Files:
globus-common.spec
Log Message:
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-6
- Add instruction set architecture (isa) tags
- Make doc subpackage noarch
- Replace /usr/bin/env shebangs
Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/globus-common.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- globus-common.spec 15 Jun 2009 15:36:19 -0000 1.5
+++ globus-common.spec 25 Jul 2009 07:26:22 -0000 1.6
@@ -10,7 +10,7 @@ Name: globus-common
%global _name %(tr - _ <<< %{name})
Version: 10.2
%global setupversion 2.6
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Globus Toolkit - Common Library
Group: System Environment/Libraries
@@ -74,52 +74,47 @@ Patch11: %{name}-pathmax.patch
Patch12: %{name}-setup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-libtool >= 1
+Requires: globus-libtool%{?_isa} >= 1
BuildRequires: grid-packaging-tools
-BuildRequires: globus-libtool-devel >= 1
-BuildRequires: globus-core >= 4
+BuildRequires: globus-libtool-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 progs
Summary: Globus Toolkit - Common Library Programs
Group: Applications/Internet
Provides: %{name}-setup = %{setupversion}
-Requires: %{name} = %{version}-%{release}
-Requires: globus-libtool >= 1
-%if %{?fedora}%{!?fedora:0}
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-%else
-%if %{?rhel}%{!?rhel:0} >= 4
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: globus-libtool%{?_isa} >= 1
+%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 4
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires: perl
%endif
-%endif
%package devel
Summary: Globus Toolkit - Common Library Development Files
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: globus-libtool-devel >= 1
-Requires: globus-core >= 4
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: globus-libtool-devel%{?_isa} >= 1
+Requires: globus-core%{?_isa} >= 4
%package doc
Summary: Globus Toolkit - Common Library Documentation Files
Group: Documentation
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildArch: noarch
+%endif
Requires: %{name} = %{version}-%{release}
%description
@@ -284,6 +279,10 @@ grep globus-makefile-header $GLOBUSPACKA
sed /globus-makefile-header/d \
-i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
+# Don't use /usr/bin/env
+sed 's!/usr/bin/env perl!/usr/bin/perl!' \
+ -i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header*
+
# Remove config.guess file (conflicts with grid-packaging-tools package)
rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
sed /config.guess/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
@@ -371,6 +370,11 @@ rm -f config.log config.status
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-6
+- Add instruction set architecture (isa) tags
+- Make doc subpackage noarch
+- Replace /usr/bin/env shebangs
+
* Tue Jun 02 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-5
- Update to official Fedora Globus packaging guidelines
More information about the fedora-extras-commits
mailing list