diff --git a/.cvsignore b/.cvsignore index 9dad93a..99f01e7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ epstopdf-2.9.5gw -globus_xio-2.7.tar.gz +globus_xio-2.8.tar.gz diff --git a/globus-xio-bad-age.patch b/globus-xio-bad-age.patch index 93c0ce4..60742e6 100644 --- a/globus-xio-bad-age.patch +++ b/globus-xio-bad-age.patch @@ -5,8 +5,8 @@ diff -ur globus_xio-2.7.orig/pkgdata/pkg_data_src.gpt.in globus_xio-2.7/pkgdata/ -- -+ +- ++ Globus XIO Framework Communication diff --git a/globus-xio.spec b/globus-xio.spec index d44721f..49dc775 100644 --- a/globus-xio.spec +++ b/globus-xio.spec @@ -6,20 +6,14 @@ Name: globus-xio %global _name %(tr - _ <<< %{name}) -Version: 2.7 -Release: 5%{?dist} +Version: 2.8 +Release: 1%{?dist} Summary: Globus Toolkit - Globus XIO Framework 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/src globus_xio-2.7 -# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.7 -# tar -zcf globus_xio-2.7.tar.gz globus_xio-2.7 -Source: %{_name}-%{version}.tar.gz +Source: http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_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 @@ -180,10 +174,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_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 $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist @@ -202,8 +192,6 @@ rm -rf $RPM_BUILD_ROOT %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,-) @@ -211,9 +199,13 @@ rm -rf $RPM_BUILD_ROOT %files -f package-doc.filelist doc %defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} %dir %{_docdir}/%{name}-%{version}/html %changelog +* Wed Jul 29 2009 Mattias Ellert - 2.8-1 +- Update to upstream update release 2.8 + * Thu Jul 23 2009 Mattias Ellert - 2.7-5 - Add instruction set architecture (isa) tags - Make doc subpackage noarch diff --git a/import.log b/import.log index c690616..56eecf7 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ globus-xio-2_7-2_fc9:EL-4:globus-xio-2.7-2.fc9.src.rpm:1240393052 globus-xio-2_7-3_fc9:EL-4:globus-xio-2.7-3.fc9.src.rpm:1240867946 globus-xio-2_7-4_fc9:EL-4:globus-xio-2.7-4.fc9.src.rpm:1245088726 +globus-xio-2_8-1_fc11:EL-4:globus-xio-2.8-1.fc11.src.rpm:1249291409 diff --git a/sources b/sources index 521886e..b4c0e7b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw -fd1405eac3f3314dfd8f23359d1413c8 globus_xio-2.7.tar.gz +f7ab57f512f542c23a6425b2ede1050d globus_xio-2.8.tar.gz