[globus-ftp-control/f18] Add build requires for TexLive 2012

Mattias Ellert ellert at fedoraproject.org
Thu Dec 20 12:57:34 UTC 2012


commit 37bac9ad6d74b91ec3fa8025ce961154309796fd
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 14:23:14 2012 +0100

    Add build requires for TexLive 2012

 globus-ftp-control.spec |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)
---
diff --git a/globus-ftp-control.spec b/globus-ftp-control.spec
index 33cfc7a..2adf681 100644
--- a/globus-ftp-control.spec
+++ b/globus-ftp-control.spec
@@ -7,7 +7,7 @@
 Name:		globus-ftp-control
 %global _name %(tr - _ <<< %{name})
 Version:	4.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - GridFTP Control Library
 
 Group:		System Environment/Libraries
@@ -46,6 +46,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 - GridFTP Control Library Development Files
@@ -131,13 +144,13 @@ 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
 
 # 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
 
 # Move license file to main package
@@ -146,19 +159,18 @@ grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Fix doxygen glitches
-for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_ftp_control_client.c.3 \
-	 $RPM_BUILD_ROOT%{_mandir}/man3/globus_ftp_extensions.3 ; do
+for f in %{buildroot}%{_mandir}/man3/globus_ftp_control_client.c.3 \
+	 %{buildroot}%{_mandir}/man3/globus_ftp_extensions.3 ; do
   sed 's/P\.RS/P\n.RS/' -i $f
 done
 
 # 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 \
@@ -169,7 +181,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
 
@@ -189,6 +201,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.4-3
+- Add build requires for TexLive 2012
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list