rpms/R
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mark Makeconf as config (not config(noreplace) so that we get proper updated tcl/tk libs)

Browse Source
This commit is contained in:
Tom Callaway 2014-10-29 16:20:32 -04:00
parent 4ed76e4bc4
commit 519dcde137
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
R.spec
View File

@ -40,7 +40,7 @@
Name: R Name: R
Version: 3.1.1 Version: 3.1.1
Release: 7%{?dist} Release: 8%{?dist}
Summary: A language for data analysis and graphics Summary: A language for data analysis and graphics
URL: http://www.r-project.org URL: http://www.r-project.org
Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
@ -490,7 +490,7 @@ make check
%dir %{_libdir}/R/ %dir %{_libdir}/R/
%{_libdir}/R/bin/ %{_libdir}/R/bin/
%dir %{_libdir}/R/etc %dir %{_libdir}/R/etc
%config(noreplace) %{_libdir}/R/etc/Makeconf %config %{_libdir}/R/etc/Makeconf
%config(noreplace) %{_libdir}/R/etc/Renviron %config(noreplace) %{_libdir}/R/etc/Renviron
%config(noreplace) %{_libdir}/R/etc/javaconf %config(noreplace) %{_libdir}/R/etc/javaconf
%config(noreplace) %{_libdir}/R/etc/ldpaths %config(noreplace) %{_libdir}/R/etc/ldpaths
@ -909,6 +909,10 @@ R CMD javareconf \
%postun -n libRmath -p /sbin/ldconfig %postun -n libRmath -p /sbin/ldconfig
%changelog %changelog
* Wed Oct 29 2014 Tom Callaway <spot@fedoraproject.org> - 3.1.1-8
- rebuild for new tcl/tk
- mark Makeconf as config (not config(noreplace) so that we get proper updated tcl/tk libs)
* Mon Sep 29 2014 Orion Poplawski <orion@cora.nwra.com> - 3.1.1-7 * Mon Sep 29 2014 Orion Poplawski <orion@cora.nwra.com> - 3.1.1-7
- Just BR/R java instead of java-1.5.0-gcj (bug #1110684) - Just BR/R java instead of java-1.5.0-gcj (bug #1110684)