From 22d496c0ec8aed69de03fb18b0f9080c21273748 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Dec 14 2012 12:22:54 +0000 Subject: Add build requires for TexLive 2012 --- diff --git a/globus-gsi-cert-utils.spec b/globus-gsi-cert-utils.spec index f779e29..9341d5a 100644 --- a/globus-gsi-cert-utils.spec +++ b/globus-gsi-cert-utils.spec @@ -7,7 +7,7 @@ Name: globus-gsi-cert-utils %global _name %(tr - _ <<< %{name}) Version: 8.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Globus Toolkit - Globus GSI Cert Utils Library Group: System Environment/Libraries @@ -43,6 +43,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 progs Summary: Globus Toolkit - Globus GSI Cert Utils Library Programs @@ -143,13 +156,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 client man pages to progs package @@ -163,13 +176,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 \ @@ -182,7 +194,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 @@ -205,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_docdir}/%{name}-%{version}/html %changelog +* Thu Dec 06 2012 Mattias Ellert - 8.3-3 +- Add build requires for TexLive 2012 + * Thu Jul 19 2012 Fedora Release Engineering - 8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild