dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: R
-# $Id$
-NAME := R
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

R-make-search-index.sh

@@ -1,5 +1,16 @@
 #!/bin/bash
 
+# Determine R versions
+R_SUPER_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 1`
+R_MAJOR_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 2`
+
+# If R 3.0.* ever comes out, we'll need to revisit this logic.
+# Or, just nuke this script and the macros entirely.
+if [ "$R_SUPER_VERSION" -ge "2" -a "$R_MAJOR_VERSION" -ge "10" ]; then
+  # echo "R is new enough to not need this anymore."
+  exit 0
+else
+
 # Figure out what RHOME is set to
 TMP_R_HOME=`R RHOME`
 
@@ -17,5 +28,7 @@ cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/d
 # Don't use .. based paths, substitute /usr/share/R
 sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt
 
+fi
+
 exit 0
 

R.spec

@@ -5,14 +5,13 @@
 %endif
 
 Name: R
-Version: 2.9.2
-Release: 1%{?dist}
+Version: 2.11.1
+Release: 3%{?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
 Source1: macros.R
 Source2: R-make-search-index.sh
-Patch1: R-2.7.2-filter_asoption.patch
 License: GPLv2+
 Group: Applications/Engineering
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,34 +56,33 @@ Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
 # 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.38
-Provides: R-class = 7.2.48
-Provides: R-cluster = 1.12.0
+Provides: R-boot = 1.2.42
+Provides: R-class = 7.3.2
+Provides: R-cluster = 1.12.3
 Provides: R-codetools = 0.2.2
 Provides: R-datasets = %{version}
-Provides: R-foreign = 0.8.37
+Provides: R-foreign = 0.8.40
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
-Provides: R-KernSmooth = 2.23.2
-Provides: R-lattice = 0.17.25
-Provides: R-MASS = 7.2.48
-Provides: R-Matrix = 0.999375.30
+Provides: R-KernSmooth = 2.23.3
+Provides: R-lattice = 0.18.8
+Provides: R-MASS = 7.3.6
+Provides: R-Matrix = 0.999375.39
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.5.5
-Provides: R-nlme = 3.1.93
-Provides: R-nnet = 7.2.48
-Provides: R-rpart = 3.1.45
-Provides: R-spatial = 7.2.48
+Provides: R-mgcv = 1.6.2
+Provides: R-nlme = 3.1.96
+Provides: R-nnet = 7.3.1
+Provides: R-rpart = 3.1.46
+Provides: R-spatial = 7.3.2
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.35.4
+Provides: R-survival = 2.35.8
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
-Provides: R-VR = 7.2.48
 
 %description core
 A language and environment for statistical computing and graphics.
@@ -108,7 +106,7 @@ Requires: R-core = %{version}-%{release}
 Requires: gcc-c++, gcc-gfortran, tetex-latex
 Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
-Provides: R-Matrix-devel = 0.999375-7
+Provides: R-Matrix-devel = 0.999375.39
 Obsoletes: R-Matrix-devel < 0.999375-7
 
 %description devel
@@ -153,21 +151,28 @@ Group: Development/Libraries
 
 %description -n libRmath
 A standalone library of mathematical and statistical functions derived
-from the R project.  This packages provides the shared libRmath library.
+from the R project.  This package provides the shared libRmath library.
 
 %package -n libRmath-devel
-Summary: Standalone math library from the R project
+Summary: Headers from the R Standalone math library
 Group: Development/Libraries
 Requires: libRmath = %{version}-%{release}, pkgconfig
 
 %description -n libRmath-devel
 A standalone library of mathematical and statistical functions derived
-from the R project.  This packages provides the static libRmath library
-and header files.
+from the R project.  This package provides the libRmath header files.
+
+%package -n libRmath-static
+Summary: Static R Standalone math library
+Group: Development/Libraries
+Requires: libRmath-devel = %{version}-%{release}
+
+%description -n libRmath-static
+A standalone library of mathematical and statistical functions derived
+from the R project.  This package provides the static libRmath library.
 
 %prep
 %setup -q
-%patch1 -p1 -b .filter-little-out
 
 # Filter false positive provides.
 cat <<EOF > %{name}-prov
@@ -188,8 +193,8 @@ EOF
 chmod +x %{__perl_requires}
 
 %build
-# Add PATHS to Renviron for R_LIBS
-echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in
+# Add PATHS to Renviron for R_LIBS_SITE
+echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/R/library:%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in
 
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
@@ -202,12 +207,18 @@ case "%{_target_cpu}" in
           export F77="gfortran -m64"
           export FC="gfortran -m64"
       ;;
-      ia64|alpha|sh*)
+      ia64|alpha|arm*|sh*)
           export CC="gcc"
           export CXX="g++"
           export F77="gfortran"
           export FC="gfortran"
       ;;
+      s390)
+          export CC="gcc -m31"
+          export CXX="g++ -m31"
+          export F77="gfortran -m31"
+          export FC="gfortran -m31"
+      ;;    
       *)
           export CC="gcc -m32"
           export CXX="g++ -m32"
@@ -223,6 +234,7 @@ export FCFLAGS="%{optflags}"
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib \
+    --enable-prebuilt-html \
     rdocdir=%{_docdir}/R-%{version} \
     rincludedir=%{_includedir}/R \
     rsharedir=%{_datadir}/R) \
@@ -277,7 +289,7 @@ for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do
 done
 
 # Fix exec bits
-chmod +x $RPM_BUILD_ROOT%{_datadir}/R/sh/help-links.sh $RPM_BUILD_ROOT%{_datadir}/R/sh/echo.sh
+chmod +x $RPM_BUILD_ROOT%{_datadir}/R/sh/echo.sh
 chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
 
 %files
@@ -300,6 +312,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(it) %{_datadir}/R/locale/it/
 %lang(ja) %{_datadir}/R/locale/ja/
 %lang(ko) %{_datadir}/R/locale/ko/
+%lang(nn) %{_datadir}/R/locale/nn/
 %lang(pt) %{_datadir}/R/locale/pt*/
 %lang(ru) %{_datadir}/R/locale/ru/
 %lang(zh) %{_datadir}/R/locale/zh*/
@@ -318,14 +331,11 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 # base
 %dir %{_libdir}/R/library/base/
 %{_libdir}/R/library/base/CITATION
-%{_libdir}/R/library/base/CONTENTS
 %{_libdir}/R/library/base/demo/
 %{_libdir}/R/library/base/DESCRIPTION
 %{_libdir}/R/library/base/help/
 %{_libdir}/R/library/base/html/
 %{_libdir}/R/library/base/INDEX
-%{_libdir}/R/library/base/latex/
-%{_libdir}/R/library/base/man/
 %{_libdir}/R/library/base/Meta/
 %dir %{_libdir}/R/library/base/po/
 %lang(de) %{_libdir}/R/library/base/po/de/
@@ -338,38 +348,31 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/base/po/ru/
 %lang(zh) %{_libdir}/R/library/base/po/zh*/
 %{_libdir}/R/library/base/R/
-%{_libdir}/R/library/base/R-ex/
 # boot
 %dir %{_libdir}/R/library/boot/
 %{_libdir}/R/library/boot/CITATION
-%{_libdir}/R/library/boot/CONTENTS
 %{_libdir}/R/library/boot/data/
 %{_libdir}/R/library/boot/DESCRIPTION
 %{_libdir}/R/library/boot/help/
 %{_libdir}/R/library/boot/html/
 %{_libdir}/R/library/boot/INDEX
-%{_libdir}/R/library/boot/latex/
-%{_libdir}/R/library/boot/man/
 %{_libdir}/R/library/boot/Meta/
 %{_libdir}/R/library/boot/NAMESPACE
 %dir %{_libdir}/R/library/boot/po/
+%lang(de) %{_libdir}/R/library/boot/po/de/
 %lang(en) %{_libdir}/R/library/boot/po/en*/
 %lang(fr) %{_libdir}/R/library/boot/po/fr/
 %lang(ru) %{_libdir}/R/library/boot/po/ru/
 %{_libdir}/R/library/boot/R/
-%{_libdir}/R/library/boot/R-ex/
 # class
 %dir %{_libdir}/R/library/class/
 %{_libdir}/R/library/class/CITATION
-%{_libdir}/R/library/class/CONTENTS
 %{_libdir}/R/library/class/DESCRIPTION
 %{_libdir}/R/library/class/help/
 %{_libdir}/R/library/class/html/
 %{_libdir}/R/library/class/INDEX
-%{_libdir}/R/library/class/latex/
 %{_libdir}/R/library/class/libs/
 %{_libdir}/R/library/class/LICENCE
-%{_libdir}/R/library/class/man/
 %{_libdir}/R/library/class/Meta/
 %{_libdir}/R/library/class/NAMESPACE
 %{_libdir}/R/library/class/NEWS
@@ -378,62 +381,46 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(en) %{_libdir}/R/library/class/po/en*/
 %lang(fr) %{_libdir}/R/library/class/po/fr/
 %{_libdir}/R/library/class/R/
-%{_libdir}/R/library/class/R-ex/
 # cluster
 %dir %{_libdir}/R/library/cluster/
 %{_libdir}/R/library/cluster/CITATION
-%{_libdir}/R/library/cluster/CONTENTS
 %{_libdir}/R/library/cluster/data/
 %{_libdir}/R/library/cluster/DESCRIPTION
 %{_libdir}/R/library/cluster/help/
 %{_libdir}/R/library/cluster/html/
 %{_libdir}/R/library/cluster/INDEX
-%{_libdir}/R/library/cluster/latex/
 %{_libdir}/R/library/cluster/libs/
-%{_libdir}/R/library/cluster/man/
 %{_libdir}/R/library/cluster/Meta/
 %{_libdir}/R/library/cluster/NAMESPACE
 %{_libdir}/R/library/cluster/R/
-%{_libdir}/R/library/cluster/R-ex/
 # codetools
 %dir %{_libdir}/R/library/codetools/
-%{_libdir}/R/library/codetools/CONTENTS
 %{_libdir}/R/library/codetools/DESCRIPTION
 %{_libdir}/R/library/codetools/help/
 %{_libdir}/R/library/codetools/html/
 %{_libdir}/R/library/codetools/INDEX
-%{_libdir}/R/library/codetools/latex/
-%{_libdir}/R/library/codetools/man/
 %{_libdir}/R/library/codetools/Meta/
 %{_libdir}/R/library/codetools/NAMESPACE
 %{_libdir}/R/library/codetools/R/
-%{_libdir}/R/library/codetools/R-ex/
 # datasets
 %dir %{_libdir}/R/library/datasets/
-%{_libdir}/R/library/datasets/CONTENTS
 %{_libdir}/R/library/datasets/data/
 %{_libdir}/R/library/datasets/DESCRIPTION
 %{_libdir}/R/library/datasets/help/
 %{_libdir}/R/library/datasets/html/
 %{_libdir}/R/library/datasets/INDEX
-%{_libdir}/R/library/datasets/latex/
-%{_libdir}/R/library/datasets/man/
 %{_libdir}/R/library/datasets/Meta/
 %{_libdir}/R/library/datasets/R/
-%{_libdir}/R/library/datasets/R-ex/
 # foreign
 %dir %{_libdir}/R/library/foreign/
-%{_libdir}/R/library/foreign/CONTENTS
 %{_libdir}/R/library/foreign/COPYING
 %{_libdir}/R/library/foreign/DESCRIPTION
 %{_libdir}/R/library/foreign/files/
 %{_libdir}/R/library/foreign/help/
 %{_libdir}/R/library/foreign/html/
 %{_libdir}/R/library/foreign/INDEX
-%{_libdir}/R/library/foreign/latex/
 %{_libdir}/R/library/foreign/libs/
 %{_libdir}/R/library/foreign/LICENCE
-%{_libdir}/R/library/foreign/man/
 %{_libdir}/R/library/foreign/Meta/
 %{_libdir}/R/library/foreign/NAMESPACE
 %dir %{_libdir}/R/library/foreign/po/
@@ -441,17 +428,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(en) %{_libdir}/R/library/foreign/po/en*/
 %lang(fr) %{_libdir}/R/library/foreign/po/fr/
 %{_libdir}/R/library/foreign/R/
-%{_libdir}/R/library/foreign/R-ex/
 # graphics
 %dir %{_libdir}/R/library/graphics/
-%{_libdir}/R/library/graphics/CONTENTS
 %{_libdir}/R/library/graphics/demo/
 %{_libdir}/R/library/graphics/DESCRIPTION
 %{_libdir}/R/library/graphics/help/
 %{_libdir}/R/library/graphics/html/
 %{_libdir}/R/library/graphics/INDEX
-%{_libdir}/R/library/graphics/latex/
-%{_libdir}/R/library/graphics/man/
 %{_libdir}/R/library/graphics/Meta/
 %{_libdir}/R/library/graphics/NAMESPACE
 %dir %{_libdir}/R/library/graphics/po/
@@ -464,19 +447,15 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/graphics/po/ru/
 %lang(zh) %{_libdir}/R/library/graphics/po/zh*/
 %{_libdir}/R/library/graphics/R/
-%{_libdir}/R/library/graphics/R-ex/
 # grDevices
 %dir %{_libdir}/R/library/grDevices
 %{_libdir}/R/library/grDevices/afm/
-%{_libdir}/R/library/grDevices/CONTENTS
 %{_libdir}/R/library/grDevices/DESCRIPTION
 %{_libdir}/R/library/grDevices/enc/
 %{_libdir}/R/library/grDevices/help/
 %{_libdir}/R/library/grDevices/html/
 %{_libdir}/R/library/grDevices/INDEX
-%{_libdir}/R/library/grDevices/latex/
 %{_libdir}/R/library/grDevices/libs/
-%{_libdir}/R/library/grDevices/man/
 %{_libdir}/R/library/grDevices/Meta/
 %{_libdir}/R/library/grDevices/NAMESPACE
 %dir %{_libdir}/R/library/grDevices/po/
@@ -489,18 +468,14 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/grDevices/po/ru/
 %lang(zh) %{_libdir}/R/library/grDevices/po/zh*/
 %{_libdir}/R/library/grDevices/R/
-%{_libdir}/R/library/grDevices/R-ex/
 # grid
 %dir %{_libdir}/R/library/grid/
-%{_libdir}/R/library/grid/CONTENTS
 %{_libdir}/R/library/grid/DESCRIPTION
 %{_libdir}/R/library/grid/doc/
 %{_libdir}/R/library/grid/help/
 %{_libdir}/R/library/grid/html/
 %{_libdir}/R/library/grid/INDEX
-%{_libdir}/R/library/grid/latex/
 %{_libdir}/R/library/grid/libs/
-%{_libdir}/R/library/grid/man/
 %{_libdir}/R/library/grid/Meta/
 %{_libdir}/R/library/grid/NAMESPACE
 %dir %{_libdir}/R/library/grid/po/
@@ -514,28 +489,22 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/grid/po/ru/
 %lang(zh) %{_libdir}/R/library/grid/po/zh*/
 %{_libdir}/R/library/grid/R/
-%{_libdir}/R/library/grid/R-ex/
 # KernSmooth
 %dir %{_libdir}/R/library/KernSmooth/
-%{_libdir}/R/library/KernSmooth/CONTENTS
 %{_libdir}/R/library/KernSmooth/DESCRIPTION
 %{_libdir}/R/library/KernSmooth/help/
 %{_libdir}/R/library/KernSmooth/html/
 %{_libdir}/R/library/KernSmooth/INDEX
-%{_libdir}/R/library/KernSmooth/latex/
 %{_libdir}/R/library/KernSmooth/libs/
 %{_libdir}/R/library/KernSmooth/LICENCE
-%{_libdir}/R/library/KernSmooth/man/
 %{_libdir}/R/library/KernSmooth/Meta/
 %{_libdir}/R/library/KernSmooth/NAMESPACE
 %dir %{_libdir}/R/library/KernSmooth/po/
 %lang(de) %{_libdir}/R/library/KernSmooth/po/de/
 %lang(en) %{_libdir}/R/library/KernSmooth/po/en*/
 %{_libdir}/R/library/KernSmooth/R/
-%{_libdir}/R/library/KernSmooth/R-ex/
 # lattice
 %dir %{_libdir}/R/library/lattice/
-%{_libdir}/R/library/lattice/CONTENTS
 %{_libdir}/R/library/lattice/COPYING
 %{_libdir}/R/library/lattice/data/
 %{_libdir}/R/library/lattice/demo/
@@ -543,9 +512,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %{_libdir}/R/library/lattice/help/
 %{_libdir}/R/library/lattice/html/
 %{_libdir}/R/library/lattice/INDEX
-%{_libdir}/R/library/lattice/latex/
 %{_libdir}/R/library/lattice/libs/
-%{_libdir}/R/library/lattice/man/
 %{_libdir}/R/library/lattice/Meta/
 %{_libdir}/R/library/lattice/NAMESPACE
 %{_libdir}/R/library/lattice/NEWS
@@ -554,20 +521,16 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(en) %{_libdir}/R/library/lattice/po/en*/
 %lang(fr) %{_libdir}/R/library/lattice/po/fr/
 %{_libdir}/R/library/lattice/R/
-%{_libdir}/R/library/lattice/R-ex/
 # MASS
 %dir %{_libdir}/R/library/MASS/
 %{_libdir}/R/library/MASS/CITATION
-%{_libdir}/R/library/MASS/CONTENTS
 %{_libdir}/R/library/MASS/data/
 %{_libdir}/R/library/MASS/DESCRIPTION
 %{_libdir}/R/library/MASS/help/
 %{_libdir}/R/library/MASS/html/
 %{_libdir}/R/library/MASS/INDEX
-%{_libdir}/R/library/MASS/latex/
 %{_libdir}/R/library/MASS/libs/
 %{_libdir}/R/library/MASS/LICENCE
-%{_libdir}/R/library/MASS/man/
 %{_libdir}/R/library/MASS/Meta/
 %{_libdir}/R/library/MASS/NAMESPACE
 %{_libdir}/R/library/MASS/NEWS
@@ -576,11 +539,9 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(en) %{_libdir}/R/library/MASS/po/en*/
 %lang(fr) %{_libdir}/R/library/MASS/po/fr/
 %{_libdir}/R/library/MASS/R/
-%{_libdir}/R/library/MASS/R-ex/
 %{_libdir}/R/library/MASS/scripts/
 # Matrix
 %dir %{_libdir}/R/library/Matrix/
-%{_libdir}/R/library/Matrix/CONTENTS
 %{_libdir}/R/library/Matrix/Copyrights
 %{_libdir}/R/library/Matrix/data/
 %{_libdir}/R/library/Matrix/doc/
@@ -591,27 +552,21 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %{_libdir}/R/library/Matrix/html/
 %{_libdir}/R/library/Matrix/include/
 %{_libdir}/R/library/Matrix/INDEX
-%{_libdir}/R/library/Matrix/latex/
 %{_libdir}/R/library/Matrix/libs/
-%{_libdir}/R/library/Matrix/man/
 %{_libdir}/R/library/Matrix/Meta/
 %{_libdir}/R/library/Matrix/NAMESPACE
 %dir %{_libdir}/R/library/Matrix/po/
 %lang(de) %{_libdir}/R/library/Matrix/po/de/
 %lang(en) %{_libdir}/R/library/Matrix/po/en*/
-%{_libdir}/R/library/Matrix/R-ex/
 %{_libdir}/R/library/Matrix/R/
 %{_libdir}/R/library/Matrix/test-tools.R
 # methods
 %dir %{_libdir}/R/library/methods/
-%{_libdir}/R/library/methods/CONTENTS
 %{_libdir}/R/library/methods/DESCRIPTION
 %{_libdir}/R/library/methods/help/
 %{_libdir}/R/library/methods/html/
 %{_libdir}/R/library/methods/INDEX
-%{_libdir}/R/library/methods/latex/
 %{_libdir}/R/library/methods/libs/
-%{_libdir}/R/library/methods/man/
 %{_libdir}/R/library/methods/Meta/
 %{_libdir}/R/library/methods/NAMESPACE
 %dir %{_libdir}/R/library/methods/po/
@@ -624,36 +579,28 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/methods/po/ru/
 %lang(zh) %{_libdir}/R/library/methods/po/zh*/
 %{_libdir}/R/library/methods/R/
-%{_libdir}/R/library/methods/R-ex/
 # mgcv
 %dir %{_libdir}/R/library/mgcv/
 %{_libdir}/R/library/mgcv/CITATION
-%{_libdir}/R/library/mgcv/CONTENTS
 %{_libdir}/R/library/mgcv/DESCRIPTION
 %{_libdir}/R/library/mgcv/help/
 %{_libdir}/R/library/mgcv/html/
 %{_libdir}/R/library/mgcv/INDEX
-%{_libdir}/R/library/mgcv/latex/
 %{_libdir}/R/library/mgcv/libs/
-%{_libdir}/R/library/mgcv/man/
 %{_libdir}/R/library/mgcv/Meta/
 %{_libdir}/R/library/mgcv/NAMESPACE
 %{_libdir}/R/library/mgcv/R/
-%{_libdir}/R/library/mgcv/R-ex/
 # nlme
 %dir %{_libdir}/R/library/nlme/
 %{_libdir}/R/library/nlme/CITATION
-%{_libdir}/R/library/nlme/CONTENTS
 %{_libdir}/R/library/nlme/COPYING
 %{_libdir}/R/library/nlme/data/
 %{_libdir}/R/library/nlme/DESCRIPTION
 %{_libdir}/R/library/nlme/help/
 %{_libdir}/R/library/nlme/html/
 %{_libdir}/R/library/nlme/INDEX
-%{_libdir}/R/library/nlme/latex/
 %{_libdir}/R/library/nlme/libs/
 %{_libdir}/R/library/nlme/LICENCE
-%{_libdir}/R/library/nlme/man/
 %{_libdir}/R/library/nlme/Meta/
 %{_libdir}/R/library/nlme/mlbook/
 %{_libdir}/R/library/nlme/NAMESPACE
@@ -662,20 +609,16 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(en) %{_libdir}/R/library/nlme/po/en*/
 %lang(fr) %{_libdir}/R/library/nlme/po/fr/
 %{_libdir}/R/library/nlme/R/
-%{_libdir}/R/library/nlme/R-ex/
 %{_libdir}/R/library/nlme/scripts/
 # nnet
 %dir %{_libdir}/R/library/nnet/
 %{_libdir}/R/library/nnet/CITATION
-%{_libdir}/R/library/nnet/CONTENTS
 %{_libdir}/R/library/nnet/DESCRIPTION
 %{_libdir}/R/library/nnet/help/
 %{_libdir}/R/library/nnet/html/
 %{_libdir}/R/library/nnet/INDEX
-%{_libdir}/R/library/nnet/latex/
 %{_libdir}/R/library/nnet/libs/
 %{_libdir}/R/library/nnet/LICENCE
-%{_libdir}/R/library/nnet/man/
 %{_libdir}/R/library/nnet/Meta/
 %{_libdir}/R/library/nnet/NAMESPACE
 %{_libdir}/R/library/nnet/NEWS
@@ -684,19 +627,15 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(en) %{_libdir}/R/library/nnet/po/en*/
 %lang(fr) %{_libdir}/R/library/nnet/po/fr/
 %{_libdir}/R/library/nnet/R/
-%{_libdir}/R/library/nnet/R-ex/
 # rpart
 %dir %{_libdir}/R/library/rpart/
-%{_libdir}/R/library/rpart/CONTENTS
 %{_libdir}/R/library/rpart/data/
 %{_libdir}/R/library/rpart/DESCRIPTION
 %{_libdir}/R/library/rpart/help/
 %{_libdir}/R/library/rpart/html/
 %{_libdir}/R/library/rpart/INDEX
-%{_libdir}/R/library/rpart/latex/
 %{_libdir}/R/library/rpart/libs/
 %{_libdir}/R/library/rpart/LICENCE
-%{_libdir}/R/library/rpart/man/
 %{_libdir}/R/library/rpart/Meta/
 %{_libdir}/R/library/rpart/NAMESPACE
 %dir %{_libdir}/R/library/rpart/po
@@ -705,19 +644,15 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(fr) %{_libdir}/R/library/rpart/po/fr/
 %lang(ru) %{_libdir}/R/library/rpart/po/ru/
 %{_libdir}/R/library/rpart/R/
-%{_libdir}/R/library/rpart/R-ex/
 # spatial
 %dir %{_libdir}/R/library/spatial/
 %{_libdir}/R/library/spatial/CITATION
-%{_libdir}/R/library/spatial/CONTENTS
 %{_libdir}/R/library/spatial/DESCRIPTION
 %{_libdir}/R/library/spatial/help/
 %{_libdir}/R/library/spatial/html/
 %{_libdir}/R/library/spatial/INDEX
-%{_libdir}/R/library/spatial/latex/
 %{_libdir}/R/library/spatial/libs/
 %{_libdir}/R/library/spatial/LICENCE
-%{_libdir}/R/library/spatial/man/
 %{_libdir}/R/library/spatial/Meta/
 %{_libdir}/R/library/spatial/NAMESPACE
 %{_libdir}/R/library/spatial/NEWS
@@ -728,17 +663,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %{_libdir}/R/library/spatial/ppdata/
 %{_libdir}/R/library/spatial/PP.files
 %{_libdir}/R/library/spatial/R/
-%{_libdir}/R/library/spatial/R-ex/
 # splines
 %dir %{_libdir}/R/library/splines/
-%{_libdir}/R/library/splines/CONTENTS
 %{_libdir}/R/library/splines/DESCRIPTION
 %{_libdir}/R/library/splines/help/
 %{_libdir}/R/library/splines/html/
 %{_libdir}/R/library/splines/INDEX
-%{_libdir}/R/library/splines/latex/
 %{_libdir}/R/library/splines/libs/
-%{_libdir}/R/library/splines/man/
 %{_libdir}/R/library/splines/Meta/
 %{_libdir}/R/library/splines/NAMESPACE
 %dir %{_libdir}/R/library/splines/po
@@ -751,19 +682,15 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/splines/po/ru/
 %lang(zh) %{_libdir}/R/library/splines/po/zh*/
 %{_libdir}/R/library/splines/R/
-%{_libdir}/R/library/splines/R-ex/
 # stats
 %dir %{_libdir}/R/library/stats/
-%{_libdir}/R/library/stats/CONTENTS
 %{_libdir}/R/library/stats/COPYRIGHTS.modreg
 %{_libdir}/R/library/stats/demo/
 %{_libdir}/R/library/stats/DESCRIPTION
 %{_libdir}/R/library/stats/help/
 %{_libdir}/R/library/stats/html/
 %{_libdir}/R/library/stats/INDEX
-%{_libdir}/R/library/stats/latex/
 %{_libdir}/R/library/stats/libs/
-%{_libdir}/R/library/stats/man/
 %{_libdir}/R/library/stats/Meta/
 %{_libdir}/R/library/stats/NAMESPACE
 %dir %{_libdir}/R/library/stats/po
@@ -777,17 +704,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/stats/po/ru/
 %lang(zh) %{_libdir}/R/library/stats/po/zh*/
 %{_libdir}/R/library/stats/R/
-%{_libdir}/R/library/stats/R-ex/
 %{_libdir}/R/library/stats/SOURCES.ts
 # stats4
 %dir %{_libdir}/R/library/stats4/
-%{_libdir}/R/library/stats4/CONTENTS
 %{_libdir}/R/library/stats4/DESCRIPTION
 %{_libdir}/R/library/stats4/help/
 %{_libdir}/R/library/stats4/html/
 %{_libdir}/R/library/stats4/INDEX
-%{_libdir}/R/library/stats4/latex/
-%{_libdir}/R/library/stats4/man/
 %{_libdir}/R/library/stats4/Meta/
 %{_libdir}/R/library/stats4/NAMESPACE
 %dir %{_libdir}/R/library/stats4/po
@@ -801,35 +724,28 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/stats4/po/ru/
 %lang(zh) %{_libdir}/R/library/stats4/po/zh*/
 %{_libdir}/R/library/stats4/R/
-%{_libdir}/R/library/stats4/R-ex/
 # survival
 %dir %{_libdir}/R/library/survival/
-%{_libdir}/R/library/survival/CONTENTS
 %{_libdir}/R/library/survival/COPYING
 %{_libdir}/R/library/survival/data/
 %{_libdir}/R/library/survival/DESCRIPTION
 %{_libdir}/R/library/survival/help/
 %{_libdir}/R/library/survival/html/
 %{_libdir}/R/library/survival/INDEX
-%{_libdir}/R/library/survival/latex/
 %{_libdir}/R/library/survival/libs/
-%{_libdir}/R/library/survival/man/
 %{_libdir}/R/library/survival/Meta/
 %{_libdir}/R/library/survival/NAMESPACE
+%{_libdir}/R/library/survival/noweb/
 %{_libdir}/R/library/survival/R/
-%{_libdir}/R/library/survival/R-ex/
 # tcltk
 %dir %{_libdir}/R/library/tcltk/
-%{_libdir}/R/library/tcltk/CONTENTS
 %{_libdir}/R/library/tcltk/demo/
 %{_libdir}/R/library/tcltk/DESCRIPTION
 %{_libdir}/R/library/tcltk/exec/
 %{_libdir}/R/library/tcltk/help/
 %{_libdir}/R/library/tcltk/html/
 %{_libdir}/R/library/tcltk/INDEX
-%{_libdir}/R/library/tcltk/latex/
 %{_libdir}/R/library/tcltk/libs/
-%{_libdir}/R/library/tcltk/man/
 %{_libdir}/R/library/tcltk/Meta/
 %{_libdir}/R/library/tcltk/NAMESPACE
 %dir %{_libdir}/R/library/tcltk/po/
@@ -843,17 +759,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/tcltk/po/ru/
 %lang(zh) %{_libdir}/R/library/tcltk/po/zh*/
 %{_libdir}/R/library/tcltk/R/
-%{_libdir}/R/library/tcltk/R-ex/
 # tools
 %dir %{_libdir}/R/library/tools/
-%{_libdir}/R/library/tools/CONTENTS
 %{_libdir}/R/library/tools/DESCRIPTION
 %{_libdir}/R/library/tools/help/
 %{_libdir}/R/library/tools/html/
 %{_libdir}/R/library/tools/INDEX
-%{_libdir}/R/library/tools/latex/
 %{_libdir}/R/library/tools/libs/
-%{_libdir}/R/library/tools/man/
 %{_libdir}/R/library/tools/Meta/
 %{_libdir}/R/library/tools/NAMESPACE
 %dir %{_libdir}/R/library/tools/po
@@ -867,17 +779,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/tools/po/ru/
 %lang(zh) %{_libdir}/R/library/tools/po/zh*/
 %{_libdir}/R/library/tools/R/
-%{_libdir}/R/library/tools/R-ex/
 # utils
 %dir %{_libdir}/R/library/utils/
-%{_libdir}/R/library/utils/CONTENTS
 %{_libdir}/R/library/utils/DESCRIPTION
 %{_libdir}/R/library/utils/help/
 %{_libdir}/R/library/utils/html/
 %{_libdir}/R/library/utils/iconvlist
 %{_libdir}/R/library/utils/INDEX
-%{_libdir}/R/library/utils/latex/
-%{_libdir}/R/library/utils/man/
 %{_libdir}/R/library/utils/Meta/
 %{_libdir}/R/library/utils/misc/
 %{_libdir}/R/library/utils/NAMESPACE
@@ -890,7 +798,6 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %lang(ru) %{_libdir}/R/library/utils/po/ru/
 %lang(zh) %{_libdir}/R/library/utils/po/zh*/
 %{_libdir}/R/library/utils/R/
-%{_libdir}/R/library/utils/R-ex/
 %{_libdir}/R/library/utils/Sweave/
 %{_libdir}/R/modules
 %{_libdir}/R/COPYING
@@ -921,10 +828,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 
 %files -n libRmath-devel
 %defattr(-, root, root, -)
-%{_libdir}/libRmath.a
 %{_includedir}/Rmath.h
 %{_libdir}/pkgconfig/libRmath.pc
 
+%files -n libRmath-static
+%defattr(-, root, root, -)
+%{_libdir}/libRmath.a
+
 %clean
 rm -rf ${RPM_BUILD_ROOT};
 
@@ -947,15 +857,17 @@ R CMD javareconf \
     JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \
     > /dev/null 2>&1 || exit 0
 
+# With 2.10.0, we no longer need to do any of this.
+
 # Update package indices
-%__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null
+# %__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null
 # Don't use .. based paths, substitute RHOME
-sed -i "s!../../..!%{_libdir}/R!g" %{_docdir}/R-%{version}/html/search/index.txt
+# sed -i "s!../../..!%{_libdir}/R!g" %{_docdir}/R-%{version}/html/search/index.txt
 
 # This could fail if there are no noarch R libraries on the system.
-%__cat %{_datadir}/R/library/*/CONTENTS >> %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null || exit 0
+# %__cat %{_datadir}/R/library/*/CONTENTS >> %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null || exit 0
 # Don't use .. based paths, substitute /usr/share/R
-sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt
+# sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt
 
 
 %preun core
@@ -996,6 +908,37 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Wed Jun 30 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.1-3
+- move libRmath static lib into libRmath-static subpackage
+
+* Thu Jun  3 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.1-2
+- overload R_LIBS_SITE instead of R_LIBS
+
+* Tue Jun  1 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.1-1
+- update to 2.11.1
+
+* Thu Apr 22 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.0-1
+- update to 2.11.0
+
+* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> - 2.10.1-2
+- rebuild for icu 4.4
+
+* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.10.1-1
+- update to 2.10.1
+- enable static html pages
+
+* Mon Nov  9 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.10.0-2
+- get rid of index.txt scriptlet on R-core (bz 533572)
+- leave macro in place, but don't call /usr/lib/rpm/R-make-search-index.sh equivalent anymore
+- add version check to see if we need to run R-make-search-index.sh guts
+
+* Wed Nov  4 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.10.0-1
+- update to 2.10.0
+- use correct compiler for ARM
+
+* Thu Oct 15 2009 Karsten Hopp <karsten@redhat.com> 2.9.2-2
+- s390 (not s390x) needs the -m31 compiler flag
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.9.2-1
 - Update to 2.9.2
 

sources

@@ -1 +1 @@
-112e2a1306cf71320e45d14e87e5b913  R-2.9.2.tar.gz
+7421108ade3e9223263394b9bbe277ce  R-2.11.1.tar.gz