rpms/R/devel .cvsignore, 1.9, 1.10 R.spec, 1.20, 1.21 sources, 1.10, 1.11
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Wed Dec 20 00:48:04 UTC 2006
Author: spot
Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5969/devel
Modified Files:
.cvsignore R.spec sources
Log Message:
Bump to 2.4.1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/R/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 16 Oct 2006 21:09:27 -0000 1.9
+++ .cvsignore 20 Dec 2006 00:47:34 -0000 1.10
@@ -6,3 +6,4 @@
R-2.3.0.tar.gz
R-2.3.1.tar.gz
R-2.4.0.tar.gz
+R-2.4.1.tar.gz
Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- R.spec 4 Nov 2006 06:16:12 -0000 1.20
+++ R.spec 20 Dec 2006 00:47:34 -0000 1.21
@@ -1,6 +1,6 @@
Name: R
-Version: 2.4.0
-Release: 2%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
Summary: A language for data analysis and graphics
URL: http://www.r-project.org
Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -16,16 +16,13 @@
BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
Requires: evince, cups, firefox
-# This syncs us with the "patched" development tree.
-Patch0: R-2.4.0-patched-2006-11-03.patch
-
# These are the submodules that R provides. Sometimes R modules say they
# depend on one of these submodules rather than just R. These are
# provided for packager convenience.
Provides: R-base = %{version}
Provides: R-boot = 1.2
Provides: R-class = %{version}
-Provides: R-cluster = 1.11.2
+Provides: R-cluster = 1.11.4
Provides: R-datasets = %{version}
Provides: R-foreign = 0.8
Provides: R-graphics = %{version}
@@ -43,7 +40,7 @@
Provides: R-splines = %{version}
Provides: R-stats = %{version}
Provides: R-stats4 = %{version}
-Provides: R-survival = 2.29
+Provides: R-survival = 2.30
Provides: R-tcltk = %{version}
Provides: R-tools = %{version}
Provides: R-utils = %{version}
@@ -99,7 +96,6 @@
%prep
%setup -q
-%patch0 -p1
%build
export R_PDFVIEWER="%{_bindir}/evince"
@@ -189,7 +185,7 @@
for doc in admin exts FAQ intro lang; do
file=%{_infodir}/R-${doc}.info.gz
if [ -e $file ]; then
- /sbin/install-info ${file} %{_infodir}/dir 2>/dev/null
+ /sbin/install-info ${file} %{_infodir}/dir 2>/dev/null || :
fi
done
/sbin/ldconfig
@@ -204,7 +200,7 @@
for doc in admin exts FAQ intro lang; do
file=%{_infodir}/R-${doc}.info.gz
if [ -e ${file} ]; then
- /sbin/install-info --delete R-${doc} %{_infodir}/dir 2>/dev/null
+ /sbin/install-info --delete R-${doc} %{_infodir}/dir 2>/dev/null || :
fi
done
# Remove package indices
@@ -223,6 +219,10 @@
/sbin/ldconfig
%changelog
+* Tue Dec 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.1-1
+- bump to 2.4.1
+- fix install-info invocations in post/preun (bz 219407)
+
* Fri Nov 3 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-2
- sync with patched 2006-11-03 level to fix PR#9339
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 16 Oct 2006 21:09:27 -0000 1.10
+++ sources 20 Dec 2006 00:47:34 -0000 1.11
@@ -1 +1 @@
-f32379469d8712e9f5dd6435d30127d3 R-2.4.0.tar.gz
+92b33fd2c3e770d595c1a472889230d5 R-2.4.1.tar.gz
More information about the fedora-extras-commits
mailing list