rpms/globus-gsi-proxy-ssl/F-11 globus-gsi-proxy-ssl-doxygen.patch, NONE, 1.1 globus-gsi-proxy-ssl.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Fri Apr 24 13:03:49 UTC 2009

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3982/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gsi-proxy-ssl-doxygen.patch globus-gsi-proxy-ssl.spec 
	import.log 
Log Message:
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball


globus-gsi-proxy-ssl-doxygen.patch:

--- NEW FILE globus-gsi-proxy-ssl-doxygen.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2008-10-17 18:03:16.000000000 +0200
@@ -432,15 +432,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resultingin PROXYCERTINFO in internal form
  */                                             
@@ -535,15 +535,15 @@
  */
 /* @{ */
 /**
- * @ingroup
+ * @ingroup proxycertinfo
  *
  * Convert from a DER encoded ASN.1 string of a old PROXYCERTINFO
  * to its internal structure
  *
  * @param cert_info the resulting old PROXYCERTINFO in internal form
- * @param buffer the DER encoded ASN.1 string containing
+ * @param pp the DER encoded ASN.1 string containing
  * the old PROXYCERTINFO 
- * @param the length of the buffer
+ * @param length the length of the buffer
  *
  * @return the resulting old  PROXYCERTINFO in internal form
  */                                             
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2008-10-17 18:03:25.000000000 +0200
@@ -279,7 +279,7 @@
  *
  * @param proxypolicy the proxy policy to set the policy of
  * @param policy the policy to set it to
- * @param length the lenght of the policy
+ * @param length the length of the policy
  *
  * @return 1 on success, 0 on error
  */
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2008-10-17 18:03:22.000000000 +0200
@@ -31,9 +31,7 @@
  * and ultimately gets written to a DER encoded string.
  *
  * @see Further Information about proxy policies
- * is available in the Internet Draft Document:
- * 
- * draft-ietf-pkix-proxy-01.txt
+ * is available in the <a href="http://www.ietf.org/rfc/rfc3820.txt">X.509 Proxy Certificate Profile</a> document.
  */
 
 #ifndef EXTERN_C_BEGIN


--- NEW FILE globus-gsi-proxy-ssl.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version:	1.5
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/proxy/proxy_ssl/source globus_gsi_proxy_ssl-1.5
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-1.5
#		tar -zcf globus_gsi_proxy_ssl-1.5.tar.gz globus_gsi_proxy_ssl-1.5
Source:		%{_name}-%{version}.tar.gz
#		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
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-openssl-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus GSI Proxy SSL Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus GSI Proxy SSL Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GSI Proxy SSL Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus GSI Proxy SSL Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.3
- Adapt to updated GPT package

* Mon Oct 13 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gsi-proxy-ssl-1_5-1_fc9:F-11:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578169


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2009 16:21:15 -0000	1.1
+++ .cvsignore	24 Apr 2009 13:03:18 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gsi_proxy_ssl-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2009 16:21:15 -0000	1.1
+++ sources	24 Apr 2009 13:03:19 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+c78a489a7bdc42c42c9dc5a071b360e5  globus_gsi_proxy_ssl-1.5.tar.gz


