[globus-xio-gsi-driver/f18] Add build requires for TexLive 2012

Mattias Ellert ellert at fedoraproject.org
Thu Dec 20 12:56:39 UTC 2012


commit d160e8ce28a39ef12b65c1be4fc30d7abe5688b9
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 14:09:29 2012 +0100

    Add build requires for TexLive 2012

 globus-xio-gsi-driver.spec |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)
---
diff --git a/globus-xio-gsi-driver.spec b/globus-xio-gsi-driver.spec
index f3f2a00..357b30c 100644
--- a/globus-xio-gsi-driver.spec
+++ b/globus-xio-gsi-driver.spec
@@ -7,7 +7,7 @@
 Name:		globus-xio-gsi-driver
 %global _name %(tr - _ <<< %{name})
 Version:	2.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus XIO GSI Driver
 
 Group:		System Environment/Libraries
@@ -45,6 +45,19 @@ BuildRequires:	tex(latex)
 %else
 BuildRequires:	tetex-latex
 %endif
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
+BuildRequires:	tex(fullpage.sty)
+BuildRequires:	tex(multirow.sty)
+BuildRequires:	tex(sectsty.sty)
+BuildRequires:	tex(tocloft.sty)
+BuildRequires:	tex(xtab.sty)
+BuildRequires:	tex-ec
+BuildRequires:	tex-courier
+BuildRequires:	tex-helvetic
+BuildRequires:	tex-times
+BuildRequires:	tex-symbol
+BuildRequires:	tex-rsfs
+%endif
 
 %package devel
 Summary:	Globus Toolkit - Globus XIO GSI Driver Development Files
@@ -128,15 +141,15 @@ make %{?_smp_mflags}
 export PATH=$PWD/bin:$PATH
 %endif
 
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
 
 # 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
@@ -150,13 +163,12 @@ grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 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
 
 # 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
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
@@ -167,7 +179,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -187,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.3-3
+- Add build requires for TexLive 2012
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list