[globus-authz] Add README file Add missing dependencies

Mattias Ellert ellert at fedoraproject.org
Fri Apr 29 23:01:44 UTC 2011


commit a38c9177f1f1dded1f60439f3f5b485a383e2f3a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 01:01:14 2011 +0200

    Add README file
    Add missing dependencies

 GLOBUS-GSIC             |   22 ++++++++++++++++++++++
 globus-authz-deps.patch |   27 +++++++++++++++++++++++++++
 globus-authz.spec       |   21 +++++++++++++++++++--
 3 files changed, 68 insertions(+), 2 deletions(-)
---
diff --git a/GLOBUS-GSIC b/GLOBUS-GSIC
new file mode 100644
index 0000000..35fe6ee
--- /dev/null
+++ b/GLOBUS-GSIC
@@ -0,0 +1,22 @@
+This package is part of the Grid Security Infrastructure in C (GSI C) component
+of the Globus Toolkit. For more information visit:
+
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/
+
+Admin Guide:
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/admin/
+
+Developer's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/developer/
+
+Release Notes:
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/rn/
+
+Public Interface Guide:
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/pi/
+
+Quality Profile:
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/qp/
+
+Migrating Guide:
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/mig/
diff --git a/globus-authz-deps.patch b/globus-authz-deps.patch
new file mode 100644
index 0000000..4ce2a20
--- /dev/null
+++ b/globus-authz-deps.patch
@@ -0,0 +1,27 @@
+diff -ur globus_authz-0.7.orig/pkgdata/pkg_data_src.gpt.in globus_authz-0.7/pkgdata/pkg_data_src.gpt.in
+--- globus_authz-0.7.orig/pkgdata/pkg_data_src.gpt.in	2007-08-03 23:13:58.000000000 +0200
++++ globus_authz-0.7/pkgdata/pkg_data_src.gpt.in	2011-04-25 10:14:23.118143655 +0200
+@@ -8,6 +8,11 @@
+   <src_pkg >
+     <With_Flavors build="yes" />
+     <Source_Dependencies Type="compile" >
++      <Dependency Name="globus_common" >
++        <Version >
++          <Simple_Version Major="0" />
++        </Version>
++      </Dependency>
+       <Dependency Name="globus_callout" >
+         <Version >
+           <Simple_Version Major="0" />
+@@ -25,6 +30,11 @@
+       </Dependency>
+     </Source_Dependencies>
+     <Source_Dependencies Type="lib_link" >
++      <Dependency Name="globus_common" >
++        <Version >
++          <Simple_Version Major="0" />
++        </Version>
++      </Dependency>
+       <Dependency Name="globus_callout" >
+         <Version >
+           <Simple_Version Major="0" />
diff --git a/globus-authz.spec b/globus-authz.spec
index 9946961..65cf1e3 100644
--- a/globus-authz.spec
+++ b/globus-authz.spec
@@ -7,7 +7,7 @@
 Name:		globus-authz
 %global _name %(tr - _ <<< %{name})
 Version:	0.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus authz library
 
 Group:		System Environment/Libraries
@@ -20,13 +20,19 @@ URL:		http://www.globus.org/
 #		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz-0.7
 #		tar -zcf globus_authz-0.7.tar.gz globus_authz-0.7
 Source:		%{_name}-%{version}.tar.gz
+#		README file
+Source8:	GLOBUS-GSIC
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
+#		Missing direct dependencies:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
+Patch0:		%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
 BuildRequires:	grid-packaging-tools
+BuildRequires:	globus-common-devel%{?_isa}
 BuildRequires:	globus-authz-callout-error-devel%{?_isa}
 BuildRequires:	globus-callout-devel%{?_isa}
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
@@ -36,7 +42,7 @@ BuildRequires:	graphviz
 BuildRequires:	graphviz-gd
 %endif
 BuildRequires:	ghostscript
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	tex(latex)
 %else
 BuildRequires:	tetex-latex
@@ -46,6 +52,7 @@ BuildRequires:	tetex-latex
 Summary:	Globus Toolkit - Globus authz library Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	globus-common-devel%{?_isa}
 Requires:	globus-authz-callout-error-devel%{?_isa}
 Requires:	globus-callout-devel%{?_isa}
 Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4
@@ -87,6 +94,7 @@ Globus authz library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -158,6 +166,10 @@ sed -e '/_%{_name}-%{version}_.*\.3/d' \
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+# Install README file
+install -m 644 -p %{SOURCE8} \
+  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
+
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -178,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
+%doc %{_docdir}/%{name}-%{version}/README
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -188,6 +201,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-4
+- Add README file
+- Add missing dependencies
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list