rpms/R-pls/devel R-pls.spec,1.4,1.5

Pierre-YvesChibon pingou at fedoraproject.org
Fri Mar 6 19:43:56 UTC 2009


Author: pingou

Update of /cvs/pkgs/rpms/R-pls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17467/devel

Modified Files:
	R-pls.spec 
Log Message:
Fix build


Index: R-pls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-pls/devel/R-pls.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-pls.spec	23 Feb 2009 23:08:23 -0000	1.4
+++ R-pls.spec	6 Mar 2009 19:43:25 -0000	1.5
@@ -28,11 +28,6 @@
  
 %prep
 %setup -c -q -n %{packname}
-for f in %{packname}/man/*
- do
-  iconv -f  ISO-8859-1 -t UTF-8 -o $f.temp $f
-  mv $f.temp $f
-done
 
 iconv -f ISO-8859-1 -t UTF-8 -o %{packname}/DESCRIPTION.temp %{packname}/DESCRIPTION
 mv %{packname}/DESCRIPTION.temp %{packname}/DESCRIPTION
@@ -51,6 +46,14 @@
 
 install -pm 0644  %{packname}/CHANGES %{buildroot}%{_datadir}/R/library/%{packname}
 
+for f in %{buildroot}/%{_datadir}/R/library/%{packname}/latex/*
+ do
+  iconv -f  ISO-8859-1 -t UTF-8 -o $f.temp $f
+  mv $f.temp $f
+done
+
+iconv -f ISO-8859-1 -t UTF-8 -o %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz.temp %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz
+mv %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz.temp %{buildroot}/%{_datadir}/R/library/pls/man/pls.Rd.gz
 
 %check
 %{_bindir}/R CMD check %{packname}
@@ -84,8 +87,8 @@
 
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Mar 06 2009 Pingou <pingou at pingoured.fr> 2.1-5
+- Change the iconv from prep to end of install to make it build
 
 * Mon Feb 18 2008 Pingou <pingoufc4 at yahoo.fr> 2.1-4
 - Change the URL (correct typo)




More information about the fedora-extras-commits mailing list