diff -ur globus_core-8.9.orig/scripts/globus-spec-creator globus_core-8.9/scripts/globus-spec-creator --- globus_core-8.9.orig/scripts/globus-spec-creator 2011-10-28 19:24:29.000000000 +0200 +++ globus_core-8.9/scripts/globus-spec-creator 2012-12-06 13:10:02.609807807 +0100 @@ -351,6 +351,19 @@ print "%else\n"; print "BuildRequires:\ttetex-latex\n"; print "%endif\n"; + print "%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7\n"; + print "BuildRequires:\ttex(fullpage.sty)\n"; + print "BuildRequires:\ttex(multirow.sty)\n"; + print "BuildRequires:\ttex(sectsty.sty)\n"; + print "BuildRequires:\ttex(tocloft.sty)\n"; + print "BuildRequires:\ttex(xtab.sty)\n"; + print "BuildRequires:\ttex-ec\n"; + print "BuildRequires:\ttex-courier\n"; + print "BuildRequires:\ttex-helvetic\n"; + print "BuildRequires:\ttex-times\n"; + print "BuildRequires:\ttex-symbol\n"; + print "BuildRequires:\ttex-rsfs\n"; + print "%endif\n"; } if ($progspkg) { print "\n"; @@ -548,20 +561,20 @@ " if ($docpkg); print " -rm -rf \$RPM_BUILD_ROOT -make install DESTDIR=\$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} "; print " # setup package cd %{_name}_setup-%{setupversion} -make install DESTDIR=\$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} cd - # Register setup perl -MGrid::GPT::Setup <<EOF my \\\$metadata = new Grid::GPT::Setup(package_name => \"%{_name}_setup\", - globusdir => \"\$RPM_BUILD_ROOT%{_prefix}\"); + globusdir => \"%{buildroot}%{_prefix}\"); \\\$metadata->finish(); EOF @@ -571,7 +584,7 @@ " if defined $setupfile; print " -GLOBUSPACKAGEDIR=\$RPM_BUILD_ROOT%{_datadir}/globus/packages +GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages "; if (not defined $pkglibs) { @@ -579,7 +592,7 @@ # This library is opened using lt_dlopenext, so the libtool archive # (.la file) can not be removed - fix the libdir and clear dependency_libs # ... and move it to the main package -for lib in `find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do +for lib in `find %{buildroot}%{_libdir} -name 'lib*.la'` ; do sed -e \"s!^libdir=.*!libdir=\\'%{_libdir}\\'!\" \\ -e \"s!^dependency_libs=.*!dependency_libs=\\'\\'!\" -i \$lib done @@ -591,7 +604,7 @@ else { print " # Remove libtool archives (.la files) -find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\; +find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\; sed '/lib.*\\.la\$/d' -i \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist " if ($libs); } @@ -603,15 +616,14 @@ sed /GLOBUS_LICENSE/d -i \$GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) -rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 +rm -f %{buildroot}%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\\.3/d' \\ -i \$GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist " if ($docpkg); print " # Install README file -install -m 644 -p %{SOURCE8} \\ - \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README +install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README # Generate package filelists "; @@ -651,7 +663,7 @@ print " %clean -rm -rf \$RPM_BUILD_ROOT +rm -rf %{buildroot} "; print "