rpms/globus-xio-gsi-driver/F-11 globus-xio-gsi-driver-doxygen.patch, NONE, 1.1 globus-xio-gsi-driver-type-punned-pointer.patch, NONE, 1.1 globus-xio-gsi-driver-wrong-dep.patch, NONE, 1.1 globus-xio-gsi-driver.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mattias Ellert ellert at fedoraproject.org
Wed May 27 02:33:03 UTC 2009 

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-gsi-driver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23618/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-xio-gsi-driver-doxygen.patch 
	globus-xio-gsi-driver-type-punned-pointer.patch 
	globus-xio-gsi-driver-wrong-dep.patch 
	globus-xio-gsi-driver.spec import.log 
Log Message:
* Wed Apr 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball
- Fix changed dependency namespace


globus-xio-gsi-driver-doxygen.patch:

--- NEW FILE globus-xio-gsi-driver-doxygen.patch ---
diff -ur globus_xio_gsi_driver-0.6.orig/configure.in globus_xio_gsi_driver-0.6/configure.in
--- globus_xio_gsi_driver-0.6.orig/configure.in	2006-04-21 21:10:34.000000000 +0200
+++ globus_xio_gsi_driver-0.6/configure.in	2008-10-21 07:12:14.000000000 +0200
@@ -12,7 +12,7 @@
 dnl Initialize the automake rules the last argument
 AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
 
-LAC_DOXYGEN("../", "", "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
+LAC_DOXYGEN("../", "", "${GLOBUS_LOCATION:-/usr}/sbin/globus-vararg-enums-doxygen-filter.pl")
 
 GLOBUS_FINALIZE
 

globus-xio-gsi-driver-type-punned-pointer.patch:

--- NEW FILE globus-xio-gsi-driver-type-punned-pointer.patch ---
diff -ur globus_xio_gsi_driver-0.6.orig/globus_xio_gsi.c globus_xio_gsi_driver-0.6/globus_xio_gsi.c
--- globus_xio_gsi_driver-0.6.orig/globus_xio_gsi.c	2008-09-18 22:24:06.000000000 +0200
+++ globus_xio_gsi_driver-0.6/globus_xio_gsi.c	2008-12-31 13:45:31.000000000 +0100
@@ -577,11 +577,11 @@
     
     if(driver_server)
     {
-        result = globus_l_xio_gsi_attr_copy((void **) &attr, driver_server);
+        result = globus_l_xio_gsi_attr_copy((void **) (void *) &attr, driver_server);
     }
     else
     {
-        result = globus_l_xio_gsi_attr_init((void **) &attr);
+        result = globus_l_xio_gsi_attr_init((void **) (void *) &attr);
     }
     if(result != GLOBUS_SUCCESS)
     {
@@ -1715,7 +1715,7 @@
     
     if(driver_attr)
     {
-        result = globus_l_xio_gsi_attr_copy((void **) &handle->attr,
+        result = globus_l_xio_gsi_attr_copy((void **) (void *) &handle->attr,
                                             driver_attr);
         if(result == GLOBUS_SUCCESS && driver_link)
         {
@@ -1724,13 +1724,13 @@
     }
     else if(driver_link)
     {
-        result = globus_l_xio_gsi_attr_copy((void **) &handle->attr,
+        result = globus_l_xio_gsi_attr_copy((void **) (void *) &handle->attr,
                                             driver_link);
     }
     else
     {
         result = globus_l_xio_gsi_attr_copy(
-            (void **) &handle->attr,
+            (void **) (void *) &handle->attr,
             (void *) &globus_l_xio_gsi_attr_default);        
     }
     

globus-xio-gsi-driver-wrong-dep.patch:

--- NEW FILE globus-xio-gsi-driver-wrong-dep.patch ---
diff -ur globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in
--- globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in	2008-09-18 22:29:09.000000000 +0200
+++ globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in	2008-10-20 12:28:23.000000000 +0200
@@ -26,7 +26,7 @@
             </Dependency>
         </Source_Dependencies>
 
-        <Source_Dependencies Type="pgm_link">
+        <Source_Dependencies Type="lib_link">
             <Dependency Name="globus_xio">
                 <Version>
                     <Simple_Version Major="0"/>


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

Name:		globus-xio-gsi-driver
%global _name %(tr - _ <<< %{name})
Version:	0.6
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus XIO GSI Driver

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/xio/drivers/gsi globus_xio_gsi_driver-0.6
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_gsi_driver-0.6
#		tar -zcf globus_xio_gsi_driver-0.6.tar.gz globus_xio_gsi_driver-0.6
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 wrong dependency type:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6586
Patch0:		%{name}-wrong-dep.patch
#		Remove some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6587
Patch1:		%{name}-doxygen.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6606
Patch2:		%{name}-type-punned-pointer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gssapi-error-devel >= 2
BuildRequires:	globus-gss-assist-devel >= 3
BuildRequires:	globus-xio-devel
BuildRequires:	globus-gssapi-gsi-devel >= 4
BuildRequires:	globus-xio-doc
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 XIO GSI Driver Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-gssapi-error-devel >= 2
Requires:	globus-gss-assist-devel >= 3
Requires:	globus-xio-devel
Requires:	globus-gssapi-gsi-devel >= 4

%package doc
Summary:	Globus Toolkit - Globus XIO GSI Driver 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 XIO GSI Driver

%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 XIO GSI Driver 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 XIO GSI Driver Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -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

# Fix changed dependency namespace
sed -e 's!gssapi_error!globus_&!' -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

# This library is opened using lt_dlopenext, so the libtool archives
# (.la files) can not be removed - fix the libdir...
for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
  sed "s!^libdir=.*!libdir=\'%{_libdir}\'!" -i $lib
done

# 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 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball
- Fix changed dependency namespace

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

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

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

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-xio-gsi-driver-0_6-1_fc9:F-11:globus-xio-gsi-driver-0.6-1.fc9.src.rpm:1243391522


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-gsi-driver/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 May 2009 22:13:12 -0000	1.1
+++ .cvsignore	27 May 2009 02:32:32 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_xio_gsi_driver-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-gsi-driver/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 May 2009 22:13:12 -0000	1.1
+++ sources	27 May 2009 02:32:32 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+0e5c9558c7b7cc47f7aad1cfb0225c09  globus_xio_gsi_driver-0.6.tar.gz

More information about the scm-commits mailing list