Arch-excludes September 2018

arch-excludes@lists.fedoraproject.org

2 participants
297 discussions

Architecture specific change in rpms/rust-libm.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/rust-libm.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-libm.git/commit/?id=67225e7565…. Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 67225e7565f627240290d68b3ddc23eff42814af Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Mon Sep 10 19:15:25 2018 +0200 initial import Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..192ff9b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/libm-0.1.2.crate diff --git a/libm-fix-metadata.diff b/libm-fix-metadata.diff new file mode 100644 index 0000000..9cba508 --- /dev/null +++ b/libm-fix-metadata.diff @@ -0,0 +1,7 @@ +--- libm-0.1.2/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ libm-0.1.2/Cargo.toml 2018-09-10T11:04:32.801965+02:00 +@@ -20,3 +20,4 @@ + categories = ["no-std"] + license = "MIT OR Apache-2.0" + repository = "https://github.com/japaric/libm" ++exclude = ["/ci/*"] diff --git a/rust-libm.spec b/rust-libm.spec new file mode 100644 index 0000000..c984531 --- /dev/null +++ b/rust-libm.spec @@ -0,0 +1,59 @@ +# Generated by rust2rpm +%bcond_without check +%global debug_package %{nil} + +%global crate libm + +Name: rust-%{crate} +Version: 0.1.2 +Release: 1%{?dist} +Summary: libm in pure Rust + +# Upstream license specification: MIT OR Apache-2.0 +License: MIT or ASL 2.0 +URL: https://crates.io/crates/libm +Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{ve… +# Initial patched metadata +# * Exclude ci/, https://github.com/japaric/libm/pull/148 +Patch0: libm-fix-metadata.diff + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging + +%description +%{summary}. + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel +libm in pure Rust. + +This package contains library source intended for building other packages +which use %{crate} from crates.io. + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files devel +%license LICENSE-MIT LICENSE-APACHE +%doc README.md CHANGELOG.md CONTRIBUTING.md +%{cargo_registry}/%{crate}-%{version}/ + +%changelog +* Mon Sep 10 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.1.2-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..0064545 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libm-0.1.2.crate) = 707a42632a5d92cccf8eb32fc507061e5b3b724c4fccb21f998bed5e187772a2015dee40a0225fb860a38ce2caa2ec3d9060ddd32b86a927308b253b41d73c95

1 0

Architecture specific change in rpms/rust-mint.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/rust-mint.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-mint.git/commit/?id=506684df02…. Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 506684df02bc5fd8add1e25f4bf0e06c2f5e695e Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Mon Sep 10 19:15:07 2018 +0200 initial import Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..add6405 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/mint-0.5.1.crate diff --git a/rust-mint.spec b/rust-mint.spec new file mode 100644 index 0000000..0717f08 --- /dev/null +++ b/rust-mint.spec @@ -0,0 +1,55 @@ +# Generated by rust2rpm +%bcond_without check +%global debug_package %{nil} + +%global crate mint + +Name: rust-%{crate} +Version: 0.5.1 +Release: 1%{?dist} +Summary: Math interoperability standard types + +License: MIT +URL: https://crates.io/crates/mint +Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{ve… + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging + +%description +%{summary}. + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel +Math interoperability standard types. + +This package contains library source intended for building other packages +which use %{crate} from crates.io. + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files devel +%license LICENSE +%doc README.md +%{cargo_registry}/%{crate}-%{version}/ + +%changelog +* Mon Sep 10 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.5.1-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..ea857d8 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (mint-0.5.1.crate) = dcb66c919bdc5dd30478f51346cfd12b2f482f786407b706c39f3a9a59aaf4a0cd2184763c5b45a52edf7eb44274aa7ddaf94f7164da676c4994c5149bcab249

1 0

Architecture specific change in rpms/mame.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/mame.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/mame.git/commit/?id=e6813ac53b15da0…. Change: +%ifarch %{ix86} Thanks. Full change: ============ commit e6813ac53b15da07fa6a8c4dee57cb6eccca840a Author: Julian Sikorski <belegdol(a)fedoraproject.org> Date: Mon Sep 10 19:07:16 2018 +0200 Switched to gold linker for %%{arm} diff --git a/mame.spec b/mame.spec index 730133a..a85c627 100644 --- a/mame.spec +++ b/mame.spec @@ -218,11 +218,12 @@ MAME_FLAGS="NOWERROR=1 OPTIMIZE=2 PYTHON_EXECUTABLE=python3 VERBOSE=1 \ #standard -g caused problems with OOM or relocation overflows RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed "s@-g@-g1@") #32-bit architectures need even more measures -%ifarch %{arm} %{ix86} +%ifarch %{ix86} RPM_LD_FLAGS="$RPM_LD_FLAGS -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif %ifarch %{arm} RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed "s@-O2@-Os@") +RPM_LD_FLAGS="$RPM_LD_FLAGS -Wl,--no-keep-memory -fuse-ld=gold" MAME_FLAGS=$(echo $MAME_FLAGS | sed "s@OPTIMIZE=2@OPTIMIZE=s@") %endif @@ -359,6 +360,7 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name} -name LICENSE -exec rm {} \; - Dropped upstreamed imgtool patch - Expanded the list of architectures using memory-saving measures - Adjusted the compiler flags on %%{arm} to optimize for size in an attempt to prevent linker from running out of memory +- Switched to gold linker for %%{arm} * Tue Jul 31 2018 Florian Weimer <fweimer(a)redhat.com> - 0.200-3 - Rebuild with fixed binutils

1 0

Architecture specific change in rpms/deepin-control-center.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/deepin-control-center.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/deepin-control-center.git/commit/?i… https://src.fedoraproject.org/cgit/rpms/deepin-control-center.git/commit/?i…. Change: -ExcludeArch: ppc64le ppc64 aarch64 +ExcludeArch: ppc64le ppc64 aarch64 Thanks. Full change: ============ commit 558621836cfd24a6edca29ce41d0d737c2156424 Author: mosquito <sensor.wen(a)gmail.com> Date: Sat Aug 25 18:30:29 2018 +0800 Release 4.6.4 diff --git a/.gitignore b/.gitignore index 66bb181..9ab56ec 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /dde-control-center-4.3.7.tar.gz /dde-control-center-4.6.1.tar.gz /dde-control-center-4.6.2.tar.gz +/dde-control-center-4.6.4.tar.gz diff --git a/deepin-control-center.spec b/deepin-control-center.spec index 302a7a7..837852e 100644 --- a/deepin-control-center.spec +++ b/deepin-control-center.spec @@ -1,7 +1,7 @@ %global repo dde-control-center Name: deepin-control-center -Version: 4.6.2 +Version: 4.6.4 Release: 1%{?dist} Summary: New control center for Linux Deepin License: GPLv3 @@ -32,6 +32,7 @@ Requires: deepin-network-utils Requires: GeoIP-GeoLite-data Requires: GeoIP-GeoLite-data-extra Requires: gtk-murrine-engine +Requires: proxychains-ng Requires: redshift Requires: startdde @@ -77,6 +78,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{repo}.desktop ||: %{_datadir}/%{repo}/ %changelog +* Sat Aug 25 2018 mosquito <sensor.wen(a)gmail.com> - 4.6.4-1 +- Update to 4.6.4 + +* Fri Aug 10 2018 mosquito <sensor.wen(a)gmail.com> - 4.6.3-1 +- Update to 4.6.3 + * Thu Aug 2 2018 mosquito <sensor.wen(a)gmail.com> - 4.6.2-1 - Update to 4.6.2 diff --git a/sources b/sources index 2aba42c..6f45bba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-control-center-4.6.2.tar.gz) = db136c8c25b7cfa9c9b8bf4ed4e923e5c6198ba3bea6f9473e56c665dca79a5eb2cc233c953ac9d3785e6a5033c6ac49bb147510b67c0a73782f696a6ef8c261 +SHA512 (dde-control-center-4.6.4.tar.gz) = bc0d3fcc9543c5789b681db9f614b38b57f98b781a1e71be74af53e97be86ba89de64598f1f5b6b5da2659fba1b40e0acbff4fdd24d53e5f723e561568d03fd6 commit 4d327780c878bbf8b81da64a96a5378f24a6f4cc Author: mosquito <sensor.wen(a)gmail.com> Date: Fri Aug 3 18:38:24 2018 +0800 Release 4.6.2 diff --git a/.gitignore b/.gitignore index 5b6d212..66bb181 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /dde-control-center-4.2.5.4.tar.gz /dde-control-center-4.3.7.tar.gz /dde-control-center-4.6.1.tar.gz +/dde-control-center-4.6.2.tar.gz diff --git a/deepin-control-center.spec b/deepin-control-center.spec index bfc1776..302a7a7 100644 --- a/deepin-control-center.spec +++ b/deepin-control-center.spec @@ -1,7 +1,7 @@ %global repo dde-control-center Name: deepin-control-center -Version: 4.6.1 +Version: 4.6.2 Release: 1%{?dist} Summary: New control center for Linux Deepin License: GPLv3 @@ -77,6 +77,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{repo}.desktop ||: %{_datadir}/%{repo}/ %changelog +* Thu Aug 2 2018 mosquito <sensor.wen(a)gmail.com> - 4.6.2-1 +- Update to 4.6.2 + * Fri Jul 27 2018 mosquito <sensor.wen(a)gmail.com> - 4.6.1-1 - Update to 4.6.1 diff --git a/sources b/sources index 75631a9..2aba42c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-control-center-4.6.1.tar.gz) = 400bde6121f890fde1fbb508fcf8d51d8c445f205d6136075ebedb6aa91277e3102aac9552618c85a5c1b3e3c64c0b7831746c0923eb240edf4a26711e2f380e +SHA512 (dde-control-center-4.6.2.tar.gz) = db136c8c25b7cfa9c9b8bf4ed4e923e5c6198ba3bea6f9473e56c665dca79a5eb2cc233c953ac9d3785e6a5033c6ac49bb147510b67c0a73782f696a6ef8c261 commit e2f7bdcd257c4402a99311b642b8fed8fec4964e Author: mosquito <sensor.wen(a)gmail.com> Date: Wed Aug 1 00:22:25 2018 +0800 Release 4.6.1 diff --git a/.gitignore b/.gitignore index ba30034..5b6d212 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /dde-control-center-4.2.5.4.tar.gz /dde-control-center-4.3.7.tar.gz +/dde-control-center-4.6.1.tar.gz diff --git a/deepin-control-center.spec b/deepin-control-center.spec index 11d9945..bfc1776 100644 --- a/deepin-control-center.spec +++ b/deepin-control-center.spec @@ -1,19 +1,18 @@ %global repo dde-control-center Name: deepin-control-center -Version: 4.3.7 -Release: 4%{?dist} +Version: 4.6.1 +Release: 1%{?dist} Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/dde-control-center Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz -# https://github.com/golang/go/issues/21947 -ExcludeArch: ppc64le ppc64 aarch64 BuildRequires: desktop-file-utils BuildRequires: deepin-dock-devel -BuildRequires: pkgconfig(dtkwidget) = 2.0 -BuildRequires: pkgconfig(dframeworkdbus) +BuildRequires: pkgconfig(dde-network-utils) +BuildRequires: pkgconfig(dtkwidget) >= 2.0.6 +BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(geoip) BuildRequires: pkgconfig(Qt5Core) @@ -29,6 +28,7 @@ Requires: deepin-account-faces Requires: deepin-api Requires: deepin-daemon Requires: deepin-qt5integration +Requires: deepin-network-utils Requires: GeoIP-GeoLite-data Requires: GeoIP-GeoLite-data-extra Requires: gtk-murrine-engine @@ -77,6 +77,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{repo}.desktop ||: %{_datadir}/%{repo}/ %changelog +* Fri Jul 27 2018 mosquito <sensor.wen(a)gmail.com> - 4.6.1-1 +- Update to 4.6.1 + * Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index af05df9..75631a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-control-center-4.3.7.tar.gz) = a8b1c3ca918ace88577e924ff66335d1ce7ddb2de55ce4abb160816a7cab8721188fa9a57bc97ddb1fc617d4a3f7df79b2f10a4ac2286eed0b3c98337b8b7777 +SHA512 (dde-control-center-4.6.1.tar.gz) = 400bde6121f890fde1fbb508fcf8d51d8c445f205d6136075ebedb6aa91277e3102aac9552618c85a5c1b3e3c64c0b7831746c0923eb240edf4a26711e2f380e commit 4c4b4ae9910654cac23f596c774719d73937ce86 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jul 12 22:42:20 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/deepin-control-center.spec b/deepin-control-center.spec index 4ecd756..11d9945 100644 --- a/deepin-control-center.spec +++ b/deepin-control-center.spec @@ -2,7 +2,7 @@ Name: deepin-control-center Version: 4.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/dde-control-center @@ -77,6 +77,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{repo}.desktop ||: %{_datadir}/%{repo}/ %changelog +* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Mar 23 2018 mosquito <sensor.wen(a)gmail.com> - 4.3.7-3 - Exclude ppc64le, ppc64 and aarch64 commit d9e17a45f5ef2f700220ad133afecd47755d5712 Author: mosquito <sensor.wen(a)gmail.com> Date: Sat Mar 24 00:16:48 2018 +0800 Exclude ppc64le, ppc64 and aarch64 diff --git a/deepin-control-center.spec b/deepin-control-center.spec index 8370e97..4ecd756 100644 --- a/deepin-control-center.spec +++ b/deepin-control-center.spec @@ -2,12 +2,14 @@ Name: deepin-control-center Version: 4.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/dde-control-center Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz +# https://github.com/golang/go/issues/21947 +ExcludeArch: ppc64le ppc64 aarch64 BuildRequires: desktop-file-utils BuildRequires: deepin-dock-devel BuildRequires: pkgconfig(dtkwidget) = 2.0 @@ -75,6 +77,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{repo}.desktop ||: %{_datadir}/%{repo}/ %changelog +* Fri Mar 23 2018 mosquito <sensor.wen(a)gmail.com> - 4.3.7-3 +- Exclude ppc64le, ppc64 and aarch64 + * Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1 0

Architecture specific change in rpms/deepin-daemon.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/deepin-daemon.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/deepin-daemon.git/commit/?id=55c9c0… https://src.fedoraproject.org/cgit/rpms/deepin-daemon.git/commit/?id=f65e86…. Change: +%ifnarch s390 s390x %{arm} +ExcludeArch: ppc64le aarch64 Thanks. Full change: ============ commit 3141915650b416b72ce4d6753f4208ef03e246ff Author: mosquito <sensor.wen(a)gmail.com> Date: Sat Aug 25 18:22:20 2018 +0800 Release 3.2.20 diff --git a/.gitignore b/.gitignore index 0225c1f..1937819 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /dde-daemon-3.2.9.tar.gz /dde-daemon-3.2.21.tar.gz /dde-daemon-3.2.22.tar.gz +/dde-daemon-3.2.20.tar.gz diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 16f86ef..e6efc6a 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,7 +2,7 @@ %global ds_url https://github.com/linuxdeepin/default-settings Name: deepin-daemon -Version: 3.2.22 +Version: 3.2.20 Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 @@ -44,10 +44,10 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xkbfile) -BuildRequires: golang-deepin-dbus-factory-devel -BuildRequires: golang(pkg.deepin.io/lib) +BuildRequires: golang-deepin-dbus-factory-devel >= 3.1.16 +BuildRequires: golang(pkg.deepin.io/lib) >= 1.2.11 BuildRequires: golang(pkg.deepin.io/lib/fsnotify) -BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) +BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) >= 3.1.26 BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory) BuildRequires: golang(github.com/linuxdeepin/go-x11-client) BuildRequires: golang(github.com/BurntSushi/xgb) @@ -99,6 +99,7 @@ sed -i '/systemd/s|lib|usr/lib|' Makefile sed -i 's|lib/NetworkManager|libexec|' network/utils_test.go sed -i 's|/usr/lib|%{_libexecdir}|' \ misc/*services/*.service \ + misc/systemd/services/*.service \ misc/etc/pam.d/deepin-auth \ misc/applications/deepin-toggle-desktop.desktop \ misc/dde-daemon/gesture.json \ @@ -108,7 +109,8 @@ sed -i 's|/usr/lib|%{_libexecdir}|' \ session/power/lid_switch.go \ service_trigger/manager.go \ bin/dde-system-daemon/main.go \ - bin/search/main.go + bin/search/main.go \ + accounts/image_blur.go # Fix grub.cfg path sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go @@ -187,11 +189,8 @@ fi %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla %changelog -* Thu Aug 2 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.22-1 -- Update to 3.2.22 - -* Fri Jul 20 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.21-1 -- Update to 3.2.21 +* Sat Aug 25 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.20-1 +- Update to 3.2.20 * Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 908f4d0..f3bed61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.2.22.tar.gz) = 6df6d5cebbfd5d71ca31b3812fe8a4892ba4c9607adbdad76f9325d28246c53a267a4b803f6abb42d05c1aa8e349c00c8377a5e9fcb6e47f8bd20d8c2bbf2507 +SHA512 (dde-daemon-3.2.20.tar.gz) = e1b56276b5234ec6a8696dd1da92b1e9276e73756d70177d3be0bdd7a0288d55c1281753237353fecf375d4d3452dfe2b801f6367e87a530a568e9b19c2f7553 SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5 commit 91c6d4230aeee90abd15d1f4f08019c8fb6d6b58 Author: mosquito <sensor.wen(a)gmail.com> Date: Fri Aug 3 18:33:01 2018 +0800 Release 3.2.22 diff --git a/.gitignore b/.gitignore index b7f74e7..0225c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dde-daemon-3.2.8.tar.gz /dde-daemon-3.2.9.tar.gz /dde-daemon-3.2.21.tar.gz +/dde-daemon-3.2.22.tar.gz diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 4f333a2..16f86ef 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,7 +2,7 @@ %global ds_url https://github.com/linuxdeepin/default-settings Name: deepin-daemon -Version: 3.2.21 +Version: 3.2.22 Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 @@ -187,6 +187,9 @@ fi %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla %changelog +* Thu Aug 2 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.22-1 +- Update to 3.2.22 + * Fri Jul 20 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.21-1 - Update to 3.2.21 diff --git a/sources b/sources index 0909aa4..908f4d0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.2.21.tar.gz) = d19d1aca29657b540fa53b569f22d00cf76f3a0f4b1280f6f14e6c289dd2799ed2deb7db37005dfeae816e6ceb99bcb74971518f9701db98db0d02c146ed59d5 +SHA512 (dde-daemon-3.2.22.tar.gz) = 6df6d5cebbfd5d71ca31b3812fe8a4892ba4c9607adbdad76f9325d28246c53a267a4b803f6abb42d05c1aa8e349c00c8377a5e9fcb6e47f8bd20d8c2bbf2507 SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5 commit 2d72bf1eca5e374ad54da8362e3ec91cf8066c4e Author: mosquito <sensor.wen(a)gmail.com> Date: Tue Jul 31 23:57:27 2018 +0800 Release 3.2.21 diff --git a/.gitignore b/.gitignore index a4e1921..b7f74e7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dde-daemon-3.2.7.tar.gz /dde-daemon-3.2.8.tar.gz /dde-daemon-3.2.9.tar.gz +/dde-daemon-3.2.21.tar.gz diff --git a/deepin-daemon.spec b/deepin-daemon.spec index fa037b0..4f333a2 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,8 +2,8 @@ %global ds_url https://github.com/linuxdeepin/default-settings Name: deepin-daemon -Version: 3.2.9 -Release: 3%{?dist} +Version: 3.2.21 +Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 URL: https://github.com/linuxdeepin/dde-daemon @@ -48,6 +48,7 @@ BuildRequires: golang-deepin-dbus-factory-devel BuildRequires: golang(pkg.deepin.io/lib) BuildRequires: golang(pkg.deepin.io/lib/fsnotify) BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory) BuildRequires: golang(github.com/linuxdeepin/go-x11-client) BuildRequires: golang(github.com/BurntSushi/xgb) BuildRequires: golang(github.com/BurntSushi/xgbutil) @@ -94,25 +95,28 @@ Daemon handling the DDE session settings # Fix library exec path sed -i '/deepin/s|lib|libexec|' Makefile +sed -i '/systemd/s|lib|usr/lib|' Makefile sed -i 's|lib/NetworkManager|libexec|' network/utils_test.go sed -i 's|/usr/lib|%{_libexecdir}|' \ misc/*services/*.service \ + misc/etc/pam.d/deepin-auth \ misc/applications/deepin-toggle-desktop.desktop \ + misc/dde-daemon/gesture.json \ misc/dde-daemon/keybinding/system_actions.json \ keybinding/shortcuts/system_shortcut.go \ session/power/constant.go \ session/power/lid_switch.go \ + service_trigger/manager.go \ bin/dde-system-daemon/main.go \ - bin/search/main.go \ - accounts/user.go + bin/search/main.go # Fix grub.cfg path sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go -sed -i 's|default_background.jpg|default.png|' accounts/user.go %build export GOPATH="$(pwd)/build:%{gopath}" -%make_build +BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" +%make_build GOBUILD="go build -compiler gc -ldflags \"-B $BUILDID\"" %install %make_install @@ -163,9 +167,12 @@ fi %files -f %{repo}.lang %doc README.md %license LICENSE +%{_sysconfdir}/pam.d/deepin-auth +%{_sysconfdir}/pam.d/deepin-auth-keyboard %{_libexecdir}/%{name}/ %{_sysusersdir}/%{name}.conf %{_prefix}/lib/systemd/logind.conf.d/10-%{name}.conf +%{_unitdir}/deepin-accounts-daemon.service %{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/system-services/*.service %{_datadir}/dbus-1/system.d/*.conf @@ -177,8 +184,12 @@ fi %{_fontconfig_templatedir}/*.conf %{_fontconfig_confdir}/*.conf %{_var}/cache/appearance/ +%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla %changelog +* Fri Jul 20 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.21-1 +- Update to 3.2.21 + * Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 31b3f74..0909aa4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.2.9.tar.gz) = a1cccec281f3d3930ccac455e3999ff464cc6fc30b5ce533fb81323b179de3ab0ec3e9c74556d9a5c76f1e009f68f652f255522a75c1c2bbf511e8680b81414a +SHA512 (dde-daemon-3.2.21.tar.gz) = d19d1aca29657b540fa53b569f22d00cf76f3a0f4b1280f6f14e6c289dd2799ed2deb7db37005dfeae816e6ceb99bcb74971518f9701db98db0d02c146ed59d5 SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5 commit aa16ac25cf42657ed2ccb9ccbf3a121398b4da76 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jul 12 22:42:26 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 88cf9d6..fa037b0 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -3,7 +3,7 @@ Name: deepin-daemon Version: 3.2.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 URL: https://github.com/linuxdeepin/dde-daemon @@ -179,6 +179,9 @@ fi %{_var}/cache/appearance/ %changelog +* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 19 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.9-2 - Nothing providers grub2 in s390x and armv7hl. commit f65e866b224fa777c3dacb28f14db05d796d7438 Author: mosquito <sensor.wen(a)gmail.com> Date: Tue Mar 20 19:52:21 2018 +0800 Exclude aarch64 diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 63190cc..88cf9d6 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -14,14 +14,13 @@ Patch0: https://raw.github.com/jouyouyun/tap-gesture-patches/master/patc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # https://github.com/golang/go/issues/21947 -ExcludeArch: ppc64le +ExcludeArch: ppc64le aarch64 BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: deepin-gettext-tools BuildRequires: deepin-gir-generator BuildRequires: fontpackages-devel BuildRequires: librsvg2-tools BuildRequires: pam-devel -BuildRequires: rsync BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gnome-keyring-1) @@ -111,10 +110,6 @@ sed -i 's|/usr/lib|%{_libexecdir}|' \ sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go sed -i 's|default_background.jpg|default.png|' accounts/user.go -# Copy files to gopath directory -sed -i -E 's|\$$dir.*$|${GOPKG_PREFIX}|' Makefile -sed -i -E 's|ln.{16}|rsync -a --exclude ${GOPATH_DIR} *|' Makefile - %build export GOPATH="$(pwd)/build:%{gopath}" %make_build commit 36b3b8dcbcc97ef44c89e8b2d30052583ac2e92e Author: mosquito <sensor.wen(a)gmail.com> Date: Tue Mar 20 04:20:31 2018 +0800 Add breq rsync diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 425d255..63190cc 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -21,6 +21,7 @@ BuildRequires: deepin-gir-generator BuildRequires: fontpackages-devel BuildRequires: librsvg2-tools BuildRequires: pam-devel +BuildRequires: rsync BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gnome-keyring-1) commit cbdf88b0e2dbf46dceba89e58d4663b9cf41e9d8 Author: mosquito <sensor.wen(a)gmail.com> Date: Tue Mar 20 04:10:07 2018 +0800 Copy files to gopath directory diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 42e82fd..425d255 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -110,6 +110,10 @@ sed -i 's|/usr/lib|%{_libexecdir}|' \ sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go sed -i 's|default_background.jpg|default.png|' accounts/user.go +# Copy files to gopath directory +sed -i -E 's|\$$dir.*$|${GOPKG_PREFIX}|' Makefile +sed -i -E 's|ln.{16}|rsync -a --exclude ${GOPATH_DIR} *|' Makefile + %build export GOPATH="$(pwd)/build:%{gopath}" %make_build commit 55c9c05908a8b5cee4cd06e4f51b6d92dd24b96d Author: mosquito <sensor.wen(a)gmail.com> Date: Tue Mar 20 01:46:53 2018 +0800 Nothing providers grub2 in s390x and armv7hl diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 295a4e3..42e82fd 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -3,7 +3,7 @@ Name: deepin-daemon Version: 3.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 URL: https://github.com/linuxdeepin/dde-daemon @@ -60,9 +60,11 @@ BuildRequires: golang(gopkg.in/yaml.v2) Requires: deepin-desktop-base Requires: deepin-desktop-schemas -Requires: deepin-grub2-themes Requires: deepin-notifications +%ifnarch s390 s390x %{arm} +Requires: deepin-grub2-themes Requires: acpid +%endif Requires: bluez-libs Requires: gvfs Requires: iw @@ -177,6 +179,9 @@ fi %{_var}/cache/appearance/ %changelog +* Mon Mar 19 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.9-2 +- Nothing providers grub2 in s390x and armv7hl. + * Fri Feb 16 2018 mosquito <sensor.wen(a)gmail.com> - 3.2.9-1 - Update to 3.2.9

1 0

Architecture specific change in rpms/deepin-grub2-themes.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/deepin-grub2-themes.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/deepin-grub2-themes.git/commit/?id=…. Change: +%ifnarch aarch64 %{arm} Thanks. Full change: ============ commit 2189f783fc0920b1266c2467dc22ca499fd77a8b Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Thu Aug 23 13:24:44 2018 +0100 ARMv7 now has grub2-efi diff --git a/deepin-grub2-themes.spec b/deepin-grub2-themes.spec index 12b6c96..e1fd162 100644 --- a/deepin-grub2-themes.spec +++ b/deepin-grub2-themes.spec @@ -2,7 +2,7 @@ Name: deepin-grub2-themes Version: 1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Deepin grub2 themes License: CC-BY-SA URL: https://github.com/linuxdeepin/deepin-grub2-themes @@ -10,8 +10,8 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch # matches grub2 pkg archs -ExcludeArch: s390 s390x %{arm} -%ifnarch aarch64 +ExcludeArch: s390 s390x +%ifnarch aarch64 %{arm} Requires: grub2 %else Requires: grub2-efi @@ -31,6 +31,9 @@ Deepin grub2 themes /boot/grub2/themes/deepin/ %changelog +* Thu Aug 23 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.0.0-4 +- ARMv7 now has grub2-efi + * Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild commit 2a890ed1b5634c654a332aa91861c32f895a56f6 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jul 12 22:43:14 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/deepin-grub2-themes.spec b/deepin-grub2-themes.spec index 8d80641..12b6c96 100644 --- a/deepin-grub2-themes.spec +++ b/deepin-grub2-themes.spec @@ -2,7 +2,7 @@ Name: deepin-grub2-themes Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Deepin grub2 themes License: CC-BY-SA URL: https://github.com/linuxdeepin/deepin-grub2-themes @@ -31,6 +31,9 @@ Deepin grub2 themes /boot/grub2/themes/deepin/ %changelog +* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1 0

Architecture specific change in rpms/java-11-openjdk.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/java-11-openjdk.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/java-11-openjdk.git/commit/?id=0654…. Change: +%ifarch x86_64 Thanks. Full change: ============ commit 06546df9ee35d0be81fca7c0edde25356efcc7ac Author: Jiri Vanek <jvanek(a)redhat.com> Date: Mon Sep 10 16:54:57 2018 +0200 Enable ZGC on x86_64, link to jhsdb followed its file to ifarch jit_arches ifnarch s390x Enable ZGC on x86_64. diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 9974e76..eb61394 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -349,7 +349,11 @@ alternatives \\ %endif --slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\ --slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\ +%ifarch %{jit_arches} +%ifnarch s390x --slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\ +%endif +%endif --slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\ --slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\ --slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\ @@ -834,7 +838,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 2%{?dist} +Release: 4%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1294,6 +1298,9 @@ bash ../configure \ --with-extra-ldflags="%{ourldflags}" \ --with-num-cores="$NUM_PROC" \ --disable-javac-server \ +%ifarch x86_64 + --with-jvm-features=zgc \ +%endif --disable-warnings-as-errors make \ @@ -1723,6 +1730,12 @@ require "copy_jdk_configs.lua" %changelog +* Mon Sep 10 2018 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.ea.28-4 +- link to jhsdb followed its file to ifarch jit_arches ifnarch s390x + +* Fri Sep 7 2018 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.ea.28-3 +- Enable ZGC on x86_64. + * Thu Sep 4 2018 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.ea.28-2 - jfr/*jfc files listed for all arches - lib/classlist do not exists s390, ifarch-ed via jit_arches out

1 0

Architecture specific change in rpms/java-11-openjdk.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/java-11-openjdk.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/java-11-openjdk.git/commit/?id=5608…. Change: +%ifnarch s390x Thanks. Full change: ============ commit 5608a838ed12e06257b854a3f5f046e79b1c6e7d Author: Jiri Vanek <jvanek(a)redhat.com> Date: Mon Sep 10 16:43:42 2018 +0200 link to jhsdb followed its file to ifarch jit_arches ifnarch s390x diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 6853bbb..eb61394 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -349,7 +349,11 @@ alternatives \\ %endif --slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\ --slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\ +%ifarch %{jit_arches} +%ifnarch s390x --slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\ +%endif +%endif --slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\ --slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\ --slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\ @@ -834,7 +838,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 3%{?dist} +Release: 4%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1726,6 +1730,9 @@ require "copy_jdk_configs.lua" %changelog +* Mon Sep 10 2018 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.ea.28-4 +- link to jhsdb followed its file to ifarch jit_arches ifnarch s390x + * Fri Sep 7 2018 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.ea.28-3 - Enable ZGC on x86_64.

1 0

Architecture specific change in rpms/R.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

The package rpms/R.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=e6d36024a055d392fa… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=c9b1f7ff531efd054d… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=688cb060e9c5efaac5… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=4c6489b85e35dc12a9… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=62458ff1107b976914… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=2584e95bcace87393f… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=aecb205f189ed779da… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=b78d665c771a7917fb… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=07fac606e4f48b14ec… https://src.fedoraproject.org/cgit/rpms/R.git/commit/?id=fdfbbebb1406b5f98a…. Change: +%ifarch ppc64 +%ifnarch ppc ppc64 +%ifarch ppc64 ppc64le +%ifarch x86_64 -%ifnarch ppc ppc64 -%ifnarch i586 +%ifnarch i586 +%ifarch x86_64 +%ifnarch %{arm} +%ifnarch %{arm} Thanks. Full change: ============ commit 5ef3252c3fe8f134c5745bc3d075df7763e8e3fd Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Sep 10 10:33:08 2018 -0400 3.5.1 diff --git a/.gitignore b/.gitignore index 58fbb88..32472ec 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /curl-7.59.0.tar.bz2 /xz-5.2.4.tar.bz2 /R-3.5.0.tar.gz +/R-3.5.1.tar.gz +/curl-7.61.1.tar.bz2 diff --git a/R.spec b/R.spec index ae72f55..91bc177 100644 --- a/R.spec +++ b/R.spec @@ -107,8 +107,8 @@ %endif Name: R -Version: 3.5.0 -Release: 6%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz @@ -133,7 +133,7 @@ Source106: https://cran.r-project.org/doc/FAQ/R-FAQ.html %global bzipv 1.0.6 %global xzv 5.2.4 %global pcrev 8.42 -%global curlv 7.59.0 +%global curlv 7.61.1 Source1000: http://zlib.net/zlib-%{zlibv}.tar.gz Source1001: http://www.bzip.org/1.0.6/bzip2-%{bzipv}.tar.gz Source1002: http://tukaani.org/xz/xz-%{xzv}.tar.bz2 @@ -289,11 +289,11 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.15 Provides: R-lattice = 0.20.35 -Provides: R-MASS = 7.3.49 +Provides: R-MASS = 7.3.50 Provides: R-Matrix = 1.2.14 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.23 +Provides: R-mgcv = 1.8.24 Provides: R-nlme = 3.1.137 Provides: R-nnet = 7.3.12 Provides: R-parallel = %{version} @@ -302,7 +302,7 @@ Provides: R-spatial = 7.3.11 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.41.3 +Provides: R-survival = 2.42.3 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -1193,6 +1193,10 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Mon Sep 10 2018 Tom Callaway <spot(a)fedoraproject.org> - 3.5.1-1 +- update to 3.5.1 +- update bundled curl to 7.61.1 + * Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.5.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index f197d67..3777c7d 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (zlib-1.2.11.tar.gz) = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae SHA512 (bzip2-1.0.6.tar.gz) = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 SHA512 (pcre-8.42.tar.bz2) = b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d -SHA512 (curl-7.59.0.tar.bz2) = 9b5586f443a3c9fed947debce86861a8dea0fbf59bf8838cfd72a0884f13073630cf9d369b5535a059d122decd738c652705567752517f5cb11148cc16f693fb SHA512 (xz-5.2.4.tar.bz2) = 25a548c34a304ba51cdaa63813df0fa4ac2f3cf0ec6dc2d181ec5b62fe586090cd0f1c866ee7ba19e9b264ecabf9ca9f2f1dda7f95313546da4152f3cfaa7e6e -SHA512 (R-3.5.0.tar.gz) = c2703e892eb6f12ec7b536540b823d4ef011dddcbdca06c12d438bc1f07debae9dbd0f72abb6f0d4c577a3c74b155452ef527489cf023ed892109dd86c23bc37 +SHA512 (R-3.5.1.tar.gz) = 382cc6e200469dd168799948edcf3a0b869d7ef3b3176fdfc60752f3f37e6ba356323c47d8815a4d9ab6ad3a21cd045d26ef5e75107c8685328e0ffcfd172f7f +SHA512 (curl-7.61.1.tar.bz2) = 484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5 commit 7b8d8f53b91eda2c79745a299eaf85731cab1279 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jul 12 19:15:09 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/R.spec b/R.spec index cbdc998..ae72f55 100644 --- a/R.spec +++ b/R.spec @@ -108,7 +108,7 @@ Name: R Version: 3.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz @@ -1193,6 +1193,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 10 2018 Pete Walter <pwalter(a)fedoraproject.org> - 3.5.0-5 - Rebuild for ICU 62 commit 87ea299ce2f2f82e97a97d626356306e054995e8 Author: Pete Walter <pwalter(a)fedoraproject.org> Date: Tue Jul 10 22:00:01 2018 +0100 Rebuild for ICU 62 diff --git a/R.spec b/R.spec index 0b06955..cbdc998 100644 --- a/R.spec +++ b/R.spec @@ -108,7 +108,7 @@ Name: R Version: 3.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz @@ -1193,6 +1193,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Tue Jul 10 2018 Pete Walter <pwalter(a)fedoraproject.org> - 3.5.0-5 +- Rebuild for ICU 62 + * Tue Jun 5 2018 Tom Callaway <spot(a)fedoraproject.org> - 3.5.0-4 - only own /usr/share/texmf/tex/latex/R ... not /usr/share/texmf commit 4c0f19319cc77698be42aa7d21fb05c41455c369 Author: Jason Tibbitts <tibbs(a)math.uh.edu> Date: Tue Jul 10 01:24:14 2018 -0500 Remove needless use of %defattr diff --git a/R.spec b/R.spec index 0956ead..0b06955 100644 --- a/R.spec +++ b/R.spec @@ -841,7 +841,6 @@ R CMD javareconf \ # Metapackage %files core -%defattr(-, root, root, -) %{_bindir}/R %{_bindir}/Rscript %{_datadir}/R/ @@ -1166,7 +1165,6 @@ R CMD javareconf \ /etc/ld.so.conf.d/* %files core-devel -%defattr(-, root, root, -) %{_libdir}/pkgconfig/libR.pc %{_includedir}/R # Symlink to %%{_includedir}/R/ @@ -1184,17 +1182,14 @@ R CMD javareconf \ %endif %files -n libRmath -%defattr(-, root, root, -) %doc doc/COPYING %{_libdir}/libRmath.so %files -n libRmath-devel -%defattr(-, root, root, -) %{_includedir}/Rmath.h %{_libdir}/pkgconfig/libRmath.pc %files -n libRmath-static -%defattr(-, root, root, -) %{_libdir}/libRmath.a %changelog commit 82bfa96fd5a43f28294a9c9a638d47339ab29652 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jun 5 11:16:44 2018 -0400 only own /usr/share/texmf/tex/latex/R ... not /usr/share/texmf diff --git a/R.spec b/R.spec index e84e15f..0956ead 100644 --- a/R.spec +++ b/R.spec @@ -108,7 +108,7 @@ Name: R Version: 3.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz @@ -845,7 +845,7 @@ R CMD javareconf \ %{_bindir}/R %{_bindir}/Rscript %{_datadir}/R/ -%{_datadir}/texmf/ +%{_datadir}/texmf/tex/latex/R # Have to break this out for the translations %dir %{_libdir}/R/ %{_libdir}/R/bin/ @@ -1198,6 +1198,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Tue Jun 5 2018 Tom Callaway <spot(a)fedoraproject.org> - 3.5.0-4 +- only own /usr/share/texmf/tex/latex/R ... not /usr/share/texmf + * Fri May 18 2018 Tom Callaway <spot(a)fedoraproject.org> - 3.5.0-3 - do not run javareconf on el6/ppc64 EVEN in the java subpackages commit 5ecc806256d657f9ea8dafd4e3fd14e8eb723deb Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 18 22:35:31 2018 -0400 do not run javareconf on el6/ppc64 EVEN in the java subpackages diff --git a/R.spec b/R.spec index 93aa3c0..e84e15f 100644 --- a/R.spec +++ b/R.spec @@ -108,7 +108,7 @@ Name: R Version: 3.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz @@ -809,6 +809,7 @@ fi %if %{modern} %post java +%if %{runjavareconf} R CMD javareconf \ JAVA_HOME=%{_jvmdir}/jre \ JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ @@ -817,8 +818,10 @@ R CMD javareconf \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ 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 +%endif %post java-devel +%if %{runjavareconf} R CMD javareconf \ JAVA_HOME=%{_jvmdir}/jre \ JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ @@ -828,6 +831,7 @@ 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 %endif +%endif %post -n libRmath -p /sbin/ldconfig @@ -1194,6 +1198,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Fri May 18 2018 Tom Callaway <spot(a)fedoraproject.org> - 3.5.0-3 +- do not run javareconf on el6/ppc64 EVEN in the java subpackages + * Fri May 18 2018 Tom Callaway <spot(a)fedoraproject.org> - 3.5.0-2 - do not run javareconf on el6/ppc64 commit f545d3ff8f3191bff97338b402dbc65f56e6ffb8 Merge: 39d2e01 50017ab Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 18 16:54:55 2018 -0400 Merge branch 'master' into el6 commit 50017ab03142b6f6a94f8964488fb6c989121283 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 18 16:54:36 2018 -0400 close if diff --git a/R.spec b/R.spec index 3a2ad7f..93aa3c0 100644 --- a/R.spec +++ b/R.spec @@ -7,6 +7,7 @@ %ifarch ppc64 ppc64le %global runjavareconf 0 %endif +%endif %ifarch x86_64 commit 688cb060e9c5efaac584a7b632c896855262f533 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 18 16:54:09 2018 -0400 do not run javareconf on el6/ppc64 diff --git a/R.spec b/R.spec index e59434a..3a2ad7f 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,14 @@ # We do not want this. %define __brp_mangle_shebangs /usr/bin/true +%global runjavareconf 1 + +%if 0%{?rhel} && 0%{?rhel} <= 6 +%ifarch ppc64 ppc64le +%global runjavareconf 0 +%endif + + %ifarch x86_64 %global java_arch amd64 %else @@ -99,7 +107,7 @@ Name: R Version: 3.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz @@ -754,6 +762,7 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig +%if %{runjavareconf} R CMD javareconf \ JAVA_HOME=%{_jvmdir}/jre \ JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ @@ -762,6 +771,7 @@ R CMD javareconf \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ 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 +%endif # With 2.10.0, we no longer need to do any of this. @@ -1183,6 +1193,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Fri May 18 2018 Tom Callaway <spot(a)fedoraproject.org> - 3.5.0-2 +- do not run javareconf on el6/ppc64 + * Mon May 14 2018 Tom Callaway <spot(a)fedoraproject.org> - 3.5.0-1 - update to 3.5.0 - update xz bundle (rhel6 only) commit 39d2e0196a7d0c00a2eaefe223a3172b49a9e6c3 Merge: 8fb85e9 d43a215 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon May 14 14:11:15 2018 -0400 Merge branch 'master' into el6 commit 8fb85e9ec000ed482aa8fefd9dccf4b609dd2df4 Merge: dcb29cb 8fa7996 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon May 14 12:54:22 2018 -0400 Merge branch 'master' into el6 commit dcb29cbf18a9a0cebb2e498dc62abb787b511c41 Merge: 4b2e1d3 df3d6c7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 28 13:10:33 2018 -0400 Merge branch 'master' into el6 commit 4b2e1d3bccf40a47e33b8ce656687b860eb47c3d Merge: 76905aa 5ee9a23 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Nov 30 16:05:32 2017 -0500 Merge branch 'master' into el6 commit 76905aa18544031ae368a8800ac7f5d7c317388f Merge: 09dfc2f 1ff9f1f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 30 09:10:10 2017 -0400 Merge branch 'master' into el6 commit 09dfc2f363d9c8df75372111a121388fa406754a Merge: 0eafbf5 ea4683b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Oct 27 12:44:01 2017 -0400 Merge branch 'master' into el6 commit 0eafbf5d945d6c49fbbc9ed0b365dfa4fd695c08 Merge: 28b40e2 b00c20f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jun 30 11:30:38 2017 -0400 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/rpms/R into el6 commit 28b40e2023625b6831da2035f74a5cefb7badaf3 Merge: 08e989e 77fa703 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jun 30 11:30:28 2017 -0400 Merge branch 'master' into el6 commit b00c20f958ab134192d5fe265d920b4348985212 Merge: 08e989e c57ca6f Author: Jos Matos <jamatos(a)fedoraproject.org> Date: Sat May 13 00:17:02 2017 +0100 Merge branch 'master' into el6 commit 08e989e18d70569eaa7d03f19b93437ab83b4745 Merge: dd4a8a8 3ebcc04 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Apr 22 12:15:37 2017 -0700 Merge branch 'master' into el6 commit dd4a8a8dadcee3562a64369c7c28dba4b91c0824 Merge: 433f619 2141d05 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 8 11:11:47 2017 -0800 Merge branch 'el5' into el6 commit 2141d05560aad4395885afae41e3cccd7f45bf30 Merge: da330de 1c02a40 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 8 10:51:56 2017 -0800 fix merge diff --cc .gitignore index 0f8518b,f79797f..2ae754e --- a/.gitignore +++ b/.gitignore @@@ -1,7 -1,33 +1,13 @@@ -R-2.11.1.tar.gz -/R-2.12.0.tar.gz -/R-2.12.1.tar.gz -/R-2.12.2.tar.gz -/R-2.13.0.tar.gz -/R-2.13.1.tar.gz -/R-2.13.2.tar.gz -/R-2.14.0.tar.gz -/R-2.14.1.tar.gz -/R-2.15.0.tar.gz -/R-2.15.1.tar.gz -/R-2.15.2.tar.gz -/R-3.0.0.tar.gz -/R-3.0.1.tar.gz -/R-3.0.2.tar.gz -/R-3.0.3.tar.gz -/R-3.1.1.tar.gz -/R-3.1.2.tar.gz -/R-3.1.3.tar.gz -/R-3.2.0.tar.gz -/R-3.2.1.tar.gz -/R-3.2.2.tar.gz -/R-3.2.3.tar.gz -/R-3.2.4-revised.tar.gz -/R-3.3.0.tar.gz +/xz-5.2.2.tar.bz2 +/zlib-1.2.8.tar.gz +/bzip2-1.0.6.tar.gz +/curl-7.48.0.tar.bz2 +/pcre-8.38.tar.bz2 /R-3.3.1.tar.gz /R-3.3.2.tar.gz + /R-3.3.3.tar.gz + /zlib-1.2.11.tar.gz + /bzip2-1.0.6.tar.gz + /xz-5.2.3.tar.bz2 + /pcre-8.40.tar.bz2 + /curl-7.53.1.tar.bz2 commit da330de90ecc1820cf03c8c59acbb635b919b6b5 Merge: 99580ae d3dd028 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Dec 15 09:46:59 2016 -0500 merge fix commit 433f619b3be960a3c871d06c37204dcc74284708 Merge: ecab635 d3dd028 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Dec 15 09:45:37 2016 -0500 merge fix commit 99580ae69acd517885c84029c0ab6253e77739d7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 31 15:56:02 2016 -0400 fix provides, fix included versions diff --git a/R.spec b/R.spec index 921b300..4abf8ed 100644 --- a/R.spec +++ b/R.spec @@ -88,7 +88,7 @@ Name: R Version: 3.3.2 -Release: 1%{?dist}.1 +Release: 2%{?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-3/R-%{version}.tar.gz @@ -251,6 +251,7 @@ Requires: libRmath%{?_isa} = %{version}-%{release} Requires: openblas # I assure you. Lying about this is MUCH easier than filtering it out. Provides: libRblas.so()(%{__isa_bits}bit) +Provides: libRblas.so %endif # These are the submodules that R-core provides. Sometimes R modules say they @@ -259,20 +260,20 @@ Provides: libRblas.so()(%{__isa_bits}bit) Provides: R-base = %{version} Provides: R-boot = 1.3.18 Provides: R-class = 7.3.14 -Provides: R-cluster = 2.0.4 -Provides: R-codetools = 0.2.14 +Provides: R-cluster = 2.0.5 +Provides: R-codetools = 0.2.15 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.66 +Provides: R-foreign = 0.8.67 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.15 -Provides: R-lattice = 0.20.33 +Provides: R-lattice = 0.20.34 Provides: R-MASS = 7.3.45 -Provides: R-Matrix = 1.2.6 +Provides: R-Matrix = 1.2.7.1 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.12 +Provides: R-mgcv = 1.8.15 Provides: R-nlme = 3.1.128 Provides: R-nnet = 7.3.12 Provides: R-parallel = %{version} @@ -281,7 +282,7 @@ Provides: R-spatial = 7.3.11 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.39.4 +Provides: R-survival = 2.39.5 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -334,7 +335,7 @@ Requires: tex(cm-super-ts1.enc) Requires: qpdf %endif -Provides: R-Matrix-devel = 1.2.6 +Provides: R-Matrix-devel = 1.2.7.1 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -559,7 +560,7 @@ export FCFLAGS="%{optflags}" # It also results in R using the bundled lapack copy. ( %configure \ -%if 0%{?rhel} <= 5 +%if 0%{?rhel} && 0%{?rhel} <= 5 --with-readline=no \ %endif %if %{system_tre} @@ -1164,6 +1165,10 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Mon Oct 31 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.2-2 +- fix provides for openblas hack +- fix version for recommended components that are included + * Mon Oct 31 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.2-1.1 - disable readline support for el5 commit ecab6354356ec41f44edccf78d63e3856d4a1006 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 31 15:55:47 2016 -0400 fix provides, fix included versions diff --git a/R.spec b/R.spec index 317f5b7..4abf8ed 100644 --- a/R.spec +++ b/R.spec @@ -88,7 +88,7 @@ Name: R Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?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-3/R-%{version}.tar.gz @@ -251,6 +251,7 @@ Requires: libRmath%{?_isa} = %{version}-%{release} Requires: openblas # I assure you. Lying about this is MUCH easier than filtering it out. Provides: libRblas.so()(%{__isa_bits}bit) +Provides: libRblas.so %endif # These are the submodules that R-core provides. Sometimes R modules say they @@ -259,20 +260,20 @@ Provides: libRblas.so()(%{__isa_bits}bit) Provides: R-base = %{version} Provides: R-boot = 1.3.18 Provides: R-class = 7.3.14 -Provides: R-cluster = 2.0.4 -Provides: R-codetools = 0.2.14 +Provides: R-cluster = 2.0.5 +Provides: R-codetools = 0.2.15 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.66 +Provides: R-foreign = 0.8.67 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.15 -Provides: R-lattice = 0.20.33 +Provides: R-lattice = 0.20.34 Provides: R-MASS = 7.3.45 -Provides: R-Matrix = 1.2.6 +Provides: R-Matrix = 1.2.7.1 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.12 +Provides: R-mgcv = 1.8.15 Provides: R-nlme = 3.1.128 Provides: R-nnet = 7.3.12 Provides: R-parallel = %{version} @@ -281,7 +282,7 @@ Provides: R-spatial = 7.3.11 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.39.4 +Provides: R-survival = 2.39.5 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -334,7 +335,7 @@ Requires: tex(cm-super-ts1.enc) Requires: qpdf %endif -Provides: R-Matrix-devel = 1.2.6 +Provides: R-Matrix-devel = 1.2.7.1 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -559,6 +560,9 @@ export FCFLAGS="%{optflags}" # It also results in R using the bundled lapack copy. ( %configure \ +%if 0%{?rhel} && 0%{?rhel} <= 5 + --with-readline=no \ +%endif %if %{system_tre} --with-system-tre \ %endif @@ -1161,6 +1165,13 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Mon Oct 31 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.2-2 +- fix provides for openblas hack +- fix version for recommended components that are included + +* Mon Oct 31 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.2-1.1 +- disable readline support for el5 + * Mon Oct 31 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.2-1 - update to 3.3.2 commit 0a2d99f9a7af4c2e135f8f29e70b73fd87db47cd Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 31 13:49:53 2016 -0400 disable readline support for el5 diff --git a/R.spec b/R.spec index 317f5b7..921b300 100644 --- a/R.spec +++ b/R.spec @@ -88,7 +88,7 @@ Name: R Version: 3.3.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 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-3/R-%{version}.tar.gz @@ -559,6 +559,9 @@ export FCFLAGS="%{optflags}" # It also results in R using the bundled lapack copy. ( %configure \ +%if 0%{?rhel} <= 5 + --with-readline=no \ +%endif %if %{system_tre} --with-system-tre \ %endif @@ -1161,6 +1164,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Mon Oct 31 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.2-1.1 +- disable readline support for el5 + * Mon Oct 31 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.2-1 - update to 3.3.2 commit 84208267f8033eb45003d40beb5329655c36c431 Merge: 8265ec3 5620684 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 31 10:57:29 2016 -0400 merge fix commit 5620684dde2cce895b8b18386aa3a7dcb6e2e3d9 Merge: 386d1c8 8c75510 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 31 10:56:41 2016 -0400 merge fix diff --cc .gitignore index 04c3a26,e734524..0f8518b --- a/.gitignore +++ b/.gitignore @@@ -1,6 -1,27 +1,7 @@@ -R-2.11.1.tar.gz -/R-2.12.0.tar.gz -/R-2.12.1.tar.gz -/R-2.12.2.tar.gz -/R-2.13.0.tar.gz -/R-2.13.1.tar.gz -/R-2.13.2.tar.gz -/R-2.14.0.tar.gz -/R-2.14.1.tar.gz -/R-2.15.0.tar.gz -/R-2.15.1.tar.gz -/R-2.15.2.tar.gz -/R-3.0.0.tar.gz -/R-3.0.1.tar.gz -/R-3.0.2.tar.gz -/R-3.0.3.tar.gz -/R-3.1.1.tar.gz -/R-3.1.2.tar.gz -/R-3.1.3.tar.gz -/R-3.2.0.tar.gz -/R-3.2.1.tar.gz -/R-3.2.2.tar.gz -/R-3.2.3.tar.gz -/R-3.2.4-revised.tar.gz -/R-3.3.0.tar.gz +/xz-5.2.2.tar.bz2 +/zlib-1.2.8.tar.gz +/bzip2-1.0.6.tar.gz +/curl-7.48.0.tar.bz2 +/pcre-8.38.tar.bz2 /R-3.3.1.tar.gz + /R-3.3.2.tar.gz diff --cc sources index 16a67af,7132056..ec02424 --- a/sources +++ b/sources @@@ -1,6 -1,1 +1,6 @@@ +f90c9a0c8b259aee2234c4e0d7fd70af xz-5.2.2.tar.bz2 +44d667c142d7cda120332623eab69f40 zlib-1.2.8.tar.gz +00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz +d42e0fc34a5cace5739631cc040974fe curl-7.48.0.tar.bz2 +00aabbfe56d5a48b270f999b508c5ad2 pcre-8.38.tar.bz2 - f50a659738b73036e2f5635adbd229c5 R-3.3.1.tar.gz + 2437014ef40641cdc9673e89c040b7a8 R-3.3.2.tar.gz commit 386d1c819a4a13d602f7c7f259649723a3c21c55 Merge: 61a7f48 8adb08b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Aug 29 10:33:28 2016 -0400 Merge branch 'master' into el5 commit 8265ec36c89435eaf36d222e4e177f1bfe38cc7f Merge: 2bf67fd b9225ce Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Aug 8 14:01:50 2016 -0400 Merge branch 'master' into el6 commit 61a7f48bb56e96cc1410862c4a7599f361c46f87 Merge: 9a07360 b9225ce Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Aug 8 14:01:33 2016 -0400 Merge branch 'master' into el5 commit 2bf67fd29d75234585a7ef1b03ced71c2a80d4a9 Merge: d6ca269 2b16cd3 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jul 6 10:01:57 2016 -0400 Merge branch 'master' into el6 diff --cc sources index 47b3fd6,2d59225..16a67af --- a/sources +++ b/sources @@@ -1,6 -1,1 +1,6 @@@ - 5a7506c8813432d1621c9725e86baf7a R-3.3.0.tar.gz +f90c9a0c8b259aee2234c4e0d7fd70af xz-5.2.2.tar.bz2 +44d667c142d7cda120332623eab69f40 zlib-1.2.8.tar.gz +00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz +d42e0fc34a5cace5739631cc040974fe curl-7.48.0.tar.bz2 +00aabbfe56d5a48b270f999b508c5ad2 pcre-8.38.tar.bz2 + f50a659738b73036e2f5635adbd229c5 R-3.3.1.tar.gz commit 9a07360ca71e852f1e146d58d6de541a0088b542 Merge: 979102c 2b16cd3 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jul 6 10:00:31 2016 -0400 Merge branch 'master' into el5 diff --cc .gitignore index 6be147b,5f7780a..04c3a26 --- a/.gitignore +++ b/.gitignore @@@ -1,9 -1,26 +1,6 @@@ -R-2.11.1.tar.gz -/R-2.12.0.tar.gz -/R-2.12.1.tar.gz -/R-2.12.2.tar.gz -/R-2.13.0.tar.gz -/R-2.13.1.tar.gz -/R-2.13.2.tar.gz -/R-2.14.0.tar.gz -/R-2.14.1.tar.gz -/R-2.15.0.tar.gz -/R-2.15.1.tar.gz -/R-2.15.2.tar.gz -/R-3.0.0.tar.gz -/R-3.0.1.tar.gz -/R-3.0.2.tar.gz -/R-3.0.3.tar.gz -/R-3.1.1.tar.gz -/R-3.1.2.tar.gz -/R-3.1.3.tar.gz -/R-3.2.0.tar.gz -/R-3.2.1.tar.gz --/R-3.2.2.tar.gz --/R-3.2.3.tar.gz --/R-3.2.4-revised.tar.gz --/R-3.3.0.tar.gz +/xz-5.2.2.tar.bz2 +/zlib-1.2.8.tar.gz +/bzip2-1.0.6.tar.gz +/curl-7.48.0.tar.bz2 +/pcre-8.38.tar.bz2 + /R-3.3.1.tar.gz diff --cc sources index 47b3fd6,2d59225..16a67af --- a/sources +++ b/sources @@@ -1,6 -1,1 +1,6 @@@ - 5a7506c8813432d1621c9725e86baf7a R-3.3.0.tar.gz +f90c9a0c8b259aee2234c4e0d7fd70af xz-5.2.2.tar.bz2 +44d667c142d7cda120332623eab69f40 zlib-1.2.8.tar.gz +00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz +d42e0fc34a5cace5739631cc040974fe curl-7.48.0.tar.bz2 +00aabbfe56d5a48b270f999b508c5ad2 pcre-8.38.tar.bz2 + f50a659738b73036e2f5635adbd229c5 R-3.3.1.tar.gz commit d6ca269449159b5975c4d5ce958b026ddc1a678e Merge: ce43339 3dbb6ed Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Jun 11 15:31:17 2016 -0400 Merge branch 'master' into el6 commit 979102c99e47a7aaf343b2c0fc9337b654011221 Merge: 1b7c545 3dbb6ed Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Jun 11 15:30:48 2016 -0400 Merge branch 'master' into el5 commit ce433395bbe5e4d87c362b7967f48af9ccb24f7e Merge: e513a15 c8657f3 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Jun 11 15:02:14 2016 -0400 Merge branch 'master' into el6 commit 1b7c545c8323c24993cadbc35bf5666b15d3a3f9 Merge: 3c7e918 c8657f3 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Jun 11 15:01:56 2016 -0400 Merge branch 'master' into el5 commit e513a156ad69e8b78ea17274f227c23c4297d4bd Merge: 56a301c e1fee7a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jun 9 11:15:14 2016 -0400 Merge branch 'master' into el6 commit 3c7e9186b6761f10da7f4c463c5dd7f2fab050c2 Merge: 04c5e67 e1fee7a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jun 9 11:13:06 2016 -0400 Merge branch 'master' into el5 commit 56a301c58d3354b6a203306e955374abc5f97e24 Merge: 85014d2 db13324 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jun 9 10:29:29 2016 -0400 Merge branch 'master' into el6 commit 04c5e6732a43cbc75514cd2b95d810640f242f18 Merge: afa36f0 db13324 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jun 9 10:29:03 2016 -0400 Merge branch 'master' into el5 commit afa36f0075f59de3ede0074efedb1ef9baa7d8ea Merge: f38c233 3b49b69 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jun 7 11:47:21 2016 -0400 Merge branch 'master' into el5 commit 85014d24f1599bb5f54cc9165b29e0cf437585a8 Merge: f741383 3b49b69 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jun 7 11:46:49 2016 -0400 Merge branch 'master' into el6 commit f38c23389169ff9ef246d25fa03c72627f665025 Merge: 3a6e767 7d0ea5b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jun 6 09:53:30 2016 -0400 Merge branch 'master' into el5 commit f741383769dc25d2f7f95b395d05f00913a953c4 Merge: 43d07dc 7d0ea5b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jun 6 09:51:56 2016 -0400 erge branch 'master' into el6 commit 43d07dca72a7460580b3b0fc9a1e7b6986a5b3f8 Merge: 0536879 ffd451c Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jun 1 14:26:42 2016 -0400 Merge branch 'master' into el6 commit 3a6e7679d0c34854347c821224f7592768b4a9c5 Merge: 12667d7 ffd451c Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jun 1 14:26:06 2016 -0400 Merge branch 'master' into el5 commit 053687965bb292272f99eb09317d722983b73f91 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 13 15:33:42 2016 -0400 sources diff --git a/sources b/sources index 2f8e0c1..47b3fd6 100644 --- a/sources +++ b/sources @@ -1 +1,6 @@ 5a7506c8813432d1621c9725e86baf7a R-3.3.0.tar.gz +f90c9a0c8b259aee2234c4e0d7fd70af xz-5.2.2.tar.bz2 +44d667c142d7cda120332623eab69f40 zlib-1.2.8.tar.gz +00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz +d42e0fc34a5cace5739631cc040974fe curl-7.48.0.tar.bz2 +00aabbfe56d5a48b270f999b508c5ad2 pcre-8.38.tar.bz2 commit 7f7c911c3dff0bef39a59cf80901d80dcf7bf721 Merge: 7a47c61 a6cb1e2 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 13 15:33:17 2016 -0400 Merge branch 'master' into el6 commit 12667d763e494e17494bef15ff96c245fed1dcb8 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 13 14:44:34 2016 -0400 move files below everything except changelog diff --git a/R.spec b/R.spec index 9cf5131..8f695a3 100644 --- a/R.spec +++ b/R.spec @@ -687,6 +687,87 @@ ulimit -s 16384 make check %endif +%clean +rm -rf ${RPM_BUILD_ROOT} + +%post core +# Create directory entries for info files +# (optional doc files, so we must check that they are installed) +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 || : + fi +done +/sbin/ldconfig +R CMD javareconf \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + 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 +# Don't use .. based paths, substitute RHOME +# 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 +# Don't use .. based paths, substitute /usr/share/R +# sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt + + +%preun core +if [ $1 = 0 ]; then + # Delete directory entries for info files (if they were installed) + 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 || : + fi + done +fi + +%postun core +/sbin/ldconfig +if [ $1 -eq 0 ] ; then + /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : +fi + +%posttrans core +/usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : + +%if %{modern} +%post java +R CMD javareconf \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + 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 + +%post java-devel +R CMD javareconf \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + 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 +%endif + +%post -n libRmath -p /sbin/ldconfig + +%postun -n libRmath -p /sbin/ldconfig + %files # Metapackage @@ -1043,87 +1124,6 @@ make check %defattr(-, root, root, -) %{_libdir}/libRmath.a -%clean -rm -rf ${RPM_BUILD_ROOT}; - -%post core -# Create directory entries for info files -# (optional doc files, so we must check that they are installed) -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 || : - fi -done -/sbin/ldconfig -R CMD javareconf \ - JAVA_HOME=%{_jvmdir}/jre \ - JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ - JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ - -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ - -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - 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 -# Don't use .. based paths, substitute RHOME -# 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 -# Don't use .. based paths, substitute /usr/share/R -# sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt - - -%preun core -if [ $1 = 0 ]; then - # Delete directory entries for info files (if they were installed) - 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 || : - fi - done -fi - -%postun core -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : -fi - -%posttrans core -/usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : - -%if %{modern} -%post java -R CMD javareconf \ - JAVA_HOME=%{_jvmdir}/jre \ - JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ - JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ - -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ - -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - 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 - -%post java-devel -R CMD javareconf \ - JAVA_HOME=%{_jvmdir}/jre \ - JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ - JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ - -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ - -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - 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 -%endif - -%post -n libRmath -p /sbin/ldconfig - -%postun -n libRmath -p /sbin/ldconfig - %changelog * Fri May 13 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.0-3 - we no longer need Requires: blas-devel, lapack-devel for R-core-devel commit 3998e87b55eef0eba928d8be37e2e230dbb18824 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 13 12:35:06 2016 -0400 missing BR for full curl build diff --git a/R.spec b/R.spec index 6518981..9cf5131 100644 --- a/R.spec +++ b/R.spec @@ -115,10 +115,13 @@ Source1003: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{pcrev}. Source1004: https://curl.haxx.se/download/curl-%{curlv}.tar.bz2 BuildRequires: glibc-devel BuildRequires: groff +BuildRequires: krb5-libs BuildRequires: krb5-devel +BuildRequires: libgssapi-devel BuildRequires: libidn-devel BuildRequires: libmetalink-devel BuildRequires: libssh2-devel +BuildRequires: openldap BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: openssh-clients commit edc36d2c71df68d995e52fcc90e2f5748672adbf Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 13 11:54:50 2016 -0400 enable ssl, disable nss (too old) diff --git a/R.spec b/R.spec index 5df3199..6518981 100644 --- a/R.spec +++ b/R.spec @@ -119,7 +119,6 @@ BuildRequires: krb5-devel BuildRequires: libidn-devel BuildRequires: libmetalink-devel BuildRequires: libssh2-devel -BuildRequires: nss-devel BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: openssh-clients @@ -464,7 +463,7 @@ mkdir -p target make DESTDIR=%{_builddir}/%{name}-%{version}/pcre-%{pcrev}/target install popd pushd curl-%{curlv} -CFLAGS="%{optflags} -fpic -fPIC" %configure --enable-static=yes --enable-shared=no --without-ssl --with-nss --enable-ipv6 --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt --with-gssapi --with-libidn --enable-ldaps --with-libssh2 --enable-threaded-resolver --with-libmetalink +CFLAGS="%{optflags} -fpic -fPIC" %configure --enable-static=yes --enable-shared=no --with-ssl --enable-ipv6 --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt --with-gssapi --with-libidn --enable-ldaps --with-libssh2 --enable-threaded-resolver --with-libmetalink make %{?_smp_mflags} V=1 mkdir -p target make DESTDIR=%{_builddir}/%{name}-%{version}/curl-%{curlv}/target INSTALL="install -p" install commit 4982471e77608704e320f9c8e18aa27ef32ed3ac Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 13 11:44:51 2016 -0400 extra sources diff --git a/.gitignore b/.gitignore index f779a85..6be147b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,8 @@ /R-3.2.3.tar.gz /R-3.2.4-revised.tar.gz /R-3.3.0.tar.gz +/xz-5.2.2.tar.bz2 +/zlib-1.2.8.tar.gz +/bzip2-1.0.6.tar.gz +/curl-7.48.0.tar.bz2 +/pcre-8.38.tar.bz2 diff --git a/sources b/sources index 2f8e0c1..47b3fd6 100644 --- a/sources +++ b/sources @@ -1 +1,6 @@ 5a7506c8813432d1621c9725e86baf7a R-3.3.0.tar.gz +f90c9a0c8b259aee2234c4e0d7fd70af xz-5.2.2.tar.bz2 +44d667c142d7cda120332623eab69f40 zlib-1.2.8.tar.gz +00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz +d42e0fc34a5cace5739631cc040974fe curl-7.48.0.tar.bz2 +00aabbfe56d5a48b270f999b508c5ad2 pcre-8.38.tar.bz2 commit 684896149867b571e281085761602ea886db812c Merge: 8a1eb32 edc3e46 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 13 11:39:54 2016 -0400 Merge branch 'master' into el5 commit 7a47c6174163c05f22422a55cad7a357bb26dd37 Merge: d283d9f 47e152f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue May 10 12:54:09 2016 -0400 Merge branch 'master' into el6 commit 8a1eb3240d8174b9390fb38c2778133d6bd02799 Merge: 0d37da6 47e152f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue May 10 12:53:52 2016 -0400 Merge branch 'master' into el5 commit d283d9f317b013359de28b79582f0642e17007c1 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue May 10 12:50:41 2016 -0400 fix el6 ppc64 build diff --git a/R.spec b/R.spec index 600a431..7738d00 100644 --- a/R.spec +++ b/R.spec @@ -49,7 +49,7 @@ %global libicu 0 %endif -%if 0%{?rhel} = 6 +%if 0%{?rhel} == 6 %ifarch ppc64 %global libicu 0 %endif commit e6d36024a055d392fa444481044e79393a52b14d Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue May 10 12:50:06 2016 -0400 fix el6 ppc64 build diff --git a/R.spec b/R.spec index a9a6540..600a431 100644 --- a/R.spec +++ b/R.spec @@ -41,6 +41,20 @@ %global modern 1 %endif +# RHEL 6 ppc64 doesn't have icu. Everyone else modern does. + +%if %{modern} +%global libicu 1 +%else +%global libicu 0 +%endif + +%if 0%{?rhel} = 6 +%ifarch ppc64 +%global libicu 0 +%endif +%endif + # default to 0. %global texi2any 0 @@ -56,7 +70,7 @@ Name: R Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?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-3/R-%{version}.tar.gz @@ -132,7 +146,7 @@ BuildRequires: blas-devel >= 3.0 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel BuildRequires: gcc-objc, pango-devel, xz-devel -%if %{modern} +%if %{libicu} BuildRequires: libicu-devel %endif BuildRequires: less @@ -996,6 +1010,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue May 10 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.0-2 +- RHEL 6 ppc64 doesn't have libicu-devel. :P + * Tue May 10 2016 Tom Callaway <spot(a)fedoraproject.org> - 3.3.0-1 - update to 3.3.0 - fix R-java Requires (bz1324145) commit 0d37da678c362db5a51e6c4a979486b66d963599 Merge: 916063b 9aa7451 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue May 10 12:17:53 2016 -0400 Merge branch 'master' into el5 diff --cc .gitignore index 3c29bfa,b3f6bd0..f779a85 --- a/.gitignore +++ b/.gitignore @@@ -1,2 -1,25 +1,4 @@@ -R-2.11.1.tar.gz -/R-2.12.0.tar.gz -/R-2.12.1.tar.gz -/R-2.12.2.tar.gz -/R-2.13.0.tar.gz -/R-2.13.1.tar.gz -/R-2.13.2.tar.gz -/R-2.14.0.tar.gz -/R-2.14.1.tar.gz -/R-2.15.0.tar.gz -/R-2.15.1.tar.gz -/R-2.15.2.tar.gz -/R-3.0.0.tar.gz -/R-3.0.1.tar.gz -/R-3.0.2.tar.gz -/R-3.0.3.tar.gz -/R-3.1.1.tar.gz -/R-3.1.2.tar.gz -/R-3.1.3.tar.gz -/R-3.2.0.tar.gz -/R-3.2.1.tar.gz /R-3.2.2.tar.gz /R-3.2.3.tar.gz + /R-3.2.4-revised.tar.gz + /R-3.3.0.tar.gz commit eb4e799dbd6e2bf65d5498481d76f55426f1562c Merge: c0849c6 9aa7451 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue May 10 12:17:19 2016 -0400 Merge branch 'master' into el6 commit c0849c6e09c93b21c6daaf3b518e18b6d35d5ad3 Merge: 1520827 7890c8f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jan 26 17:01:44 2016 -0500 Merge branch 'master' into el6 commit 916063b3b1e24570f503c42581576fc792cc3011 Merge: cc92bae 7890c8f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jan 26 17:01:00 2016 -0500 Merge branch 'master' into el5 commit cc92bae0657832591420c6df970ade8f250903c8 Merge: 13349fe 72cf0bc Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 11 20:59:04 2015 -0500 Merge branch 'master' into el5 diff --cc .gitignore index 59af8ef,7d0dd1b..3c29bfa --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,23 +1,2 @@@ -R-2.11.1.tar.gz -/R-2.12.0.tar.gz -/R-2.12.1.tar.gz -/R-2.12.2.tar.gz -/R-2.13.0.tar.gz -/R-2.13.1.tar.gz -/R-2.13.2.tar.gz -/R-2.14.0.tar.gz -/R-2.14.1.tar.gz -/R-2.15.0.tar.gz -/R-2.15.1.tar.gz -/R-2.15.2.tar.gz -/R-3.0.0.tar.gz -/R-3.0.1.tar.gz -/R-3.0.2.tar.gz -/R-3.0.3.tar.gz -/R-3.1.1.tar.gz -/R-3.1.2.tar.gz -/R-3.1.3.tar.gz -/R-3.2.0.tar.gz -/R-3.2.1.tar.gz /R-3.2.2.tar.gz + /R-3.2.3.tar.gz commit 1520827a04aad399337d80028d1c148af6be4aa9 Merge: 5db1b11 72cf0bc Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 11 20:58:49 2015 -0500 Merge branch 'master' into el6 commit 13349fe8856edcdca6e29397560816022ffb80dd Merge: 8189179 c45c586 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Oct 23 11:14:57 2015 -0400 Merge branch 'master' into el5 commit 5db1b11da54db814effb52937bd392305bbe2281 Merge: dad250e c45c586 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Oct 23 11:14:01 2015 -0400 Merge branch 'master' into el6 commit 818917914aac70f512ee30de6451cc4736ea3a3b Merge: f4e5cfe 033bdfd Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Aug 14 15:34:20 2015 -0400 Merge branch 'master' into el5 diff --cc .gitignore index bc276e4,6ac9c6a..59af8ef --- a/.gitignore +++ b/.gitignore @@@ -1,8 -1,22 +1,1 @@@ - R-2.0.1.tar.gz - R-2.1.0.tar.gz - R-2.1.1.tar.gz - R-2.2.0.tar.gz - R-2.2.1.tar.gz - R-2.3.0.tar.gz - R-2.3.1.tar.gz - R-2.4.0.tar.gz -R-2.11.1.tar.gz -/R-2.12.0.tar.gz -/R-2.12.1.tar.gz -/R-2.12.2.tar.gz -/R-2.13.0.tar.gz -/R-2.13.1.tar.gz -/R-2.13.2.tar.gz -/R-2.14.0.tar.gz -/R-2.14.1.tar.gz -/R-2.15.0.tar.gz -/R-2.15.1.tar.gz -/R-2.15.2.tar.gz -/R-3.0.0.tar.gz -/R-3.0.1.tar.gz -/R-3.0.2.tar.gz -/R-3.0.3.tar.gz -/R-3.1.1.tar.gz -/R-3.1.2.tar.gz -/R-3.1.3.tar.gz -/R-3.2.0.tar.gz -/R-3.2.1.tar.gz + /R-3.2.2.tar.gz commit dad250ea821a26bb892caf9fa02364d3e99aff6d Merge: 6fde1a0 033bdfd Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Aug 14 15:22:16 2015 -0400 Merge branch 'master' into el6 commit 6fde1a0dcd27738ccd0c3f4c9a350141e4732213 Merge: e1b39d0 8e0735c Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jul 10 12:13:10 2015 -0400 Merge branch 'master' into el6 commit f4e5cfe2948b2e9c2537dd1953b6aac1c13b69b0 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jul 10 12:12:24 2015 -0400 remove leading spaces diff --git a/R.spec b/R.spec index 3ad6a51..183859d 100644 --- a/R.spec +++ b/R.spec @@ -68,10 +68,10 @@ BuildRequires: pcre-devel, zlib-devel %if 0%{?rhel} # RHEL older than 6 %if 0%{?rhel} < 6 - BuildRequires: curl-devel +BuildRequires: curl-devel # RHEL newer than 6 %else - BuildRequires: libcurl-devel +BuildRequires: libcurl-devel %endif # Fedora (assuming modern) %else commit cae79115003d9514c3381a237c524133aea7ec44 Merge: 024eb04 5b8ce89 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jul 10 12:11:21 2015 -0400 Merge branch 'master' into el5 commit 024eb041c4835ba49119f3528c4b4a870b8e4615 Merge: 7a08bc0 d0500bb Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jun 18 13:32:59 2015 -0400 merge commit e1b39d0e4a2a1f0752e1376e38289ee1255c9e18 Merge: d088728 d0500bb Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jun 18 13:32:12 2015 -0400 merge commit d0887285da86323f9dc2c7c98ede44109c901751 Merge: ee29b1a 262bff4 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jun 18 13:28:07 2015 -0400 merge fix commit ee29b1a75e431eb6777be7b2c05fd13428662657 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Apr 30 15:32:17 2015 -0400 conditionalize texi2any for systems that do not have it diff --git a/R.spec b/R.spec index f5f723a..850ad65 100644 --- a/R.spec +++ b/R.spec @@ -36,11 +36,22 @@ %global modern 1 %endif +# default to 0. +%global texi2any 0 + +%if 0%{?fedora} >= 20 +%global texi2any 1 +%endif + +%if 0%{?rhel} >= 7 +%global texi2any 1 +%endif + %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?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-3/R-%{version}.tar.gz @@ -396,6 +407,11 @@ export FCFLAGS="%{optflags}" --enable-lto \ %endif %endif +%if %{texi2any} + MAKEINFO=texi2any \ +%else + MAKEINFO=makeinfo \ +%endif rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ @@ -413,7 +429,11 @@ cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi %endif -make info +%if %{texi2any} + make MAKEINFO=texi2any info +%else + make MAKEINFO=makeinfo info +%endif # Convert to UTF-8 for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do @@ -919,6 +939,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Apr 30 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.2.0-2 +- conditionalize MAKEINFO for ancient things (rhel 6 or older) + * Sun Apr 26 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.2.0-1 - update to 3.2.0 commit 7a08bc08da0edad2b9a88d508a7d54bfcfdc7da7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Apr 30 15:09:07 2015 -0400 conditionalize texi2any for systems that do not have it diff --git a/R.spec b/R.spec index e0e4848..850ad65 100644 --- a/R.spec +++ b/R.spec @@ -429,7 +429,11 @@ cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi %endif -make info +%if %{texi2any} + make MAKEINFO=texi2any info +%else + make MAKEINFO=makeinfo info +%endif # Convert to UTF-8 for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do commit dcabdd3746de6ae79b3aef8e94337d85ea9fa9cc Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Apr 30 14:45:31 2015 -0400 conditionalize texi2any for systems that do not have it diff --git a/R.spec b/R.spec index f5f723a..e0e4848 100644 --- a/R.spec +++ b/R.spec @@ -36,11 +36,22 @@ %global modern 1 %endif +# default to 0. +%global texi2any 0 + +%if 0%{?fedora} >= 20 +%global texi2any 1 +%endif + +%if 0%{?rhel} >= 7 +%global texi2any 1 +%endif + %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?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-3/R-%{version}.tar.gz @@ -396,6 +407,11 @@ export FCFLAGS="%{optflags}" --enable-lto \ %endif %endif +%if %{texi2any} + MAKEINFO=texi2any \ +%else + MAKEINFO=makeinfo \ +%endif rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ @@ -919,6 +935,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Apr 30 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.2.0-2 +- conditionalize MAKEINFO for ancient things (rhel 6 or older) + * Sun Apr 26 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.2.0-1 - update to 3.2.0 commit 0f2409b1c22a281de9ae483aba6655d126064f53 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Apr 30 13:48:53 2015 -0400 3.2.0 diff --git a/R.spec b/R.spec index 8f3a543..f5f723a 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.3 +Version: 3.2.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -53,7 +53,7 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: pcre-devel, zlib-devel +BuildRequires: pcre-devel, zlib-devel, valgrind-devel %if %{with_java_headless} BuildRequires: java-headless %else @@ -129,22 +129,22 @@ Requires: perl, sed, gawk, tex(latex), less, make, unzip # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.15 +Provides: R-boot = 1.3.16 Provides: R-class = 7.3.12 Provides: R-cluster = 2.0.1 -Provides: R-codetools = 0.2.10 +Provides: R-codetools = 0.2.11 Provides: R-datasets = %{version} Provides: R-foreign = 0.8.63 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.14 -Provides: R-lattice = 0.20.30 -Provides: R-MASS = 7.3.39 -Provides: R-Matrix = 1.1.5 +Provides: R-lattice = 0.20.31 +Provides: R-MASS = 7.3.40 +Provides: R-Matrix = 1.2.0 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.4 +Provides: R-mgcv = 1.8.6 Provides: R-nlme = 3.1.120 Provides: R-nnet = 7.3.9 Provides: R-parallel = %{version} @@ -205,7 +205,7 @@ Requires: tex(cm-super-ts1.enc) Requires: qpdf %endif -Provides: R-Matrix-devel = 1.1.5 +Provides: R-Matrix-devel = 1.2.0 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -382,6 +382,7 @@ export FCFLAGS="%{optflags}" --with-system-tre \ %endif --with-system-zlib --with-system-bzlib --with-system-pcre \ + --with-system-valgrind-headers \ %if 0%{?fedora} --with-lapack \ --with-blas \ @@ -683,10 +684,12 @@ make check %{_libdir}/R/library/Matrix/libs/ %{_libdir}/R/library/Matrix/Meta/ %{_libdir}/R/library/Matrix/NAMESPACE +%{_libdir}/R/library/Matrix/NEWS.Rd %dir %{_libdir}/R/library/Matrix/po/ %lang(de) %{_libdir}/R/library/Matrix/po/de/ %lang(en) %{_libdir}/R/library/Matrix/po/en*/ %lang(fr) %{_libdir}/R/library/Matrix/po/fr/ +%lang(ko) %{_libdir}/R/library/Matrix/po/ko/ %lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R @@ -916,6 +919,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Sun Apr 26 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.2.0-1 +- update to 3.2.0 + * Mon Mar 9 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.1.3-1 - update to 3.1.3 diff --git a/sources b/sources index c8a05d4..4273a1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53a85b884925aa6b5811dfc361d73fc4 R-3.1.3.tar.gz +66fa17ad457d7e618191aa0f52fc402e R-3.2.0.tar.gz commit f6c4d07690c1a0e68ab762b05551428de44113e6 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Apr 30 13:48:28 2015 -0400 3.2.0 diff --git a/R.spec b/R.spec index 8f3a543..f5f723a 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.3 +Version: 3.2.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -53,7 +53,7 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: pcre-devel, zlib-devel +BuildRequires: pcre-devel, zlib-devel, valgrind-devel %if %{with_java_headless} BuildRequires: java-headless %else @@ -129,22 +129,22 @@ Requires: perl, sed, gawk, tex(latex), less, make, unzip # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.15 +Provides: R-boot = 1.3.16 Provides: R-class = 7.3.12 Provides: R-cluster = 2.0.1 -Provides: R-codetools = 0.2.10 +Provides: R-codetools = 0.2.11 Provides: R-datasets = %{version} Provides: R-foreign = 0.8.63 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.14 -Provides: R-lattice = 0.20.30 -Provides: R-MASS = 7.3.39 -Provides: R-Matrix = 1.1.5 +Provides: R-lattice = 0.20.31 +Provides: R-MASS = 7.3.40 +Provides: R-Matrix = 1.2.0 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.4 +Provides: R-mgcv = 1.8.6 Provides: R-nlme = 3.1.120 Provides: R-nnet = 7.3.9 Provides: R-parallel = %{version} @@ -205,7 +205,7 @@ Requires: tex(cm-super-ts1.enc) Requires: qpdf %endif -Provides: R-Matrix-devel = 1.1.5 +Provides: R-Matrix-devel = 1.2.0 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -382,6 +382,7 @@ export FCFLAGS="%{optflags}" --with-system-tre \ %endif --with-system-zlib --with-system-bzlib --with-system-pcre \ + --with-system-valgrind-headers \ %if 0%{?fedora} --with-lapack \ --with-blas \ @@ -683,10 +684,12 @@ make check %{_libdir}/R/library/Matrix/libs/ %{_libdir}/R/library/Matrix/Meta/ %{_libdir}/R/library/Matrix/NAMESPACE +%{_libdir}/R/library/Matrix/NEWS.Rd %dir %{_libdir}/R/library/Matrix/po/ %lang(de) %{_libdir}/R/library/Matrix/po/de/ %lang(en) %{_libdir}/R/library/Matrix/po/en*/ %lang(fr) %{_libdir}/R/library/Matrix/po/fr/ +%lang(ko) %{_libdir}/R/library/Matrix/po/ko/ %lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R @@ -916,6 +919,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Sun Apr 26 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.2.0-1 +- update to 3.2.0 + * Mon Mar 9 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.1.3-1 - update to 3.1.3 diff --git a/sources b/sources index c8a05d4..4273a1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53a85b884925aa6b5811dfc361d73fc4 R-3.1.3.tar.gz +66fa17ad457d7e618191aa0f52fc402e R-3.2.0.tar.gz commit 9db92e9942c5164d7e11c1e8966fa1a428d58ca4 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Mar 9 17:33:33 2015 -0400 3.1.3 diff --git a/R.spec b/R.spec index 98a386d..8f3a543 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -129,31 +129,31 @@ Requires: perl, sed, gawk, tex(latex), less, make, unzip # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.13 -Provides: R-class = 7.3.11 -Provides: R-cluster = 1.15.3 -Provides: R-codetools = 0.2.9 +Provides: R-boot = 1.3.15 +Provides: R-class = 7.3.12 +Provides: R-cluster = 2.0.1 +Provides: R-codetools = 0.2.10 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.61 +Provides: R-foreign = 0.8.63 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.13 -Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.35 -Provides: R-Matrix = 1.1.4 +Provides: R-KernSmooth = 2.23.14 +Provides: R-lattice = 0.20.30 +Provides: R-MASS = 7.3.39 +Provides: R-Matrix = 1.1.5 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.3 -Provides: R-nlme = 3.1.118 -Provides: R-nnet = 7.3.8 +Provides: R-mgcv = 1.8.4 +Provides: R-nlme = 3.1.120 +Provides: R-nnet = 7.3.9 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.8 -Provides: R-spatial = 7.3.8 +Provides: R-rpart = 4.1.9 +Provides: R-spatial = 7.3.9 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.37.7 +Provides: R-survival = 2.38.1 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -199,7 +199,13 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.1.4 +# "qpdf is needed for checks on size reduction of PDFs" +# qpdf is not in epel, and since 99% of R doesn't use it, we'll let it slide. +%if 0%{?fedora} +Requires: qpdf +%endif + +Provides: R-Matrix-devel = 1.1.5 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -765,6 +771,7 @@ make check %lang(de) %{_libdir}/R/library/spatial/po/de/ %lang(en) %{_libdir}/R/library/spatial/po/en*/ %lang(fr) %{_libdir}/R/library/spatial/po/fr/ +%lang(ko) %{_libdir}/R/library/spatial/po/ko/ %lang(pl) %{_libdir}/R/library/spatial/po/pl/ %{_libdir}/R/library/spatial/ppdata/ %{_libdir}/R/library/spatial/PP.files @@ -909,6 +916,12 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Mar 9 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.1.3-1 +- update to 3.1.3 + +* Mon Jan 26 2015 David Tardon <dtardon(a)redhat.com> - 3.1.2-2 +- rebuild for ICU 54.1 + * Fri Oct 31 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.2-1 - update to 3.1.2 diff --git a/sources b/sources index 4b263e9..c8a05d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3af29ec06704cbd08d4ba8d69250ae74 R-3.1.2.tar.gz +53a85b884925aa6b5811dfc361d73fc4 R-3.1.3.tar.gz commit a21c791561dc270035a41309f4d5862c2fca8ff1 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Mar 9 17:33:21 2015 -0400 3.1.3 diff --git a/R.spec b/R.spec index 98a386d..8f3a543 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -129,31 +129,31 @@ Requires: perl, sed, gawk, tex(latex), less, make, unzip # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.13 -Provides: R-class = 7.3.11 -Provides: R-cluster = 1.15.3 -Provides: R-codetools = 0.2.9 +Provides: R-boot = 1.3.15 +Provides: R-class = 7.3.12 +Provides: R-cluster = 2.0.1 +Provides: R-codetools = 0.2.10 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.61 +Provides: R-foreign = 0.8.63 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.13 -Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.35 -Provides: R-Matrix = 1.1.4 +Provides: R-KernSmooth = 2.23.14 +Provides: R-lattice = 0.20.30 +Provides: R-MASS = 7.3.39 +Provides: R-Matrix = 1.1.5 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.3 -Provides: R-nlme = 3.1.118 -Provides: R-nnet = 7.3.8 +Provides: R-mgcv = 1.8.4 +Provides: R-nlme = 3.1.120 +Provides: R-nnet = 7.3.9 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.8 -Provides: R-spatial = 7.3.8 +Provides: R-rpart = 4.1.9 +Provides: R-spatial = 7.3.9 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.37.7 +Provides: R-survival = 2.38.1 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -199,7 +199,13 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.1.4 +# "qpdf is needed for checks on size reduction of PDFs" +# qpdf is not in epel, and since 99% of R doesn't use it, we'll let it slide. +%if 0%{?fedora} +Requires: qpdf +%endif + +Provides: R-Matrix-devel = 1.1.5 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -765,6 +771,7 @@ make check %lang(de) %{_libdir}/R/library/spatial/po/de/ %lang(en) %{_libdir}/R/library/spatial/po/en*/ %lang(fr) %{_libdir}/R/library/spatial/po/fr/ +%lang(ko) %{_libdir}/R/library/spatial/po/ko/ %lang(pl) %{_libdir}/R/library/spatial/po/pl/ %{_libdir}/R/library/spatial/ppdata/ %{_libdir}/R/library/spatial/PP.files @@ -909,6 +916,12 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Mar 9 2015 Tom Callaway <spot(a)fedoraproject.org> - 3.1.3-1 +- update to 3.1.3 + +* Mon Jan 26 2015 David Tardon <dtardon(a)redhat.com> - 3.1.2-2 +- rebuild for ICU 54.1 + * Fri Oct 31 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.2-1 - update to 3.1.2 diff --git a/sources b/sources index 4b263e9..c8a05d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3af29ec06704cbd08d4ba8d69250ae74 R-3.1.2.tar.gz +53a85b884925aa6b5811dfc361d73fc4 R-3.1.3.tar.gz commit b898a50cd2b406f268900e5809eca79f67df2be8 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Oct 31 13:10:54 2014 -0400 3.1.2 diff --git a/R.spec b/R.spec index 9232321..98a386d 100644 --- a/R.spec +++ b/R.spec @@ -39,8 +39,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.1 -Release: 7%{?dist} +Version: 3.1.2 +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-3/R-%{version}.tar.gz @@ -129,23 +129,23 @@ Requires: perl, sed, gawk, tex(latex), less, make, unzip # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.11 -Provides: R-class = 7.3.10 -Provides: R-cluster = 1.15.2 -Provides: R-codetools = 0.2.8 +Provides: R-boot = 1.3.13 +Provides: R-class = 7.3.11 +Provides: R-cluster = 1.15.3 +Provides: R-codetools = 0.2.9 Provides: R-datasets = %{version} Provides: R-foreign = 0.8.61 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.12 +Provides: R-KernSmooth = 2.23.13 Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.33 +Provides: R-MASS = 7.3.35 Provides: R-Matrix = 1.1.4 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.0 -Provides: R-nlme = 3.1.117 +Provides: R-mgcv = 1.8.3 +Provides: R-nlme = 3.1.118 Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} Provides: R-rpart = 4.1.8 @@ -490,7 +490,7 @@ make check %dir %{_libdir}/R/ %{_libdir}/R/bin/ %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/javaconf %config(noreplace) %{_libdir}/R/etc/ldpaths @@ -909,6 +909,13 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Oct 31 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.2-1 +- update to 3.1.2 + +* Wed Oct 29 2014 Tom Callaway <spot(a)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(a)cora.nwra.com> - 3.1.1-7 - Just BR/R java instead of java-1.5.0-gcj (bug #1110684) diff --git a/sources b/sources index 8a092c7..4b263e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2598f5bbbedb00e463e0c1385e6fe999 R-3.1.1.tar.gz +3af29ec06704cbd08d4ba8d69250ae74 R-3.1.2.tar.gz commit 434fe794ef81531fb17b3f1a5adbbac30bc3b7a7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Oct 31 13:10:21 2014 -0400 3.1.2 diff --git a/R.spec b/R.spec index 9232321..98a386d 100644 --- a/R.spec +++ b/R.spec @@ -39,8 +39,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.1 -Release: 7%{?dist} +Version: 3.1.2 +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-3/R-%{version}.tar.gz @@ -129,23 +129,23 @@ Requires: perl, sed, gawk, tex(latex), less, make, unzip # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.11 -Provides: R-class = 7.3.10 -Provides: R-cluster = 1.15.2 -Provides: R-codetools = 0.2.8 +Provides: R-boot = 1.3.13 +Provides: R-class = 7.3.11 +Provides: R-cluster = 1.15.3 +Provides: R-codetools = 0.2.9 Provides: R-datasets = %{version} Provides: R-foreign = 0.8.61 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.12 +Provides: R-KernSmooth = 2.23.13 Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.33 +Provides: R-MASS = 7.3.35 Provides: R-Matrix = 1.1.4 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.0 -Provides: R-nlme = 3.1.117 +Provides: R-mgcv = 1.8.3 +Provides: R-nlme = 3.1.118 Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} Provides: R-rpart = 4.1.8 @@ -490,7 +490,7 @@ make check %dir %{_libdir}/R/ %{_libdir}/R/bin/ %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/javaconf %config(noreplace) %{_libdir}/R/etc/ldpaths @@ -909,6 +909,13 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Oct 31 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.2-1 +- update to 3.1.2 + +* Wed Oct 29 2014 Tom Callaway <spot(a)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(a)cora.nwra.com> - 3.1.1-7 - Just BR/R java instead of java-1.5.0-gcj (bug #1110684) diff --git a/sources b/sources index 8a092c7..4b263e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2598f5bbbedb00e463e0c1385e6fe999 R-3.1.1.tar.gz +3af29ec06704cbd08d4ba8d69250ae74 R-3.1.2.tar.gz commit e63e093f7995d94f3926331cbb0870e822cc721b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Oct 9 09:35:57 2014 -0400 fix java Requires diff --git a/R.spec b/R.spec index e0a9e5a..9232321 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 3%{?dist} +Release: 7%{?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-3/R-%{version}.tar.gz @@ -57,11 +57,7 @@ BuildRequires: pcre-devel, zlib-devel %if %{with_java_headless} BuildRequires: java-headless %else -%if %{modern} -BuildRequires: java-1.5.0-gcj -%else -BuildRequires: java-1.4.2-gcj-compat -%endif +BuildRequires: java %endif %if %{system_tre} BuildRequires: tre-devel @@ -237,7 +233,7 @@ Requires(post): R-core = %{version}-%{release} %if %{with_java_headless} Requires(post): java-headless %else -Requires(post): java-1.5.0-gcj +Requires(post): java %endif %description java @@ -477,6 +473,8 @@ ln -s ../../../R/texmf/tex/latex R popd %check +# Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test. +ulimit -s 16384 make check %files @@ -911,6 +909,18 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Sep 29 2014 Orion Poplawski <orion(a)cora.nwra.com> - 3.1.1-7 +- Just BR/R java instead of java-1.5.0-gcj (bug #1110684) + +* Tue Sep 16 2014 David Sommerseth <davids(a)redhat.com> - 3.1.1-6 +- Setting ulimit when running make check, to avoid segfault due to too small stack (needed on PPC64) + +* Tue Aug 26 2014 David Tardon <dtardon(a)redhat.com> - 3.1.1-5 +- rebuild for ICU 53.1 + +* Fri Aug 15 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 8 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-3 - add "unzip" to Requirements list for R-core commit 1d62580313245ea68845757d204962fcde5327b0 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Oct 9 09:35:26 2014 -0400 fix java Requires diff --git a/R.spec b/R.spec index e0a9e5a..9232321 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 3%{?dist} +Release: 7%{?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-3/R-%{version}.tar.gz @@ -57,11 +57,7 @@ BuildRequires: pcre-devel, zlib-devel %if %{with_java_headless} BuildRequires: java-headless %else -%if %{modern} -BuildRequires: java-1.5.0-gcj -%else -BuildRequires: java-1.4.2-gcj-compat -%endif +BuildRequires: java %endif %if %{system_tre} BuildRequires: tre-devel @@ -237,7 +233,7 @@ Requires(post): R-core = %{version}-%{release} %if %{with_java_headless} Requires(post): java-headless %else -Requires(post): java-1.5.0-gcj +Requires(post): java %endif %description java @@ -477,6 +473,8 @@ ln -s ../../../R/texmf/tex/latex R popd %check +# Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test. +ulimit -s 16384 make check %files @@ -911,6 +909,18 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Sep 29 2014 Orion Poplawski <orion(a)cora.nwra.com> - 3.1.1-7 +- Just BR/R java instead of java-1.5.0-gcj (bug #1110684) + +* Tue Sep 16 2014 David Sommerseth <davids(a)redhat.com> - 3.1.1-6 +- Setting ulimit when running make check, to avoid segfault due to too small stack (needed on PPC64) + +* Tue Aug 26 2014 David Tardon <dtardon(a)redhat.com> - 3.1.1-5 +- rebuild for ICU 53.1 + +* Fri Aug 15 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 8 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-3 - add "unzip" to Requirements list for R-core commit 1b56f41a526cc9f49ae239586427e1f59dd1da39 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Aug 8 14:49:09 2014 +0200 add Requires: unzip to R-core diff --git a/R.spec b/R.spec index 2ce590b..e0a9e5a 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 2%{?dist} +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-3/R-%{version}.tar.gz @@ -127,7 +127,7 @@ Requires: tex(dvips), vi %else Requires: vim-minimal %endif -Requires: perl, sed, gawk, tex(latex), less, make +Requires: perl, sed, gawk, tex(latex), less, make, unzip # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -911,6 +911,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Aug 8 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-3 +- add "unzip" to Requirements list for R-core + * Fri Aug 8 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-2 - add "make" to Requirements list for R-core (thanks R config) commit e67a387969dcd23c74f3c125dd1dbc5cb9291bf6 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Aug 8 14:48:46 2014 +0200 add Requires: unzip to R-core diff --git a/R.spec b/R.spec index 2ce590b..e0a9e5a 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 2%{?dist} +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-3/R-%{version}.tar.gz @@ -127,7 +127,7 @@ Requires: tex(dvips), vi %else Requires: vim-minimal %endif -Requires: perl, sed, gawk, tex(latex), less, make +Requires: perl, sed, gawk, tex(latex), less, make, unzip # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -911,6 +911,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Aug 8 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-3 +- add "unzip" to Requirements list for R-core + * Fri Aug 8 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-2 - add "make" to Requirements list for R-core (thanks R config) commit 89d98760d9090db1241badde9f72c5d5bbf31f8a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Aug 8 13:15:43 2014 +0200 add Requires: make to R-core diff --git a/R.spec b/R.spec index 1c67dbc..2ce590b 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?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-3/R-%{version}.tar.gz @@ -127,7 +127,7 @@ Requires: tex(dvips), vi %else Requires: vim-minimal %endif -Requires: perl, sed, gawk, tex(latex), less +Requires: perl, sed, gawk, tex(latex), less, make # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -911,6 +911,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Aug 8 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-2 +- add "make" to Requirements list for R-core (thanks R config) + * Thu Jul 10 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-1 - update to 3.1.1 commit cde20102a3956bfa13a067f1794815b50b154289 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Aug 8 12:26:05 2014 +0200 add Requires: make to R-core diff --git a/R.spec b/R.spec index 1c67dbc..2ce590b 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?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-3/R-%{version}.tar.gz @@ -127,7 +127,7 @@ Requires: tex(dvips), vi %else Requires: vim-minimal %endif -Requires: perl, sed, gawk, tex(latex), less +Requires: perl, sed, gawk, tex(latex), less, make # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -911,6 +911,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Aug 8 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-2 +- add "make" to Requirements list for R-core (thanks R config) + * Thu Jul 10 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-1 - update to 3.1.1 commit 84e3cbc65e9df44cb18d4282af0ac47303cf18bf Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jul 16 13:03:40 2014 -0400 3.1.1 diff --git a/R.spec b/R.spec index ffcbcb7..1c67dbc 100644 --- a/R.spec +++ b/R.spec @@ -17,13 +17,14 @@ %global with_java_headless 1 %endif -%if 0%{?fedora} >= 19 -%global with_lto 1 -%endif +# Using lto breaks debuginfo. +# %%if 0%{?fedora} >= 19 +# %%global with_lto 1 +# %%endif %if 0%{?rhel} >= 7 %global system_tre 1 -%global with_lto 1 +# %%global with_lto 1 %global with_java_headless 1 %endif @@ -38,8 +39,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.0 -Release: 5%{?dist} +Version: 3.1.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-3/R-%{version}.tar.gz @@ -52,7 +53,7 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel +BuildRequires: pcre-devel, zlib-devel %if %{with_java_headless} BuildRequires: java-headless %else @@ -66,7 +67,20 @@ BuildRequires: java-1.4.2-gcj-compat BuildRequires: tre-devel BuildRequires: autoconf, automake, libtool %endif + +%if 0%{?fedora} >= 21 +BuildRequires: lapack-devel >= 3.5.0-7 +BuildRequires: blas-devel >= 3.5.0-7 +%else +%if 0%{?fedora} >= 19 +BuildRequires: lapack-devel >= 3.4.2-7 +BuildRequires: blas-devel >= 3.4.2-7 +%else BuildRequires: lapack-devel +BuildRequires: blas-devel >= 3.0 +%endif +%endif + BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel BuildRequires: gcc-objc, pango-devel, xz-devel @@ -130,11 +144,11 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.12 Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.31 -Provides: R-Matrix = 1.1.3 +Provides: R-MASS = 7.3.33 +Provides: R-Matrix = 1.1.4 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.29 +Provides: R-mgcv = 1.8.0 Provides: R-nlme = 3.1.117 Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} @@ -189,7 +203,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.1.3 +Provides: R-Matrix-devel = 1.1.4 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -320,7 +334,7 @@ case "%{_target_cpu}" in export F77="gfortran -m64" export FC="gfortran -m64" ;; - ia64|alpha|arm*|sh*) + ia64|alpha|arm*|aarch64|sh*) export CC="gcc" export CXX="g++" export F77="gfortran" @@ -341,21 +355,35 @@ case "%{_target_cpu}" in esac %if 0%{?fedora} >= 21 +%if %{with_lto} # With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code # ... and doesn't work at all as a result. export CFLAGS="%{optflags} -ffat-lto-objects" export CXXFLAGS="%{optflags} -ffat-lto-objects" export FCFLAGS="%{optflags} -ffat-lto-objects" +%endif %else export FCFLAGS="%{optflags}" %endif +# RHEL 5 & 6 & 7 have a broken BLAS, so we need to use the bundled bits in R until +# they are fixed... and it doesn't look like it will ever be fixed in RHEL 5. +# https://bugzilla.redhat.com/show_bug.cgi?id=1117491 +# https://bugzilla.redhat.com/show_bug.cgi?id=1117496 +# https://bugzilla.redhat.com/show_bug.cgi?id=1117497 +# +# Also, --enable-BLAS-shlib would be nice to enable +# as a shim to the system blas but it unfortunately +# enables the bundled Rlapack (not a shim to the system lapack). + ( %configure \ %if %{system_tre} --with-system-tre \ %endif --with-system-zlib --with-system-bzlib --with-system-pcre \ +%if 0%{?fedora} --with-lapack \ --with-blas \ +%endif --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ @@ -448,6 +476,9 @@ pushd $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex ln -s ../../../R/texmf/tex/latex R popd +%check +make check + %files # Metapackage @@ -460,7 +491,12 @@ popd # Have to break this out for the translations %dir %{_libdir}/R/ %{_libdir}/R/bin/ -%{_libdir}/R/etc/ +%dir %{_libdir}/R/etc +%config(noreplace) %{_libdir}/R/etc/Makeconf +%config(noreplace) %{_libdir}/R/etc/Renviron +%config(noreplace) %{_libdir}/R/etc/javaconf +%config(noreplace) %{_libdir}/R/etc/ldpaths +%config(noreplace) %{_libdir}/R/etc/repositories %{_libdir}/R/lib/ %dir %{_libdir}/R/library/ %dir %{_libdir}/R/library/translations/ @@ -875,6 +911,29 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Jul 10 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-1 +- update to 3.1.1 + +* Mon Jul 7 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-10 +- disable lto everywhere (breaks debuginfo) (bz 1113404) +- apply fix for ppc64 (bz 1114240 and upstream bug 15856) +- add make check (bz 1059461) +- use bundled blas/lapack for RHEL due to bugs in their BLAS +- enable Rblas shared lib (whether using bundled BLAS or not) +- add explicit requires for new lapack + +* Tue Jun 24 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-9 +- mark files in %%{_libdir}/R/etc as config(noreplace), resolves 1098663 + +* Fri Jun 06 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Jaroslav karvada <jskarvad(a)redhat.com> - 3.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + +* Thu May 15 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.1.0-6 +- Add aarch64 to target CPU specs + * Wed May 7 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-5 - add blas-devel and lapack-devel as Requires for R-devel/R-core-devel to ease rebuild pain diff --git a/sources b/sources index 9849710..8a092c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1ee52446bee81820409661e6d114ab1 R-3.1.0.tar.gz +2598f5bbbedb00e463e0c1385e6fe999 R-3.1.1.tar.gz commit e6dbcb894adfd6c8a7befebccf6435ee1947673f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jul 16 13:03:10 2014 -0400 3.1.1 diff --git a/R.spec b/R.spec index ffcbcb7..1c67dbc 100644 --- a/R.spec +++ b/R.spec @@ -17,13 +17,14 @@ %global with_java_headless 1 %endif -%if 0%{?fedora} >= 19 -%global with_lto 1 -%endif +# Using lto breaks debuginfo. +# %%if 0%{?fedora} >= 19 +# %%global with_lto 1 +# %%endif %if 0%{?rhel} >= 7 %global system_tre 1 -%global with_lto 1 +# %%global with_lto 1 %global with_java_headless 1 %endif @@ -38,8 +39,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.0 -Release: 5%{?dist} +Version: 3.1.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-3/R-%{version}.tar.gz @@ -52,7 +53,7 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel +BuildRequires: pcre-devel, zlib-devel %if %{with_java_headless} BuildRequires: java-headless %else @@ -66,7 +67,20 @@ BuildRequires: java-1.4.2-gcj-compat BuildRequires: tre-devel BuildRequires: autoconf, automake, libtool %endif + +%if 0%{?fedora} >= 21 +BuildRequires: lapack-devel >= 3.5.0-7 +BuildRequires: blas-devel >= 3.5.0-7 +%else +%if 0%{?fedora} >= 19 +BuildRequires: lapack-devel >= 3.4.2-7 +BuildRequires: blas-devel >= 3.4.2-7 +%else BuildRequires: lapack-devel +BuildRequires: blas-devel >= 3.0 +%endif +%endif + BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel BuildRequires: gcc-objc, pango-devel, xz-devel @@ -130,11 +144,11 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.12 Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.31 -Provides: R-Matrix = 1.1.3 +Provides: R-MASS = 7.3.33 +Provides: R-Matrix = 1.1.4 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.29 +Provides: R-mgcv = 1.8.0 Provides: R-nlme = 3.1.117 Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} @@ -189,7 +203,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.1.3 +Provides: R-Matrix-devel = 1.1.4 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -320,7 +334,7 @@ case "%{_target_cpu}" in export F77="gfortran -m64" export FC="gfortran -m64" ;; - ia64|alpha|arm*|sh*) + ia64|alpha|arm*|aarch64|sh*) export CC="gcc" export CXX="g++" export F77="gfortran" @@ -341,21 +355,35 @@ case "%{_target_cpu}" in esac %if 0%{?fedora} >= 21 +%if %{with_lto} # With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code # ... and doesn't work at all as a result. export CFLAGS="%{optflags} -ffat-lto-objects" export CXXFLAGS="%{optflags} -ffat-lto-objects" export FCFLAGS="%{optflags} -ffat-lto-objects" +%endif %else export FCFLAGS="%{optflags}" %endif +# RHEL 5 & 6 & 7 have a broken BLAS, so we need to use the bundled bits in R until +# they are fixed... and it doesn't look like it will ever be fixed in RHEL 5. +# https://bugzilla.redhat.com/show_bug.cgi?id=1117491 +# https://bugzilla.redhat.com/show_bug.cgi?id=1117496 +# https://bugzilla.redhat.com/show_bug.cgi?id=1117497 +# +# Also, --enable-BLAS-shlib would be nice to enable +# as a shim to the system blas but it unfortunately +# enables the bundled Rlapack (not a shim to the system lapack). + ( %configure \ %if %{system_tre} --with-system-tre \ %endif --with-system-zlib --with-system-bzlib --with-system-pcre \ +%if 0%{?fedora} --with-lapack \ --with-blas \ +%endif --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ @@ -448,6 +476,9 @@ pushd $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex ln -s ../../../R/texmf/tex/latex R popd +%check +make check + %files # Metapackage @@ -460,7 +491,12 @@ popd # Have to break this out for the translations %dir %{_libdir}/R/ %{_libdir}/R/bin/ -%{_libdir}/R/etc/ +%dir %{_libdir}/R/etc +%config(noreplace) %{_libdir}/R/etc/Makeconf +%config(noreplace) %{_libdir}/R/etc/Renviron +%config(noreplace) %{_libdir}/R/etc/javaconf +%config(noreplace) %{_libdir}/R/etc/ldpaths +%config(noreplace) %{_libdir}/R/etc/repositories %{_libdir}/R/lib/ %dir %{_libdir}/R/library/ %dir %{_libdir}/R/library/translations/ @@ -875,6 +911,29 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Jul 10 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.1-1 +- update to 3.1.1 + +* Mon Jul 7 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-10 +- disable lto everywhere (breaks debuginfo) (bz 1113404) +- apply fix for ppc64 (bz 1114240 and upstream bug 15856) +- add make check (bz 1059461) +- use bundled blas/lapack for RHEL due to bugs in their BLAS +- enable Rblas shared lib (whether using bundled BLAS or not) +- add explicit requires for new lapack + +* Tue Jun 24 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-9 +- mark files in %%{_libdir}/R/etc as config(noreplace), resolves 1098663 + +* Fri Jun 06 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Jaroslav karvada <jskarvad(a)redhat.com> - 3.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + +* Thu May 15 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.1.0-6 +- Add aarch64 to target CPU specs + * Wed May 7 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-5 - add blas-devel and lapack-devel as Requires for R-devel/R-core-devel to ease rebuild pain diff --git a/sources b/sources index 9849710..8a092c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1ee52446bee81820409661e6d114ab1 R-3.1.0.tar.gz +2598f5bbbedb00e463e0c1385e6fe999 R-3.1.1.tar.gz commit 051696abff0b8c1d799132b110ca17574ac61d07 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed May 7 13:23:43 2014 -0400 add blas-devel && lapack-devel to R-core-devel and R-devel requires diff --git a/R.spec b/R.spec index 4840407..ffcbcb7 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ Name: R Version: 3.1.0 -Release: 4%{?dist} +Release: 5%{?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-3/R-%{version}.tar.gz @@ -170,6 +170,7 @@ Requires: R-core = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig, xz-devel +Requires: blas-devel >= 3.0, lapack-devel %if %{modern} Requires: libicu-devel %endif @@ -367,7 +368,8 @@ export FCFLAGS="%{optflags}" rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ - | grep -A30 'R is now' - > CAPABILITIES + > CONFIGURE.log +cat CONFIGURE.log | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -873,6 +875,10 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed May 7 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-5 +- add blas-devel and lapack-devel as Requires for R-devel/R-core-devel + to ease rebuild pain + * Tue Apr 29 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-4 - unified spec file for all targets commit 58d7c5a2b576af5b4e225ac0524f49d50c9ff53a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed May 7 13:23:19 2014 -0400 add blas-devel && lapack-devel to R-core-devel and R-devel requires diff --git a/R.spec b/R.spec index 4840407..ffcbcb7 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ Name: R Version: 3.1.0 -Release: 4%{?dist} +Release: 5%{?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-3/R-%{version}.tar.gz @@ -170,6 +170,7 @@ Requires: R-core = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig, xz-devel +Requires: blas-devel >= 3.0, lapack-devel %if %{modern} Requires: libicu-devel %endif @@ -367,7 +368,8 @@ export FCFLAGS="%{optflags}" rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ - | grep -A30 'R is now' - > CAPABILITIES + > CONFIGURE.log +cat CONFIGURE.log | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -873,6 +875,10 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed May 7 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-5 +- add blas-devel and lapack-devel as Requires for R-devel/R-core-devel + to ease rebuild pain + * Tue Apr 29 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-4 - unified spec file for all targets commit 48f1a8bef95354c1fb30ee4192343c54f4a11831 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 21:30:21 2014 -0400 unified spec diff --git a/R.spec b/R.spec index c44a321..4840407 100644 --- a/R.spec +++ b/R.spec @@ -873,6 +873,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Apr 29 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-4 +- unified spec file for all targets + * Tue Apr 29 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-3 - epel fixes commit dd1131e2ba8521dfb91dd1eb23477478b15d3c70 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 21:30:02 2014 -0400 unified spec diff --git a/R.spec b/R.spec index c44a321..4840407 100644 --- a/R.spec +++ b/R.spec @@ -873,6 +873,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Apr 29 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-4 +- unified spec file for all targets + * Tue Apr 29 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-3 - epel fixes commit 7883fbd6a42a9aa0a14d1722242995de40f1e4ab Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 20:57:04 2014 -0400 should work everywhere now diff --git a/R.spec b/R.spec index 550f15d..c44a321 100644 --- a/R.spec +++ b/R.spec @@ -8,11 +8,13 @@ %global modern 0 %global with_lto 0 +%global with_java_headless 0 %global system_tre 0 # We need to use system tre on F21+/RHEL7 %if 0%{?fedora} >= 21 %global system_tre 1 +%global with_java_headless 1 %endif %if 0%{?fedora} >= 19 @@ -22,6 +24,7 @@ %if 0%{?rhel} >= 7 %global system_tre 1 %global with_lto 1 +%global with_java_headless 1 %endif %if 0%{?fedora} @@ -36,7 +39,7 @@ Name: R Version: 3.1.0 -Release: 3%{?dist} +Release: 4%{?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-3/R-%{version}.tar.gz @@ -50,15 +53,15 @@ BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel -%if %{modern} -%if 0%{?fedora} >= 21 +%if %{with_java_headless} BuildRequires: java-headless %else +%if %{modern} BuildRequires: java-1.5.0-gcj -%endif %else BuildRequires: java-1.4.2-gcj-compat %endif +%endif %if %{system_tre} BuildRequires: tre-devel BuildRequires: autoconf, automake, libtool @@ -216,7 +219,7 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} -%if 0%{?fedora} >= 21 +%if %{with_java_headless} Requires(post): java-headless %else Requires(post): java-1.5.0-gcj @@ -361,7 +364,6 @@ export FCFLAGS="%{optflags}" --enable-lto \ %endif %endif - rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ commit 4feec9d3a78194d6df6270316352484f8a1e2731 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 20:56:30 2014 -0400 should work everywhere now diff --git a/R.spec b/R.spec index b0d1f7e..c44a321 100644 --- a/R.spec +++ b/R.spec @@ -8,11 +8,13 @@ %global modern 0 %global with_lto 0 +%global with_java_headless 0 %global system_tre 0 # We need to use system tre on F21+/RHEL7 %if 0%{?fedora} >= 21 %global system_tre 1 +%global with_java_headless 1 %endif %if 0%{?fedora} >= 19 @@ -22,6 +24,7 @@ %if 0%{?rhel} >= 7 %global system_tre 1 %global with_lto 1 +%global with_java_headless 1 %endif %if 0%{?fedora} @@ -36,7 +39,7 @@ Name: R Version: 3.1.0 -Release: 3%{?dist} +Release: 4%{?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-3/R-%{version}.tar.gz @@ -50,15 +53,15 @@ BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel -%if %{modern} -%if 0%{?fedora} >= 21 +%if %{with_java_headless} BuildRequires: java-headless %else +%if %{modern} BuildRequires: java-1.5.0-gcj -%endif %else BuildRequires: java-1.4.2-gcj-compat %endif +%endif %if %{system_tre} BuildRequires: tre-devel BuildRequires: autoconf, automake, libtool @@ -216,7 +219,7 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} -%if 0%{?fedora} >= 21 +%if %{with_java_headless} Requires(post): java-headless %else Requires(post): java-1.5.0-gcj commit d84fbc68e0f065aec14343d5c8396f0ce2299bfb Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 15:42:21 2014 -0400 FIXES diff --git a/R.spec b/R.spec index 550f15d..b0d1f7e 100644 --- a/R.spec +++ b/R.spec @@ -361,7 +361,6 @@ export FCFLAGS="%{optflags}" --enable-lto \ %endif %endif - rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ commit a880d4def6447bbe30fb6dd795aa02c20157fabf Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 15:01:32 2014 -0400 mk docdir before using diff --git a/R.spec b/R.spec index d91e68a..550f15d 100644 --- a/R.spec +++ b/R.spec @@ -397,6 +397,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old +mkdir -p ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} install -p CAPABILITIES ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} #Install libRmath files commit 42b83eface8cad030dfc85970f8530a4eff5d5b3 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 14:59:55 2014 -0400 mk docdir before using diff --git a/R.spec b/R.spec index d91e68a..550f15d 100644 --- a/R.spec +++ b/R.spec @@ -397,6 +397,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old +mkdir -p ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} install -p CAPABILITIES ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} #Install libRmath files commit c93c432678a15fccbf198d2a759708117955b95e Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 13:57:14 2014 -0400 conditionalize lto diff --git a/R.spec b/R.spec index 1b5652b..d91e68a 100644 --- a/R.spec +++ b/R.spec @@ -7,14 +7,21 @@ # Assume not modern. Override if needed. %global modern 0 +%global with_lto 0 + %global system_tre 0 # We need to use system tre on F21+/RHEL7 %if 0%{?fedora} >= 21 %global system_tre 1 %endif +%if 0%{?fedora} >= 19 +%global with_lto 1 +%endif + %if 0%{?rhel} >= 7 %global system_tre 1 +%global with_lto 1 %endif %if 0%{?fedora} @@ -349,11 +356,12 @@ export FCFLAGS="%{optflags}" --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ -%if %{modern} +%if %{with_lto} %ifnarch %{arm} --enable-lto \ %endif %endif + rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ commit d9a505b01d005e145b8aa4c4d50ce09a0d944bf7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 13:48:05 2014 -0400 conditionalize lto diff --git a/R.spec b/R.spec index 1b5652b..d91e68a 100644 --- a/R.spec +++ b/R.spec @@ -7,14 +7,21 @@ # Assume not modern. Override if needed. %global modern 0 +%global with_lto 0 + %global system_tre 0 # We need to use system tre on F21+/RHEL7 %if 0%{?fedora} >= 21 %global system_tre 1 %endif +%if 0%{?fedora} >= 19 +%global with_lto 1 +%endif + %if 0%{?rhel} >= 7 %global system_tre 1 +%global with_lto 1 %endif %if 0%{?fedora} @@ -349,11 +356,12 @@ export FCFLAGS="%{optflags}" --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ -%if %{modern} +%if %{with_lto} %ifnarch %{arm} --enable-lto \ %endif %endif + rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ commit 42dc4ebbe9992e4478d0f16dfacf5bc016809ad9 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 13:30:55 2014 -0400 conditionalize optflag changes diff --git a/R.spec b/R.spec index 9037f0c..1b5652b 100644 --- a/R.spec +++ b/R.spec @@ -329,11 +329,15 @@ case "%{_target_cpu}" in ;; esac +%if 0%{?fedora} >= 21 # With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code # ... and doesn't work at all as a result. export CFLAGS="%{optflags} -ffat-lto-objects" export CXXFLAGS="%{optflags} -ffat-lto-objects" export FCFLAGS="%{optflags} -ffat-lto-objects" +%else +export FCFLAGS="%{optflags}" +%endif ( %configure \ %if %{system_tre} --with-system-tre \ commit 02172dced2fbdea3aef0061b86b7ad0ae36c073f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 13:29:25 2014 -0400 conditionalize optflag changes diff --git a/R.spec b/R.spec index 9037f0c..1b5652b 100644 --- a/R.spec +++ b/R.spec @@ -329,11 +329,15 @@ case "%{_target_cpu}" in ;; esac +%if 0%{?fedora} >= 21 # With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code # ... and doesn't work at all as a result. export CFLAGS="%{optflags} -ffat-lto-objects" export CXXFLAGS="%{optflags} -ffat-lto-objects" export FCFLAGS="%{optflags} -ffat-lto-objects" +%else +export FCFLAGS="%{optflags}" +%endif ( %configure \ %if %{system_tre} --with-system-tre \ commit b2423e500b82771c7e2849d19f5d02eadaa88b28 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 13:20:09 2014 -0400 epel fixes diff --git a/R.spec b/R.spec index c24eb52..9037f0c 100644 --- a/R.spec +++ b/R.spec @@ -29,7 +29,7 @@ Name: R Version: 3.1.0 -Release: 2%{?dist} +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-3/R-%{version}.tar.gz @@ -44,8 +44,12 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel %if %{modern} +%if 0%{?fedora} >= 21 BuildRequires: java-headless %else +BuildRequires: java-1.5.0-gcj +%endif +%else BuildRequires: java-1.4.2-gcj-compat %endif %if %{system_tre} @@ -205,7 +209,11 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} +%if 0%{?fedora} >= 21 Requires(post): java-headless +%else +Requires(post): java-1.5.0-gcj +%endif %description java A language and environment for statistical computing and graphics. @@ -850,6 +858,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Apr 29 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-3 +- epel fixes + * Fri Apr 25 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-2 - fix core-devel Requires commit b69868db4ed410e04bf7ceade7ab982f97f87e85 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 13:18:06 2014 -0400 epel fixes diff --git a/R.spec b/R.spec index c24eb52..9037f0c 100644 --- a/R.spec +++ b/R.spec @@ -29,7 +29,7 @@ Name: R Version: 3.1.0 -Release: 2%{?dist} +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-3/R-%{version}.tar.gz @@ -44,8 +44,12 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel %if %{modern} +%if 0%{?fedora} >= 21 BuildRequires: java-headless %else +BuildRequires: java-1.5.0-gcj +%endif +%else BuildRequires: java-1.4.2-gcj-compat %endif %if %{system_tre} @@ -205,7 +209,11 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} +%if 0%{?fedora} >= 21 Requires(post): java-headless +%else +Requires(post): java-1.5.0-gcj +%endif %description java A language and environment for statistical computing and graphics. @@ -850,6 +858,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Apr 29 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-3 +- epel fixes + * Fri Apr 25 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-2 - fix core-devel Requires commit 07fac606e4f48b14ec6ce758527091c7a55bbc83 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 10:57:24 2014 -0400 3.1.0 diff --git a/R.spec b/R.spec index a92c255..c24eb52 100644 --- a/R.spec +++ b/R.spec @@ -5,26 +5,36 @@ %endif # Assume not modern. Override if needed. -%global modern 0 +%global modern 0 + +%global system_tre 0 +# We need to use system tre on F21+/RHEL7 +%if 0%{?fedora} >= 21 +%global system_tre 1 +%endif + +%if 0%{?rhel} >= 7 +%global system_tre 1 +%endif %if 0%{?fedora} %global modern 1 %endif %if 0%{?rhel} >= 6 -%global modern 1 +%global modern 1 %endif +%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) + Name: R -Version: 3.0.2 -Release: 1%{?dist} +Version: 3.1.0 +Release: 2%{?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-3/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679180 -Patch0: R-3.0.1-arm-compile-fix.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,12 +42,16 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: blas >= 3.0, pcre-devel, zlib-devel +BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel %if %{modern} -BuildRequires: java-1.5.0-gcj +BuildRequires: java-headless %else BuildRequires: java-1.4.2-gcj-compat %endif +%if %{system_tre} +BuildRequires: tre-devel +BuildRequires: autoconf, automake, libtool +%endif BuildRequires: lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel @@ -48,6 +62,7 @@ BuildRequires: libicu-devel BuildRequires: less %if 0%{?fedora} >= 18 BuildRequires: tex(inconsolata.sty) +BuildRequires: tex(upquote.sty) %endif # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} @@ -90,31 +105,31 @@ Requires: perl, sed, gawk, tex(latex), less # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.9 -Provides: R-class = 7.3.9 -Provides: R-cluster = 1.14.4 +Provides: R-boot = 1.3.11 +Provides: R-class = 7.3.10 +Provides: R-cluster = 1.15.2 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.55 +Provides: R-foreign = 0.8.61 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.10 -Provides: R-lattice = 0.20.23 -Provides: R-MASS = 7.3.29 -Provides: R-Matrix = 1.0.14 +Provides: R-KernSmooth = 2.23.12 +Provides: R-lattice = 0.20.29 +Provides: R-MASS = 7.3.31 +Provides: R-Matrix = 1.1.3 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.26 -Provides: R-nlme = 3.1.111 -Provides: R-nnet = 7.3.7 +Provides: R-mgcv = 1.7.29 +Provides: R-nlme = 3.1.117 +Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.3 -Provides: R-spatial = 7.3.7 +Provides: R-rpart = 4.1.8 +Provides: R-spatial = 7.3.8 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.37.4 +Provides: R-survival = 2.37.7 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -140,7 +155,13 @@ Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel -Requires: tcl-devel, tk-devel, pkgconfig +Requires: tcl-devel, tk-devel, pkgconfig, xz-devel +%if %{modern} +Requires: libicu-devel +%endif +%if %{system_tre} +Requires: tre-devel +%endif # TeX files needed %if 0%{?fedora} >= 18 Requires: tex(ecrm1000.tfm) @@ -153,7 +174,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.0.14 +Provides: R-Matrix-devel = 1.1.3 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -167,10 +188,12 @@ Install R-core-devel if you are going to develop or compile R packages. %endif %package devel -Summary: Full R development environment metapackage -Requires: R-core-devel = %{version}-%{release} +Summary: Full R development environment metapackage +Requires: R-core-devel = %{version}-%{release} %if %{modern} -Requires: R-java-devel = %{version}-%{release} +Requires: R-java-devel = %{version}-%{release} +%else +Group: Development/Libraries %endif %description devel @@ -182,7 +205,7 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} -Requires(post): java +Requires(post): java-headless %description java A language and environment for statistical computing and graphics. @@ -240,7 +263,6 @@ from the R project. This package provides the static libRmath library. %prep %setup -q -%patch0 -p1 -b .armfix # Filter false positive provides. cat <<EOF > %{name}-prov @@ -273,7 +295,7 @@ export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/xdg-open" case "%{_target_cpu}" in - x86_64|mips64|ppc64|powerpc64|sparc64|s390x) + x86_64|mips64|ppc64|powerpc64|sparc64|s390x|powerpc64le|ppc64le) export CC="gcc -m64" export CXX="g++ -m64" export F77="gfortran -m64" @@ -299,14 +321,27 @@ case "%{_target_cpu}" in ;; esac -export FCFLAGS="%{optflags}" +# With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code +# ... and doesn't work at all as a result. +export CFLAGS="%{optflags} -ffat-lto-objects" +export CXXFLAGS="%{optflags} -ffat-lto-objects" +export FCFLAGS="%{optflags} -ffat-lto-objects" ( %configure \ +%if %{system_tre} + --with-system-tre \ +%endif --with-system-zlib --with-system-bzlib --with-system-pcre \ --with-lapack \ + --with-blas \ --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ +%if %{modern} +%ifnarch %{arm} + --enable-lto \ +%endif +%endif rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ @@ -321,7 +356,7 @@ make pdf cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi -sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi +sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi %endif make info @@ -353,17 +388,17 @@ echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library # Install rpm helper macros -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ -install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +mkdir -p $RPM_BUILD_ROOT%{macrosdir}/ +install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{macrosdir}/ # Install rpm helper script mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib -touch -r NEWS ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES -touch -r NEWS doc/manual/*.pdf -touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R +touch -r README ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES +touch -r README doc/manual/*.pdf +touch -r README $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html # We can safely use RHOME here, because all of these are system packages. @@ -424,6 +459,7 @@ popd %{_libdir}/R/library/base/ # boot %dir %{_libdir}/R/library/boot/ +%{_libdir}/R/library/boot/bd.q %{_libdir}/R/library/boot/CITATION %{_libdir}/R/library/boot/data/ %{_libdir}/R/library/boot/DESCRIPTION @@ -473,6 +509,7 @@ popd %dir %{_libdir}/R/library/cluster/po/ %lang(de) %{_libdir}/R/library/cluster/po/de/ %lang(en) %{_libdir}/R/library/cluster/po/en*/ +%lang(fr) %{_libdir}/R/library/cluster/po/fr/ %lang(pl) %{_libdir}/R/library/cluster/po/pl/ # codetools %dir %{_libdir}/R/library/codetools/ @@ -522,6 +559,7 @@ popd %dir %{_libdir}/R/library/KernSmooth/po/ %lang(de) %{_libdir}/R/library/KernSmooth/po/de/ %lang(en) %{_libdir}/R/library/KernSmooth/po/en*/ +%lang(fr) %{_libdir}/R/library/KernSmooth/po/fr/ %lang(ko) %{_libdir}/R/library/KernSmooth/po/ko/ %lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/ %{_libdir}/R/library/KernSmooth/R/ @@ -583,6 +621,7 @@ popd %dir %{_libdir}/R/library/Matrix/po/ %lang(de) %{_libdir}/R/library/Matrix/po/de/ %lang(en) %{_libdir}/R/library/Matrix/po/en*/ +%lang(fr) %{_libdir}/R/library/Matrix/po/fr/ %lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R @@ -687,11 +726,11 @@ popd %{_libdir}/R/library/utils/ %{_libdir}/R/modules %{_libdir}/R/COPYING -%{_libdir}/R/NEWS* +# %{_libdir}/R/NEWS* %{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* -%{_sysconfdir}/rpm/macros.R +%{macrosdir}/macros.R %{_mandir}/man1/* %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} %docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -811,6 +850,39 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Apr 25 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-2 +- fix core-devel Requires + +* Mon Apr 21 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-1 +- update to 3.1.0 + +* Mon Mar 24 2014 Brent Baude <baude(a)us.ibm.com> - 3.0.3-2 +- add ppc64le support +- rhbz #1077819 + +* Thu Mar 20 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.3-1 +- update to 3.0.3 +- switch to java-headless + +* Fri Feb 14 2014 David Tardon <dtardon(a)redhat.com> - 3.0.2-7 +- rebuild for new ICU + +* Sat Feb 8 2014 Ville Skytt <ville.skytta(a)iki.fi> - 3.0.2-6 +- Install macros to %%{_rpmconfigdir}/macros.d where available. +- Fix rpmlint spaces vs tabs warnings. + +* Fri Feb 7 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-5 +- add support for system tre (f21+, rhel 7+) + +* Fri Feb 7 2014 Orion Poplawski <orion(a)cora.nwra.com> - 3.0.2-4 +- Use BR java + +* Fri Jan 24 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-3 +- disable lto on non-modern targets (not just ppc) + +* Fri Dec 20 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-2 +- add --with-blas, --enable-lto to configure + * Tue Oct 15 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-1 - update to 3.0.2 diff --git a/sources b/sources index fc5411c..9849710 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9a8374736e7650e4848f33e2e3bbee3 R-3.0.2.tar.gz +a1ee52446bee81820409661e6d114ab1 R-3.1.0.tar.gz commit fdfbbebb1406b5f98a4e3d32054cf910306c3323 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 10:55:33 2014 -0400 3.1.0 diff --git a/R.spec b/R.spec index 1c9bdf9..c24eb52 100644 --- a/R.spec +++ b/R.spec @@ -5,26 +5,36 @@ %endif # Assume not modern. Override if needed. -%global modern 0 +%global modern 0 + +%global system_tre 0 +# We need to use system tre on F21+/RHEL7 +%if 0%{?fedora} >= 21 +%global system_tre 1 +%endif + +%if 0%{?rhel} >= 7 +%global system_tre 1 +%endif %if 0%{?fedora} %global modern 1 %endif %if 0%{?rhel} >= 6 -%global modern 1 +%global modern 1 %endif +%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) + Name: R -Version: 3.0.2 -Release: 3%{?dist} +Version: 3.1.0 +Release: 2%{?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-3/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679180 -Patch0: R-3.0.1-arm-compile-fix.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +44,14 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel %if %{modern} -BuildRequires: java-1.5.0-gcj +BuildRequires: java-headless %else BuildRequires: java-1.4.2-gcj-compat %endif +%if %{system_tre} +BuildRequires: tre-devel +BuildRequires: autoconf, automake, libtool +%endif BuildRequires: lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel @@ -48,6 +62,7 @@ BuildRequires: libicu-devel BuildRequires: less %if 0%{?fedora} >= 18 BuildRequires: tex(inconsolata.sty) +BuildRequires: tex(upquote.sty) %endif # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} @@ -90,31 +105,31 @@ Requires: perl, sed, gawk, tex(latex), less # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.9 -Provides: R-class = 7.3.9 -Provides: R-cluster = 1.14.4 +Provides: R-boot = 1.3.11 +Provides: R-class = 7.3.10 +Provides: R-cluster = 1.15.2 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.55 +Provides: R-foreign = 0.8.61 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.10 -Provides: R-lattice = 0.20.23 -Provides: R-MASS = 7.3.29 -Provides: R-Matrix = 1.0.14 +Provides: R-KernSmooth = 2.23.12 +Provides: R-lattice = 0.20.29 +Provides: R-MASS = 7.3.31 +Provides: R-Matrix = 1.1.3 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.26 -Provides: R-nlme = 3.1.111 -Provides: R-nnet = 7.3.7 +Provides: R-mgcv = 1.7.29 +Provides: R-nlme = 3.1.117 +Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.3 -Provides: R-spatial = 7.3.7 +Provides: R-rpart = 4.1.8 +Provides: R-spatial = 7.3.8 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.37.4 +Provides: R-survival = 2.37.7 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -140,7 +155,13 @@ Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel -Requires: tcl-devel, tk-devel, pkgconfig +Requires: tcl-devel, tk-devel, pkgconfig, xz-devel +%if %{modern} +Requires: libicu-devel +%endif +%if %{system_tre} +Requires: tre-devel +%endif # TeX files needed %if 0%{?fedora} >= 18 Requires: tex(ecrm1000.tfm) @@ -153,7 +174,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.0.14 +Provides: R-Matrix-devel = 1.1.3 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -167,12 +188,12 @@ Install R-core-devel if you are going to develop or compile R packages. %endif %package devel -Summary: Full R development environment metapackage -Requires: R-core-devel = %{version}-%{release} +Summary: Full R development environment metapackage +Requires: R-core-devel = %{version}-%{release} %if %{modern} -Requires: R-java-devel = %{version}-%{release} +Requires: R-java-devel = %{version}-%{release} %else -Group: Development/Libraries +Group: Development/Libraries %endif %description devel @@ -184,7 +205,7 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} -Requires(post): java +Requires(post): java-headless %description java A language and environment for statistical computing and graphics. @@ -242,7 +263,6 @@ from the R project. This package provides the static libRmath library. %prep %setup -q -%patch0 -p1 -b .armfix # Filter false positive provides. cat <<EOF > %{name}-prov @@ -275,7 +295,7 @@ export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/xdg-open" case "%{_target_cpu}" in - x86_64|mips64|ppc64|powerpc64|sparc64|s390x) + x86_64|mips64|ppc64|powerpc64|sparc64|s390x|powerpc64le|ppc64le) export CC="gcc -m64" export CXX="g++ -m64" export F77="gfortran -m64" @@ -301,8 +321,15 @@ case "%{_target_cpu}" in ;; esac -export FCFLAGS="%{optflags}" +# With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code +# ... and doesn't work at all as a result. +export CFLAGS="%{optflags} -ffat-lto-objects" +export CXXFLAGS="%{optflags} -ffat-lto-objects" +export FCFLAGS="%{optflags} -ffat-lto-objects" ( %configure \ +%if %{system_tre} + --with-system-tre \ +%endif --with-system-zlib --with-system-bzlib --with-system-pcre \ --with-lapack \ --with-blas \ @@ -311,8 +338,10 @@ export FCFLAGS="%{optflags}" --enable-R-shlib \ --enable-prebuilt-html \ %if %{modern} +%ifnarch %{arm} --enable-lto \ %endif +%endif rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ @@ -327,7 +356,7 @@ make pdf cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi -sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi +sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi %endif make info @@ -359,17 +388,17 @@ echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library # Install rpm helper macros -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ -install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +mkdir -p $RPM_BUILD_ROOT%{macrosdir}/ +install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{macrosdir}/ # Install rpm helper script mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib -touch -r NEWS ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES -touch -r NEWS doc/manual/*.pdf -touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R +touch -r README ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES +touch -r README doc/manual/*.pdf +touch -r README $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html # We can safely use RHOME here, because all of these are system packages. @@ -430,6 +459,7 @@ popd %{_libdir}/R/library/base/ # boot %dir %{_libdir}/R/library/boot/ +%{_libdir}/R/library/boot/bd.q %{_libdir}/R/library/boot/CITATION %{_libdir}/R/library/boot/data/ %{_libdir}/R/library/boot/DESCRIPTION @@ -479,6 +509,7 @@ popd %dir %{_libdir}/R/library/cluster/po/ %lang(de) %{_libdir}/R/library/cluster/po/de/ %lang(en) %{_libdir}/R/library/cluster/po/en*/ +%lang(fr) %{_libdir}/R/library/cluster/po/fr/ %lang(pl) %{_libdir}/R/library/cluster/po/pl/ # codetools %dir %{_libdir}/R/library/codetools/ @@ -528,6 +559,7 @@ popd %dir %{_libdir}/R/library/KernSmooth/po/ %lang(de) %{_libdir}/R/library/KernSmooth/po/de/ %lang(en) %{_libdir}/R/library/KernSmooth/po/en*/ +%lang(fr) %{_libdir}/R/library/KernSmooth/po/fr/ %lang(ko) %{_libdir}/R/library/KernSmooth/po/ko/ %lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/ %{_libdir}/R/library/KernSmooth/R/ @@ -589,6 +621,7 @@ popd %dir %{_libdir}/R/library/Matrix/po/ %lang(de) %{_libdir}/R/library/Matrix/po/de/ %lang(en) %{_libdir}/R/library/Matrix/po/en*/ +%lang(fr) %{_libdir}/R/library/Matrix/po/fr/ %lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R @@ -693,11 +726,11 @@ popd %{_libdir}/R/library/utils/ %{_libdir}/R/modules %{_libdir}/R/COPYING -%{_libdir}/R/NEWS* +# %{_libdir}/R/NEWS* %{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* -%{_sysconfdir}/rpm/macros.R +%{macrosdir}/macros.R %{_mandir}/man1/* %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} %docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -817,11 +850,35 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog -* Fri Jan 24 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-4 -- disable lto on non-modern targets (not just ppc) +* Fri Apr 25 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-2 +- fix core-devel Requires + +* Mon Apr 21 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.1.0-1 +- update to 3.1.0 + +* Mon Mar 24 2014 Brent Baude <baude(a)us.ibm.com> - 3.0.3-2 +- add ppc64le support +- rhbz #1077819 + +* Thu Mar 20 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.3-1 +- update to 3.0.3 +- switch to java-headless + +* Fri Feb 14 2014 David Tardon <dtardon(a)redhat.com> - 3.0.2-7 +- rebuild for new ICU + +* Sat Feb 8 2014 Ville Skytt <ville.skytta(a)iki.fi> - 3.0.2-6 +- Install macros to %%{_rpmconfigdir}/macros.d where available. +- Fix rpmlint spaces vs tabs warnings. + +* Fri Feb 7 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-5 +- add support for system tre (f21+, rhel 7+) + +* Fri Feb 7 2014 Orion Poplawski <orion(a)cora.nwra.com> - 3.0.2-4 +- Use BR java * Fri Jan 24 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-3 -- disable lto on ppc/ppc64 +- disable lto on non-modern targets (not just ppc) * Fri Dec 20 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-2 - add --with-blas, --enable-lto to configure diff --git a/sources b/sources index fc5411c..9849710 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9a8374736e7650e4848f33e2e3bbee3 R-3.0.2.tar.gz +a1ee52446bee81820409661e6d114ab1 R-3.1.0.tar.gz commit 62458ff1107b97691428adb0666977f4bdef0d8e Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jan 24 11:10:46 2014 -0500 disable features not found on ancient stuff diff --git a/R.spec b/R.spec index 59cbd2f..1c9bdf9 100644 --- a/R.spec +++ b/R.spec @@ -310,7 +310,7 @@ export FCFLAGS="%{optflags}" --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ -%ifnarch ppc ppc64 +%if %{modern} --enable-lto \ %endif rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ @@ -817,6 +817,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Jan 24 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-4 +- disable lto on non-modern targets (not just ppc) + * Fri Jan 24 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-3 - disable lto on ppc/ppc64 commit c9b1f7ff531efd054dcba5c31fe8f1ec77c3c993 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jan 24 11:00:11 2014 -0500 disable features not found on ppc diff --git a/R.spec b/R.spec index 0e370fe..59cbd2f 100644 --- a/R.spec +++ b/R.spec @@ -17,7 +17,7 @@ Name: R Version: 3.0.2 -Release: 2%{?dist} +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-3/R-%{version}.tar.gz @@ -310,7 +310,9 @@ export FCFLAGS="%{optflags}" --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ +%ifnarch ppc ppc64 --enable-lto \ +%endif rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ @@ -815,6 +817,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Jan 24 2014 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-3 +- disable lto on ppc/ppc64 + * Fri Dec 20 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-2 - add --with-blas, --enable-lto to configure commit 681035265fa97e6eeadea3ffd04391b79559f463 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jan 24 10:42:51 2014 -0500 sync to rawhide diff --git a/R.spec b/R.spec index 7d1d2f6..0e370fe 100644 --- a/R.spec +++ b/R.spec @@ -17,7 +17,7 @@ Name: R Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?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-3/R-%{version}.tar.gz @@ -32,7 +32,7 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: blas >= 3.0, pcre-devel, zlib-devel +BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel %if %{modern} BuildRequires: java-1.5.0-gcj %else @@ -305,10 +305,12 @@ export FCFLAGS="%{optflags}" ( %configure \ --with-system-zlib --with-system-bzlib --with-system-pcre \ --with-lapack \ + --with-blas \ --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ + --enable-lto \ rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ @@ -813,6 +815,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Dec 20 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-2 +- add --with-blas, --enable-lto to configure + * Tue Oct 15 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-1 - update to 3.0.2 commit 17f4b5480484a1476eac87276f830217304f6732 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Oct 16 01:23:20 2013 +0100 el5 is old and crufty. diff --git a/R.spec b/R.spec index a92c255..7d1d2f6 100644 --- a/R.spec +++ b/R.spec @@ -171,6 +171,8 @@ Summary: Full R development environment metapackage Requires: R-core-devel = %{version}-%{release} %if %{modern} Requires: R-java-devel = %{version}-%{release} +%else +Group: Development/Libraries %endif %description devel commit 5b9b77d2d32e41cf00a0204db50b083acc53366b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Oct 16 00:56:30 2013 +0100 3.0.2 diff --git a/R-3.0.1-arm-compile-fix.patch b/R-3.0.1-arm-compile-fix.patch new file mode 100644 index 0000000..c13ff85 --- /dev/null +++ b/R-3.0.1-arm-compile-fix.patch @@ -0,0 +1,32 @@ +diff -up R-3.0.1/src/library/tools/R/install.R.armfix R-3.0.1/src/library/tools/R/install.R +--- R-3.0.1/src/library/tools/R/install.R.armfix 2013-08-12 13:57:17.956790673 -0400 ++++ R-3.0.1/src/library/tools/R/install.R 2013-08-12 13:59:51.230800752 -0400 +@@ -108,7 +108,11 @@ + SHLIB_EXT <- if (WINDOWS) ".dll" else { + ## can we do better? + mconf <- file.path(R.home(), paste0("etc", rarch), "Makeconf") +- sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE)) ++ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc ++ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE), perl = TRUE) ++ } else { ++ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE)) ++ } + } + + options(warn = 1) +@@ -1627,8 +1631,13 @@ + mconf <- readLines(file.path(R.home(), + paste0("etc", Sys.getenv("R_ARCH")), + "Makeconf")) +- SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE)) +- SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE)) ++ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc ++ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE), perl = TRUE) ++ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE), perl = TRUE) ++ } else { ++ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE)) ++ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE)) ++ } + MAKE <- Sys.getenv("MAKE") + rarch <- Sys.getenv("R_ARCH") + } else { diff --git a/R.spec b/R.spec index a798c2c..a92c255 100644 --- a/R.spec +++ b/R.spec @@ -16,13 +16,15 @@ %endif Name: R -Version: 3.0.1 -Release: 2%{?dist} +Version: 3.0.2 +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-3/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679180 +Patch0: R-3.0.1-arm-compile-fix.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,26 +91,26 @@ Requires: perl, sed, gawk, tex(latex), less # packager convenience. Provides: R-base = %{version} Provides: R-boot = 1.3.9 -Provides: R-class = 7.3.7 +Provides: R-class = 7.3.9 Provides: R-cluster = 1.14.4 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.53 +Provides: R-foreign = 0.8.55 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.10 -Provides: R-lattice = 0.20.15 -Provides: R-MASS = 7.3.26 -Provides: R-Matrix = 1.0.12 +Provides: R-lattice = 0.20.23 +Provides: R-MASS = 7.3.29 +Provides: R-Matrix = 1.0.14 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.22 -Provides: R-nlme = 3.1.109 -Provides: R-nnet = 7.3.6 +Provides: R-mgcv = 1.7.26 +Provides: R-nlme = 3.1.111 +Provides: R-nnet = 7.3.7 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.1 -Provides: R-spatial = 7.3.6 +Provides: R-rpart = 4.1.3 +Provides: R-spatial = 7.3.7 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -151,7 +153,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.0.12 +Provides: R-Matrix-devel = 1.0.14 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -238,6 +240,7 @@ from the R project. This package provides the static libRmath library. %prep %setup -q +%patch0 -p1 -b .armfix # Filter false positive provides. cat <<EOF > %{name}-prov @@ -304,7 +307,7 @@ export FCFLAGS="%{optflags}" --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ - rdocdir=%{_docdir}/R-%{version} \ + rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ | grep -A30 'R is now' - > CAPABILITIES @@ -339,7 +342,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old -install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version} +install -p CAPABILITIES ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} #Install libRmath files (cd src/nmath/standalone; make install DESTDIR=${RPM_BUILD_ROOT}) @@ -358,21 +361,21 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib -touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES +touch -r NEWS ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES touch -r NEWS doc/manual/*.pdf touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html # We can safely use RHOME here, because all of these are system packages. -sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html +sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/html/packages.html for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do - sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i + sed -i 's|\..\/\..\/..\/doc|%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}|g' $i done # Fix exec bits 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 +chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES # Symbolic link for convenience pushd $RPM_BUILD_ROOT%{_libdir}/R @@ -445,7 +448,6 @@ popd %{_libdir}/R/library/class/html/ %{_libdir}/R/library/class/INDEX %{_libdir}/R/library/class/libs/ -%{_libdir}/R/library/class/LICENCE %{_libdir}/R/library/class/Meta/ %{_libdir}/R/library/class/NAMESPACE %{_libdir}/R/library/class/NEWS @@ -540,6 +542,8 @@ popd %lang(de) %{_libdir}/R/library/lattice/po/de/ %lang(en) %{_libdir}/R/library/lattice/po/en*/ %lang(fr) %{_libdir}/R/library/lattice/po/fr/ +%lang(ko) %{_libdir}/R/library/lattice/po/ko/ +%lang(pl) %{_libdir}/R/library/lattice/po/pl*/ %{_libdir}/R/library/lattice/R/ # MASS %dir %{_libdir}/R/library/MASS/ @@ -550,7 +554,6 @@ popd %{_libdir}/R/library/MASS/html/ %{_libdir}/R/library/MASS/INDEX %{_libdir}/R/library/MASS/libs/ -%{_libdir}/R/library/MASS/LICENCE %{_libdir}/R/library/MASS/Meta/ %{_libdir}/R/library/MASS/NAMESPACE %{_libdir}/R/library/MASS/NEWS @@ -598,7 +601,6 @@ popd %{_libdir}/R/library/nlme/html/ %{_libdir}/R/library/nlme/INDEX %{_libdir}/R/library/nlme/libs/ -%{_libdir}/R/library/nlme/LICENCE %{_libdir}/R/library/nlme/Meta/ %{_libdir}/R/library/nlme/mlbook/ %{_libdir}/R/library/nlme/NAMESPACE @@ -606,6 +608,7 @@ popd %lang(de) %{_libdir}/R/library/nlme/po/de/ %lang(en) %{_libdir}/R/library/nlme/po/en*/ %lang(fr) %{_libdir}/R/library/nlme/po/fr/ +%lang(ko) %{_libdir}/R/library/nlme/po/ko/ %lang(pl) %{_libdir}/R/library/nlme/po/pl/ %{_libdir}/R/library/nlme/R/ %{_libdir}/R/library/nlme/scripts/ @@ -617,7 +620,6 @@ popd %{_libdir}/R/library/nnet/html/ %{_libdir}/R/library/nnet/INDEX %{_libdir}/R/library/nnet/libs/ -%{_libdir}/R/library/nnet/LICENCE %{_libdir}/R/library/nnet/Meta/ %{_libdir}/R/library/nnet/NAMESPACE %{_libdir}/R/library/nnet/NEWS @@ -658,7 +660,6 @@ popd %{_libdir}/R/library/spatial/html/ %{_libdir}/R/library/spatial/INDEX %{_libdir}/R/library/spatial/libs/ -%{_libdir}/R/library/spatial/LICENCE %{_libdir}/R/library/spatial/Meta/ %{_libdir}/R/library/spatial/NAMESPACE %{_libdir}/R/library/spatial/NEWS @@ -692,8 +693,8 @@ popd %{_infodir}/R-*.info* %{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* -%{_docdir}/R-%{version} -%docdir %{_docdir}/R-%{version} +%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} +%docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} /etc/ld.so.conf.d/* %files core-devel @@ -810,6 +811,16 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Oct 15 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-1 +- update to 3.0.2 + +* Mon Aug 12 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-4 +- add support for unversioned docdir in F20+ +- fix compile on arm (thanks Debian, wish you'd upstreamed that patch) + +* Fri Aug 02 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat May 18 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-2 - conditionalize the ugly hack for fedora 19+ diff --git a/sources b/sources index 93c9ded..fc5411c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36d51544b007fff26c7fbf36b02ea5ad R-3.0.1.tar.gz +f9a8374736e7650e4848f33e2e3bbee3 R-3.0.2.tar.gz commit ee48b1de3a8e4b3fb6f15f59acbfaaddef4f4e55 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Oct 16 00:50:38 2013 +0100 3.0.2 diff --git a/R-3.0.1-arm-compile-fix.patch b/R-3.0.1-arm-compile-fix.patch new file mode 100644 index 0000000..c13ff85 --- /dev/null +++ b/R-3.0.1-arm-compile-fix.patch @@ -0,0 +1,32 @@ +diff -up R-3.0.1/src/library/tools/R/install.R.armfix R-3.0.1/src/library/tools/R/install.R +--- R-3.0.1/src/library/tools/R/install.R.armfix 2013-08-12 13:57:17.956790673 -0400 ++++ R-3.0.1/src/library/tools/R/install.R 2013-08-12 13:59:51.230800752 -0400 +@@ -108,7 +108,11 @@ + SHLIB_EXT <- if (WINDOWS) ".dll" else { + ## can we do better? + mconf <- file.path(R.home(), paste0("etc", rarch), "Makeconf") +- sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE)) ++ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc ++ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE), perl = TRUE) ++ } else { ++ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE)) ++ } + } + + options(warn = 1) +@@ -1627,8 +1631,13 @@ + mconf <- readLines(file.path(R.home(), + paste0("etc", Sys.getenv("R_ARCH")), + "Makeconf")) +- SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE)) +- SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE)) ++ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc ++ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE), perl = TRUE) ++ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE), perl = TRUE) ++ } else { ++ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE)) ++ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE)) ++ } + MAKE <- Sys.getenv("MAKE") + rarch <- Sys.getenv("R_ARCH") + } else { diff --git a/R.spec b/R.spec index 45a16bf..a92c255 100644 --- a/R.spec +++ b/R.spec @@ -16,13 +16,15 @@ %endif Name: R -Version: 3.0.1 +Version: 3.0.2 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-3/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679180 +Patch0: R-3.0.1-arm-compile-fix.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,26 +91,26 @@ Requires: perl, sed, gawk, tex(latex), less # packager convenience. Provides: R-base = %{version} Provides: R-boot = 1.3.9 -Provides: R-class = 7.3.7 +Provides: R-class = 7.3.9 Provides: R-cluster = 1.14.4 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.53 +Provides: R-foreign = 0.8.55 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.10 -Provides: R-lattice = 0.20.15 -Provides: R-MASS = 7.3.26 -Provides: R-Matrix = 1.0.12 +Provides: R-lattice = 0.20.23 +Provides: R-MASS = 7.3.29 +Provides: R-Matrix = 1.0.14 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.22 -Provides: R-nlme = 3.1.109 -Provides: R-nnet = 7.3.6 +Provides: R-mgcv = 1.7.26 +Provides: R-nlme = 3.1.111 +Provides: R-nnet = 7.3.7 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.1 -Provides: R-spatial = 7.3.6 +Provides: R-rpart = 4.1.3 +Provides: R-spatial = 7.3.7 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -151,7 +153,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.0.12 +Provides: R-Matrix-devel = 1.0.14 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -238,6 +240,7 @@ from the R project. This package provides the static libRmath library. %prep %setup -q +%patch0 -p1 -b .armfix # Filter false positive provides. cat <<EOF > %{name}-prov @@ -304,7 +307,7 @@ export FCFLAGS="%{optflags}" --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ - rdocdir=%{_docdir}/R-%{version} \ + rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ | grep -A30 'R is now' - > CAPABILITIES @@ -312,12 +315,14 @@ make (cd src/nmath/standalone; make) #make check-all make pdf +%if 0%{?fedora} >= 19 # What a hack. # Current texinfo doesn't like @eqn. Use @math instead where stuff breaks. cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi +%endif make info # Convert to UTF-8 @@ -329,13 +334,15 @@ done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info # And now, undo the hack. :P +%if 0%{?fedora} >= 19 mv doc/manual/R-exts.texi.spot doc/manual/R-exts.texi mv doc/manual/R-intro.texi.spot doc/manual/R-intro.texi +%endif make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old -install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version} +install -p CAPABILITIES ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} #Install libRmath files (cd src/nmath/standalone; make install DESTDIR=${RPM_BUILD_ROOT}) @@ -354,21 +361,21 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib -touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES +touch -r NEWS ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES touch -r NEWS doc/manual/*.pdf touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html # We can safely use RHOME here, because all of these are system packages. -sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html +sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/html/packages.html for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do - sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i + sed -i 's|\..\/\..\/..\/doc|%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}|g' $i done # Fix exec bits 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 +chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES # Symbolic link for convenience pushd $RPM_BUILD_ROOT%{_libdir}/R @@ -441,7 +448,6 @@ popd %{_libdir}/R/library/class/html/ %{_libdir}/R/library/class/INDEX %{_libdir}/R/library/class/libs/ -%{_libdir}/R/library/class/LICENCE %{_libdir}/R/library/class/Meta/ %{_libdir}/R/library/class/NAMESPACE %{_libdir}/R/library/class/NEWS @@ -536,6 +542,8 @@ popd %lang(de) %{_libdir}/R/library/lattice/po/de/ %lang(en) %{_libdir}/R/library/lattice/po/en*/ %lang(fr) %{_libdir}/R/library/lattice/po/fr/ +%lang(ko) %{_libdir}/R/library/lattice/po/ko/ +%lang(pl) %{_libdir}/R/library/lattice/po/pl*/ %{_libdir}/R/library/lattice/R/ # MASS %dir %{_libdir}/R/library/MASS/ @@ -546,7 +554,6 @@ popd %{_libdir}/R/library/MASS/html/ %{_libdir}/R/library/MASS/INDEX %{_libdir}/R/library/MASS/libs/ -%{_libdir}/R/library/MASS/LICENCE %{_libdir}/R/library/MASS/Meta/ %{_libdir}/R/library/MASS/NAMESPACE %{_libdir}/R/library/MASS/NEWS @@ -594,7 +601,6 @@ popd %{_libdir}/R/library/nlme/html/ %{_libdir}/R/library/nlme/INDEX %{_libdir}/R/library/nlme/libs/ -%{_libdir}/R/library/nlme/LICENCE %{_libdir}/R/library/nlme/Meta/ %{_libdir}/R/library/nlme/mlbook/ %{_libdir}/R/library/nlme/NAMESPACE @@ -602,6 +608,7 @@ popd %lang(de) %{_libdir}/R/library/nlme/po/de/ %lang(en) %{_libdir}/R/library/nlme/po/en*/ %lang(fr) %{_libdir}/R/library/nlme/po/fr/ +%lang(ko) %{_libdir}/R/library/nlme/po/ko/ %lang(pl) %{_libdir}/R/library/nlme/po/pl/ %{_libdir}/R/library/nlme/R/ %{_libdir}/R/library/nlme/scripts/ @@ -613,7 +620,6 @@ popd %{_libdir}/R/library/nnet/html/ %{_libdir}/R/library/nnet/INDEX %{_libdir}/R/library/nnet/libs/ -%{_libdir}/R/library/nnet/LICENCE %{_libdir}/R/library/nnet/Meta/ %{_libdir}/R/library/nnet/NAMESPACE %{_libdir}/R/library/nnet/NEWS @@ -654,7 +660,6 @@ popd %{_libdir}/R/library/spatial/html/ %{_libdir}/R/library/spatial/INDEX %{_libdir}/R/library/spatial/libs/ -%{_libdir}/R/library/spatial/LICENCE %{_libdir}/R/library/spatial/Meta/ %{_libdir}/R/library/spatial/NAMESPACE %{_libdir}/R/library/spatial/NEWS @@ -688,8 +693,8 @@ popd %{_infodir}/R-*.info* %{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* -%{_docdir}/R-%{version} -%docdir %{_docdir}/R-%{version} +%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} +%docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} /etc/ld.so.conf.d/* %files core-devel @@ -806,6 +811,19 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Oct 15 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.2-1 +- update to 3.0.2 + +* Mon Aug 12 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-4 +- add support for unversioned docdir in F20+ +- fix compile on arm (thanks Debian, wish you'd upstreamed that patch) + +* Fri Aug 02 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat May 18 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-2 +- conditionalize the ugly hack for fedora 19+ + * Fri May 17 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-1 - update to 3.0.1 diff --git a/sources b/sources index 93c9ded..fc5411c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36d51544b007fff26c7fbf36b02ea5ad R-3.0.1.tar.gz +f9a8374736e7650e4848f33e2e3bbee3 R-3.0.2.tar.gz commit 7706187bdf27c950a5b2ce8b2aa266bb1dc44724 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat May 18 15:24:32 2013 -0400 conditionalize hack diff --git a/R.spec b/R.spec index 45a16bf..a798c2c 100644 --- a/R.spec +++ b/R.spec @@ -17,7 +17,7 @@ Name: R Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?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-3/R-%{version}.tar.gz @@ -312,12 +312,14 @@ make (cd src/nmath/standalone; make) #make check-all make pdf +%if 0%{?fedora} >= 19 # What a hack. # Current texinfo doesn't like @eqn. Use @math instead where stuff breaks. cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi +%endif make info # Convert to UTF-8 @@ -329,8 +331,10 @@ done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info # And now, undo the hack. :P +%if 0%{?fedora} >= 19 mv doc/manual/R-exts.texi.spot doc/manual/R-exts.texi mv doc/manual/R-intro.texi.spot doc/manual/R-intro.texi +%endif make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -806,6 +810,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Sat May 18 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-2 +- conditionalize the ugly hack for fedora 19+ + * Fri May 17 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-1 - update to 3.0.1 commit 696fc13b8acdbe861152c5bbcc4213f1488532d7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 17 17:17:39 2013 -0400 3.0.1 diff --git a/R-make-search-index.sh b/R-make-search-index.sh index 069d1a9..e233086 100755 --- a/R-make-search-index.sh +++ b/R-make-search-index.sh @@ -1,34 +1,7 @@ #!/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` - -# Figure out what R_DOC_DIR is set to -# Ideally, we could ask R just like we do for RHOME, but we can't yet. -TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2` - -# Write out all the contents in arch library locations -cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null -# Don't use .. based paths, substitute TMP_R_HOME -sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt - -# Write out all the contents in noarch library locations -cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null -# 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 +# This script used to do something, now it doesn't. +# Why are you reading this? exit 0 diff --git a/R.spec b/R.spec index c17b257..45a16bf 100644 --- a/R.spec +++ b/R.spec @@ -16,8 +16,8 @@ %endif Name: R -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.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-3/R-%{version}.tar.gz @@ -312,6 +312,12 @@ make (cd src/nmath/standalone; make) #make check-all make pdf +# What a hack. +# Current texinfo doesn't like @eqn. Use @math instead where stuff breaks. +cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot +cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot +sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi +sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi make info # Convert to UTF-8 @@ -322,6 +328,9 @@ done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info +# And now, undo the hack. :P +mv doc/manual/R-exts.texi.spot doc/manual/R-exts.texi +mv doc/manual/R-intro.texi.spot doc/manual/R-intro.texi make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -797,6 +806,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri May 17 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-1 +- update to 3.0.1 + * Sat Apr 13 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.0-2 - add Requires: tex(inconsolata.sty) to -core-devel to fix module PDF building diff --git a/sources b/sources index 282054a..93c9ded 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fb80535b0e144a978f67aa2158015de R-3.0.0.tar.gz +36d51544b007fff26c7fbf36b02ea5ad R-3.0.1.tar.gz commit bfd2a54760d26b842646fb0fe43c2a4a547f8f78 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 17 17:17:26 2013 -0400 3.0.1 diff --git a/R-make-search-index.sh b/R-make-search-index.sh index 069d1a9..e233086 100755 --- a/R-make-search-index.sh +++ b/R-make-search-index.sh @@ -1,34 +1,7 @@ #!/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` - -# Figure out what R_DOC_DIR is set to -# Ideally, we could ask R just like we do for RHOME, but we can't yet. -TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2` - -# Write out all the contents in arch library locations -cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null -# Don't use .. based paths, substitute TMP_R_HOME -sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt - -# Write out all the contents in noarch library locations -cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null -# 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 +# This script used to do something, now it doesn't. +# Why are you reading this? exit 0 diff --git a/R.spec b/R.spec index c17b257..45a16bf 100644 --- a/R.spec +++ b/R.spec @@ -16,8 +16,8 @@ %endif Name: R -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.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-3/R-%{version}.tar.gz @@ -312,6 +312,12 @@ make (cd src/nmath/standalone; make) #make check-all make pdf +# What a hack. +# Current texinfo doesn't like @eqn. Use @math instead where stuff breaks. +cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot +cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot +sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi +sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi make info # Convert to UTF-8 @@ -322,6 +328,9 @@ done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info +# And now, undo the hack. :P +mv doc/manual/R-exts.texi.spot doc/manual/R-exts.texi +mv doc/manual/R-intro.texi.spot doc/manual/R-intro.texi make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -797,6 +806,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri May 17 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.1-1 +- update to 3.0.1 + * Sat Apr 13 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.0-2 - add Requires: tex(inconsolata.sty) to -core-devel to fix module PDF building diff --git a/sources b/sources index 282054a..93c9ded 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fb80535b0e144a978f67aa2158015de R-3.0.0.tar.gz +36d51544b007fff26c7fbf36b02ea5ad R-3.0.1.tar.gz commit 90242f18c59dc48b34e47de81556c09cc8b2c844 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Apr 17 21:20:12 2013 -0400 R3 diff --git a/R.spec b/R.spec index 91b0311..c17b257 100644 --- a/R.spec +++ b/R.spec @@ -4,12 +4,23 @@ %define java_arch %{_arch} %endif +# Assume not modern. Override if needed. +%global modern 0 + +%if 0%{?fedora} +%global modern 1 +%endif + +%if 0%{?rhel} >= 6 +%global modern 1 +%endif + Name: R -Version: 2.15.2 -Release: 1%{?dist} +Version: 3.0.0 +Release: 2%{?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 +Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh License: GPLv2+ @@ -20,17 +31,30 @@ BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel -BuildRequires: java-1.5.0-gcj, lapack-devel +%if %{modern} +BuildRequires: java-1.5.0-gcj +%else +BuildRequires: java-1.4.2-gcj-compat +%endif +BuildRequires: lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel -BuildRequires: gcc-objc, pango-devel, libicu-devel +BuildRequires: gcc-objc, pango-devel, xz-devel +%if %{modern} +BuildRequires: libicu-devel +%endif BuildRequires: less +%if 0%{?fedora} >= 18 +BuildRequires: tex(inconsolata.sty) +%endif # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath Requires: libRmath-devel = %{version}-%{release} +%if %{modern} # Pull in Java bits (if you don't want this, use R-core) Requires: R-java = %{version}-%{release} +%endif %description This is a metapackage that provides both core R userspace and @@ -53,37 +77,42 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups -Requires: perl, sed, gawk, tex(latex), tex(dvips), less, vi +%if %{modern} +Requires: tex(dvips), vi +%else +Requires: vim-minimal +%endif +Requires: perl, sed, gawk, tex(latex), less # These are the submodules that R-core 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.3.7 -Provides: R-class = 7.3.5 -Provides: R-cluster = 1.14.3 +Provides: R-boot = 1.3.9 +Provides: R-class = 7.3.7 +Provides: R-cluster = 1.14.4 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.51 +Provides: R-foreign = 0.8.53 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.8 -Provides: R-lattice = 0.20.10 -Provides: R-MASS = 7.3.22 -Provides: R-Matrix = 1.0.9 +Provides: R-KernSmooth = 2.23.10 +Provides: R-lattice = 0.20.15 +Provides: R-MASS = 7.3.26 +Provides: R-Matrix = 1.0.12 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.7.22 -Provides: R-nlme = 3.1.105 -Provides: R-nnet = 7.3.5 +Provides: R-nlme = 3.1.109 +Provides: R-nnet = 7.3.6 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.55 -Provides: R-spatial = 7.3.5 +Provides: R-rpart = 4.1.1 +Provides: R-spatial = 7.3.6 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.14 +Provides: R-survival = 2.37.4 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -102,21 +131,51 @@ add additional functionality by defining new functions. For computationally intensive tasks, C, C++ and Fortran code can be linked and called at run time. -%package devel -Summary: Files for development of R packages +%package core-devel +Summary: Core files for development of R packages (no Java) Group: Applications/Engineering Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig -Requires: R-java-devel = %{version}-%{release} -Provides: R-Matrix-devel = 1.0.9 +# TeX files needed +%if 0%{?fedora} >= 18 +Requires: tex(ecrm1000.tfm) +Requires: tex(inconsolata.sty) +Requires: tex(ptmr8t.tfm) +Requires: tex(ptmb8t.tfm) +Requires: tex(pcrr8t.tfm) +Requires: tex(phvr8t.tfm) +Requires: tex(ptmri8t.tfm) +Requires: tex(ptmro8t.tfm) +Requires: tex(cm-super-ts1.enc) +%endif +Provides: R-Matrix-devel = 1.0.12 Obsoletes: R-Matrix-devel < 0.999375-7 +%if %{modern} +%description core-devel +Install R-core-devel if you are going to develop or compile R packages. +This package does not configure the R environment for Java, install +R-java-devel if you want this. +%else +%description core-devel +Install R-core-devel if you are going to develop or compile R packages. +%endif + +%package devel +Summary: Full R development environment metapackage +Requires: R-core-devel = %{version}-%{release} +%if %{modern} +Requires: R-java-devel = %{version}-%{release} +%endif + %description devel -Install R-devel if you are going to develop or compile R packages. +This is a metapackage to install a complete (with Java) R development +environment. +%if %{modern} %package java Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering @@ -143,12 +202,13 @@ Fedora's openJDK. %package java-devel Summary: Development package for use with Java enabled R components Group: Applications/Engineering -Requires(post): R-devel = %{version}-%{release} +Requires(post): R-core-devel = %{version}-%{release} Requires(post): java-devel %description java-devel Install R-java-devel if you are going to develop or compile R packages that assume java is present and configured on the system. +%endif %package -n libRmath Summary: Standalone math library from the R project @@ -319,61 +379,33 @@ popd %defattr(-, root, root, -) %{_bindir}/R %{_bindir}/Rscript -%dir %{_datadir}/R/ -%{_datadir}/R/encodings/ -%{_datadir}/R/java/ -%{_datadir}/R/library/ -%{_datadir}/R/licenses/ -%dir %{_datadir}/R/locale/ -%lang(da) %{_datadir}/R/locale/da/ -%lang(de) %{_datadir}/R/locale/de/ -%lang(en) %{_datadir}/R/locale/en*/ -%lang(es) %{_datadir}/R/locale/es*/ -%lang(fr) %{_datadir}/R/locale/fr/ -%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(pl) %{_datadir}/R/locale/pl/ -%lang(pt) %{_datadir}/R/locale/pt*/ -%lang(ru) %{_datadir}/R/locale/ru/ -%lang(tr) %{_datadir}/R/locale/tr/ -%lang(zh) %{_datadir}/R/locale/zh*/ -%{_datadir}/R/make/ -%{_datadir}/R/R/ -%{_datadir}/R/sh/ -%{_datadir}/R/texmf/ +%{_datadir}/R/ %{_datadir}/texmf/ -%dir %{_libdir}/R -%{_libdir}/R/bin -%{_libdir}/R/etc -%{_libdir}/R/lib # Have to break this out for the translations -%dir %{_libdir}/R/library +%dir %{_libdir}/R/ +%{_libdir}/R/bin/ +%{_libdir}/R/etc/ +%{_libdir}/R/lib/ +%dir %{_libdir}/R/library/ +%dir %{_libdir}/R/library/translations/ +%{_libdir}/R/library/translations/DESCRIPTION +%lang(da) %{_libdir}/R/library/translations/da/ +%lang(de) %{_libdir}/R/library/translations/de/ +%lang(en) %{_libdir}/R/library/translations/en*/ +%lang(es) %{_libdir}/R/library/translations/es/ +%lang(fa) %{_libdir}/R/library/translations/fa/ +%lang(fr) %{_libdir}/R/library/translations/fr/ +%lang(it) %{_libdir}/R/library/translations/it/ +%lang(ja) %{_libdir}/R/library/translations/ja/ +%lang(ko) %{_libdir}/R/library/translations/ko/ +%lang(nn) %{_libdir}/R/library/translations/nn/ +%lang(pl) %{_libdir}/R/library/translations/pl/ +%lang(pt) %{_libdir}/R/library/translations/pt*/ +%lang(ru) %{_libdir}/R/library/translations/ru/ +%lang(tr) %{_libdir}/R/library/translations/tr/ +%lang(zh) %{_libdir}/R/library/translations/zh*/ # base -%dir %{_libdir}/R/library/base/ -%{_libdir}/R/library/base/CITATION -%{_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/Meta/ -%dir %{_libdir}/R/library/base/po/ -%lang(da) %{_libdir}/R/library/base/po/da/ -%lang(de) %{_libdir}/R/library/base/po/de/ -%lang(en) %{_libdir}/R/library/base/po/en*/ -%lang(fr) %{_libdir}/R/library/base/po/fr/ -%lang(it) %{_libdir}/R/library/base/po/it/ -%lang(ja) %{_libdir}/R/library/base/po/ja/ -%lang(ko) %{_libdir}/R/library/base/po/ko/ -%lang(nn) %{_libdir}/R/library/base/po/nn/ -%lang(pl) %{_libdir}/R/library/base/po/pl/ -%lang(pt) %{_libdir}/R/library/base/po/pt*/ -%lang(ru) %{_libdir}/R/library/base/po/ru/ -%lang(tr) %{_libdir}/R/library/base/po/tr/ -%lang(zh) %{_libdir}/R/library/base/po/zh*/ -%{_libdir}/R/library/base/R/ +%{_libdir}/R/library/base/ # boot %dir %{_libdir}/R/library/boot/ %{_libdir}/R/library/boot/CITATION @@ -388,6 +420,7 @@ popd %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(ko) %{_libdir}/R/library/boot/po/ko/ %lang(pl) %{_libdir}/R/library/boot/po/pl/ %lang(ru) %{_libdir}/R/library/boot/po/ru/ %{_libdir}/R/library/boot/R/ @@ -407,6 +440,7 @@ popd %lang(de) %{_libdir}/R/library/class/po/de/ %lang(en) %{_libdir}/R/library/class/po/en*/ %lang(fr) %{_libdir}/R/library/class/po/fr/ +%lang(ko) %{_libdir}/R/library/class/po/ko/ %lang(pl) %{_libdir}/R/library/class/po/pl/ %{_libdir}/R/library/class/R/ # cluster @@ -435,43 +469,18 @@ popd %{_libdir}/R/library/codetools/NAMESPACE %{_libdir}/R/library/codetools/R/ # compiler -%dir %{_libdir}/R/library/compiler/ -%{_libdir}/R/library/compiler/DESCRIPTION -%{_libdir}/R/library/compiler/help/ -%{_libdir}/R/library/compiler/html/ -%{_libdir}/R/library/compiler/INDEX -%{_libdir}/R/library/compiler/Meta/ -%{_libdir}/R/library/compiler/NAMESPACE -%{_libdir}/R/library/compiler/R/ -%dir %{_libdir}/R/library/compiler/po/ -%lang(da) %{_libdir}/R/library/compiler/po/da/ -%lang(de) %{_libdir}/R/library/compiler/po/de/ -%lang(en) %{_libdir}/R/library/compiler/po/en*/ -%lang(fr) %{_libdir}/R/library/compiler/po/fr/ -%lang(ja) %{_libdir}/R/library/compiler/po/ja/ -%lang(ko) %{_libdir}/R/library/compiler/po/ko/ -%lang(pl) %{_libdir}/R/library/compiler/po/pl/ -%lang(pt) %{_libdir}/R/library/compiler/po/pt*/ -%lang(ru) %{_libdir}/R/library/compiler/po/ru/ -%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ +%{_libdir}/R/library/compiler/ # datasets -%dir %{_libdir}/R/library/datasets/ -%{_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/Meta/ -%{_libdir}/R/library/datasets/NAMESPACE +%{_libdir}/R/library/datasets/ # foreign %dir %{_libdir}/R/library/foreign/ +%{_libdir}/R/library/foreign/COPYRIGHTS %{_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/libs/ -%{_libdir}/R/library/foreign/LICENCE %{_libdir}/R/library/foreign/Meta/ %{_libdir}/R/library/foreign/NAMESPACE %dir %{_libdir}/R/library/foreign/po/ @@ -481,75 +490,11 @@ popd %lang(pl) %{_libdir}/R/library/foreign/po/pl/ %{_libdir}/R/library/foreign/R/ # graphics -%dir %{_libdir}/R/library/graphics/ -%{_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/Meta/ -%{_libdir}/R/library/graphics/NAMESPACE -%dir %{_libdir}/R/library/graphics/po/ -%lang(da) %{_libdir}/R/library/graphics/po/da/ -%lang(de) %{_libdir}/R/library/graphics/po/de/ -%lang(en) %{_libdir}/R/library/graphics/po/en*/ -%lang(fr) %{_libdir}/R/library/graphics/po/fr/ -%lang(it) %{_libdir}/R/library/graphics/po/it/ -%lang(ja) %{_libdir}/R/library/graphics/po/ja/ -%lang(ko) %{_libdir}/R/library/graphics/po/ko/ -%lang(pl) %{_libdir}/R/library/graphics/po/pl/ -%lang(pt) %{_libdir}/R/library/graphics/po/pt*/ -%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/ # grDevices -%dir %{_libdir}/R/library/grDevices -%{_libdir}/R/library/grDevices/afm/ -%{_libdir}/R/library/grDevices/DESCRIPTION -%{_libdir}/R/library/grDevices/enc/ -%{_libdir}/R/library/grDevices/help/ -%{_libdir}/R/library/grDevices/html/ -%{_libdir}/R/library/grDevices/icc/ -%{_libdir}/R/library/grDevices/INDEX -%{_libdir}/R/library/grDevices/libs/ -%{_libdir}/R/library/grDevices/Meta/ -%{_libdir}/R/library/grDevices/NAMESPACE -%dir %{_libdir}/R/library/grDevices/po/ -%lang(da) %{_libdir}/R/library/grDevices/po/da/ -%lang(de) %{_libdir}/R/library/grDevices/po/de/ -%lang(en) %{_libdir}/R/library/grDevices/po/en*/ -%lang(fr) %{_libdir}/R/library/grDevices/po/fr/ -%lang(it) %{_libdir}/R/library/grDevices/po/it/ -%lang(ja) %{_libdir}/R/library/grDevices/po/ja/ -%lang(ko) %{_libdir}/R/library/grDevices/po/ko/ -%lang(pl) %{_libdir}/R/library/grDevices/po/pl/ -%lang(pt) %{_libdir}/R/library/grDevices/po/pt*/ -%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 # grid -%dir %{_libdir}/R/library/grid/ -%{_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/libs/ -%{_libdir}/R/library/grid/Meta/ -%{_libdir}/R/library/grid/NAMESPACE -%dir %{_libdir}/R/library/grid/po/ -%lang(da) %{_libdir}/R/library/grid/po/da/ -%lang(de) %{_libdir}/R/library/grid/po/de/ -%lang(en) %{_libdir}/R/library/grid/po/en*/ -%lang(fr) %{_libdir}/R/library/grid/po/fr*/ -%lang(it) %{_libdir}/R/library/grid/po/it/ -%lang(ja) %{_libdir}/R/library/grid/po/ja/ -%lang(ko) %{_libdir}/R/library/grid/po/ko/ -%lang(pl) %{_libdir}/R/library/grid/po/pl/ -%lang(pt) %{_libdir}/R/library/grid/po/pt*/ -%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/ # KernSmooth %dir %{_libdir}/R/library/KernSmooth/ %{_libdir}/R/library/KernSmooth/DESCRIPTION @@ -557,12 +502,12 @@ popd %{_libdir}/R/library/KernSmooth/html/ %{_libdir}/R/library/KernSmooth/INDEX %{_libdir}/R/library/KernSmooth/libs/ -%{_libdir}/R/library/KernSmooth/LICENCE %{_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*/ +%lang(ko) %{_libdir}/R/library/KernSmooth/po/ko/ %lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/ %{_libdir}/R/library/KernSmooth/R/ # lattice @@ -575,7 +520,6 @@ popd %{_libdir}/R/library/lattice/html/ %{_libdir}/R/library/lattice/INDEX %{_libdir}/R/library/lattice/libs/ -%{_libdir}/R/library/lattice/LICENSE %{_libdir}/R/library/lattice/Meta/ %{_libdir}/R/library/lattice/NAMESPACE %{_libdir}/R/library/lattice/NEWS @@ -601,6 +545,7 @@ popd %lang(de) %{_libdir}/R/library/MASS/po/de/ %lang(en) %{_libdir}/R/library/MASS/po/en*/ %lang(fr) %{_libdir}/R/library/MASS/po/fr/ +%lang(ko) %{_libdir}/R/library/MASS/po/ko/ %lang(pl) %{_libdir}/R/library/MASS/po/pl/ %{_libdir}/R/library/MASS/R/ %{_libdir}/R/library/MASS/scripts/ @@ -628,38 +573,9 @@ popd %{_libdir}/R/library/Matrix/test-tools-1.R %{_libdir}/R/library/Matrix/test-tools-Matrix.R # methods -%dir %{_libdir}/R/library/methods/ -%{_libdir}/R/library/methods/DESCRIPTION -%{_libdir}/R/library/methods/help/ -%{_libdir}/R/library/methods/html/ -%{_libdir}/R/library/methods/INDEX -%{_libdir}/R/library/methods/libs/ -%{_libdir}/R/library/methods/Meta/ -%{_libdir}/R/library/methods/NAMESPACE -%dir %{_libdir}/R/library/methods/po/ -%lang(da) %{_libdir}/R/library/methods/po/da/ -%lang(de) %{_libdir}/R/library/methods/po/de/ -%lang(en) %{_libdir}/R/library/methods/po/en*/ -%lang(fr) %{_libdir}/R/library/methods/po/fr/ -%lang(ja) %{_libdir}/R/library/methods/po/ja/ -%lang(ko) %{_libdir}/R/library/methods/po/ko/ -%lang(pl) %{_libdir}/R/library/methods/po/pl/ -%lang(pt) %{_libdir}/R/library/methods/po/pt*/ -%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/ # mgcv -%dir %{_libdir}/R/library/mgcv/ -%{_libdir}/R/library/mgcv/CITATION -%{_libdir}/R/library/mgcv/DESCRIPTION -%{_libdir}/R/library/mgcv/data/ -%{_libdir}/R/library/mgcv/help/ -%{_libdir}/R/library/mgcv/html/ -%{_libdir}/R/library/mgcv/INDEX -%{_libdir}/R/library/mgcv/libs/ -%{_libdir}/R/library/mgcv/Meta/ -%{_libdir}/R/library/mgcv/NAMESPACE -%{_libdir}/R/library/mgcv/R/ +%{_libdir}/R/library/mgcv/ # nlme %dir %{_libdir}/R/library/nlme/ %{_libdir}/R/library/nlme/CITATION @@ -696,42 +612,28 @@ popd %lang(de) %{_libdir}/R/library/nnet/po/de/ %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ +%lang(ko) %{_libdir}/R/library/nnet/po/ko/ %lang(pl) %{_libdir}/R/library/nnet/po/pl/ %{_libdir}/R/library/nnet/R/ # parallel -%dir %{_libdir}/R/library/parallel/ -%{_libdir}/R/library/parallel/DESCRIPTION -%{_libdir}/R/library/parallel/doc/ -%{_libdir}/R/library/parallel/help/ -%{_libdir}/R/library/parallel/html/ -%{_libdir}/R/library/parallel/INDEX -%{_libdir}/R/library/parallel/libs/ -%{_libdir}/R/library/parallel/Meta/ -%{_libdir}/R/library/parallel/NAMESPACE -%dir %{_libdir}/R/library/parallel/po -%lang(da) %{_libdir}/R/library/parallel/po/da/ -%lang(de) %{_libdir}/R/library/parallel/po/de/ -%lang(en) %{_libdir}/R/library/parallel/po/en*/ -%lang(fr) %{_libdir}/R/library/parallel/po/fr/ -%lang(ko) %{_libdir}/R/library/parallel/po/ko/ -%lang(pl) %{_libdir}/R/library/parallel/po/pl/ -%lang(ru) %{_libdir}/R/library/parallel/po/ru/ -%lang(zh) %{_libdir}/R/library/parallel/po/zh*/ -%{_libdir}/R/library/parallel/R/ +%{_libdir}/R/library/parallel/ # rpart %dir %{_libdir}/R/library/rpart/ %{_libdir}/R/library/rpart/data/ %{_libdir}/R/library/rpart/DESCRIPTION +%{_libdir}/R/library/rpart/doc/ %{_libdir}/R/library/rpart/help/ %{_libdir}/R/library/rpart/html/ %{_libdir}/R/library/rpart/INDEX %{_libdir}/R/library/rpart/libs/ %{_libdir}/R/library/rpart/Meta/ %{_libdir}/R/library/rpart/NAMESPACE +%{_libdir}/R/library/rpart/NEWS.Rd %dir %{_libdir}/R/library/rpart/po %lang(de) %{_libdir}/R/library/rpart/po/de/ %lang(en) %{_libdir}/R/library/rpart/po/en*/ %lang(fr) %{_libdir}/R/library/rpart/po/fr/ +%lang(ko) %{_libdir}/R/library/rpart/po/ko/ %lang(pl) %{_libdir}/R/library/rpart/po/pl/ %lang(ru) %{_libdir}/R/library/rpart/po/ru/ %{_libdir}/R/library/rpart/R/ @@ -756,160 +658,19 @@ popd %{_libdir}/R/library/spatial/PP.files %{_libdir}/R/library/spatial/R/ # splines -%dir %{_libdir}/R/library/splines/ -%{_libdir}/R/library/splines/DESCRIPTION -%{_libdir}/R/library/splines/help/ -%{_libdir}/R/library/splines/html/ -%{_libdir}/R/library/splines/INDEX -%{_libdir}/R/library/splines/libs/ -%{_libdir}/R/library/splines/Meta/ -%{_libdir}/R/library/splines/NAMESPACE -%dir %{_libdir}/R/library/splines/po -%lang(da) %{_libdir}/R/library/splines/po/da/ -%lang(de) %{_libdir}/R/library/splines/po/de/ -%lang(en) %{_libdir}/R/library/splines/po/en*/ -%lang(fr) %{_libdir}/R/library/splines/po/fr/ -%lang(ja) %{_libdir}/R/library/splines/po/ja/ -%lang(ko) %{_libdir}/R/library/splines/po/ko/ -%lang(pl) %{_libdir}/R/library/splines/po/pl/ -%lang(pt) %{_libdir}/R/library/splines/po/pt*/ -%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/ # stats -%dir %{_libdir}/R/library/stats/ -%{_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/libs/ -%{_libdir}/R/library/stats/Meta/ -%{_libdir}/R/library/stats/NAMESPACE -%dir %{_libdir}/R/library/stats/po -%lang(da) %{_libdir}/R/library/stats/po/da/ -%lang(de) %{_libdir}/R/library/stats/po/de/ -%lang(en) %{_libdir}/R/library/stats/po/en*/ -%lang(fr) %{_libdir}/R/library/stats/po/fr/ -%lang(it) %{_libdir}/R/library/stats/po/it/ -%lang(ja) %{_libdir}/R/library/stats/po/ja/ -%lang(ko) %{_libdir}/R/library/stats/po/ko/ -%lang(pl) %{_libdir}/R/library/stats/po/pl/ -%lang(pt) %{_libdir}/R/library/stats/po/pt*/ -%lang(ru) %{_libdir}/R/library/stats/po/ru/ -%lang(tr) %{_libdir}/R/library/stats/po/tr/ -%lang(zh) %{_libdir}/R/library/stats/po/zh*/ -%{_libdir}/R/library/stats/R/ -%{_libdir}/R/library/stats/SOURCES.ts +%{_libdir}/R/library/stats/ # stats4 -%dir %{_libdir}/R/library/stats4/ -%{_libdir}/R/library/stats4/DESCRIPTION -%{_libdir}/R/library/stats4/help/ -%{_libdir}/R/library/stats4/html/ -%{_libdir}/R/library/stats4/INDEX -%{_libdir}/R/library/stats4/Meta/ -%{_libdir}/R/library/stats4/NAMESPACE -%dir %{_libdir}/R/library/stats4/po -%lang(da) %{_libdir}/R/library/stats4/po/da/ -%lang(de) %{_libdir}/R/library/stats4/po/de/ -%lang(en) %{_libdir}/R/library/stats4/po/en*/ -%lang(fr) %{_libdir}/R/library/stats4/po/fr/ -%lang(it) %{_libdir}/R/library/stats4/po/it/ -%lang(ja) %{_libdir}/R/library/stats4/po/ja/ -%lang(ko) %{_libdir}/R/library/stats4/po/ko/ -%lang(pl) %{_libdir}/R/library/stats4/po/pl/ -%lang(pt) %{_libdir}/R/library/stats4/po/pt*/ -%lang(ru) %{_libdir}/R/library/stats4/po/ru/ -%lang(tr) %{_libdir}/R/library/stats4/po/tr/ -%lang(zh) %{_libdir}/R/library/stats4/po/zh*/ -%{_libdir}/R/library/stats4/R/ +%{_libdir}/R/library/stats4/ # survival -%dir %{_libdir}/R/library/survival/ -%{_libdir}/R/library/survival/data/ -%{_libdir}/R/library/survival/CITATION -%{_libdir}/R/library/survival/DESCRIPTION -%{_libdir}/R/library/survival/doc/ -%{_libdir}/R/library/survival/help/ -%{_libdir}/R/library/survival/html/ -%{_libdir}/R/library/survival/INDEX -%{_libdir}/R/library/survival/libs/ -%{_libdir}/R/library/survival/Meta/ -%{_libdir}/R/library/survival/NAMESPACE -%{_libdir}/R/library/survival/NEWS.Rd -%{_libdir}/R/library/survival/R/ +%{_libdir}/R/library/survival/ # tcltk -%dir %{_libdir}/R/library/tcltk/ -%{_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/libs/ -%{_libdir}/R/library/tcltk/Meta/ -%{_libdir}/R/library/tcltk/NAMESPACE -%dir %{_libdir}/R/library/tcltk/po/ -%lang(da) %{_libdir}/R/library/tcltk/po/da/ -%lang(de) %{_libdir}/R/library/tcltk/po/de/ -%lang(en) %{_libdir}/R/library/tcltk/po/en*/ -%lang(fr) %{_libdir}/R/library/tcltk/po/fr/ -%lang(it) %{_libdir}/R/library/tcltk/po/it/ -%lang(ja) %{_libdir}/R/library/tcltk/po/ja/ -%lang(ko) %{_libdir}/R/library/tcltk/po/ko/ -%lang(pl) %{_libdir}/R/library/tcltk/po/pl/ -%lang(pt) %{_libdir}/R/library/tcltk/po/pt*/ -%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/ # tools -%dir %{_libdir}/R/library/tools/ -%{_libdir}/R/library/tools/DESCRIPTION -%{_libdir}/R/library/tools/help/ -%{_libdir}/R/library/tools/html/ -%{_libdir}/R/library/tools/INDEX -%{_libdir}/R/library/tools/libs/ -%{_libdir}/R/library/tools/Meta/ -%{_libdir}/R/library/tools/NAMESPACE -%dir %{_libdir}/R/library/tools/po -%lang(da) %{_libdir}/R/library/tools/po/da/ -%lang(de) %{_libdir}/R/library/tools/po/de/ -%lang(en) %{_libdir}/R/library/tools/po/en*/ -%lang(fr) %{_libdir}/R/library/tools/po/fr/ -%lang(it) %{_libdir}/R/library/tools/po/it/ -%lang(ja) %{_libdir}/R/library/tools/po/ja/ -%lang(ko) %{_libdir}/R/library/tools/po/ko/ -%lang(pl) %{_libdir}/R/library/tools/po/pl/ -%lang(pt) %{_libdir}/R/library/tools/po/pt*/ -%lang(ru) %{_libdir}/R/library/tools/po/ru/ -%lang(tr) %{_libdir}/R/library/tools/po/tr/ -%lang(zh) %{_libdir}/R/library/tools/po/zh*/ -%{_libdir}/R/library/tools/R/ +%{_libdir}/R/library/tools/ # utils -%dir %{_libdir}/R/library/utils/ -%{_libdir}/R/library/utils/DESCRIPTION -%{_libdir}/R/library/utils/doc/ -%{_libdir}/R/library/utils/help/ -%{_libdir}/R/library/utils/html/ -%{_libdir}/R/library/utils/iconvlist -%{_libdir}/R/library/utils/INDEX -%{_libdir}/R/library/utils/Meta/ -%{_libdir}/R/library/utils/misc/ -%{_libdir}/R/library/utils/NAMESPACE -%dir %{_libdir}/R/library/utils/po -%lang(da) %{_libdir}/R/library/utils/po/da/ -%lang(de) %{_libdir}/R/library/utils/po/de/ -%lang(en) %{_libdir}/R/library/utils/po/en*/ -%lang(fr) %{_libdir}/R/library/utils/po/fr/ -%lang(ja) %{_libdir}/R/library/utils/po/ja/ -%lang(ko) %{_libdir}/R/library/utils/po/ko/ -%lang(pl) %{_libdir}/R/library/utils/po/pl/ -%lang(pt) %{_libdir}/R/library/utils/po/pt*/ -%lang(ru) %{_libdir}/R/library/utils/po/ru/ -%lang(tr) %{_libdir}/R/library/utils/po/tr/ -%lang(zh) %{_libdir}/R/library/utils/po/zh*/ -%{_libdir}/R/library/utils/R/ -%{_libdir}/R/library/utils/Sweave/ +%{_libdir}/R/library/utils/ %{_libdir}/R/modules %{_libdir}/R/COPYING %{_libdir}/R/NEWS* @@ -922,18 +683,23 @@ popd %docdir %{_docdir}/R-%{version} /etc/ld.so.conf.d/* -%files devel +%files core-devel %defattr(-, root, root, -) %{_libdir}/pkgconfig/libR.pc %{_includedir}/R # Symlink to %{_includedir}/R/ %{_libdir}/R/include +%files devel +# Nothing, all files provided by R-core-devel + +%if %{modern} %files java # Nothing, all files provided by R-core %files java-devel -# Nothing, all files provided by R-devel +# Nothing, all files provided by R-core-devel +%endif %files -n libRmath %defattr(-, root, root, -) @@ -1004,6 +770,7 @@ fi %posttrans core /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : +%if %{modern} %post java R CMD javareconf \ JAVA_HOME=%{_jvmdir}/jre \ @@ -1023,12 +790,38 @@ R CMD javareconf \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ 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 +%endif %post -n libRmath -p /sbin/ldconfig %postun -n libRmath -p /sbin/ldconfig %changelog +* Sat Apr 13 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.0-2 +- add Requires: tex(inconsolata.sty) to -core-devel to fix module PDF building + +* Fri Apr 5 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.0-1 +- update to 3.0.0 + +* Wed Feb 27 2013 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-7 +- add BuildRequires: xz-devel (for system xz/lzma support) +- create R-core-devel + +* Sat Jan 26 2013 Kevin Fenzi <kevin(a)scrye.com> - 2.15.2-6 +- Rebuild for new icu + +* Sun Jan 20 2013 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-5 +- apply upstream fix for cairo issues (bz 891983) + +* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 2.15.2-4 +- rebuild due to "jpeg8-ABI" feature drop + +* Tue Nov 27 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-3 +- add Requires: tex(cm-super-ts1.enc) for R-devel + +* Tue Nov 27 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-2 +- add additional TeX font requirements to R-devel for Fedora 18+ (due to new texlive) + * Mon Oct 29 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-1 - update to 2.15.2 - R now Requires: R-java (for a more complete base install) @@ -1087,7 +880,7 @@ R CMD javareconf \ * Mon Jul 11 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-1 - update to 2.13.1 -* Thu Apr 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.0-1 +* Tue Apr 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.0-1 - update to 2.13.0 - add convenience symlink for include directory (bz 688295) @@ -1310,7 +1103,7 @@ R CMD javareconf \ * Sun Oct 15 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.0-1 - bump for 2.4.0 -* Wed Sep 12 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.3.1-2 +* Tue Sep 12 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.3.1-2 - bump for FC-6 * Fri Jun 2 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.3.1-1 @@ -1418,7 +1211,7 @@ R CMD javareconf \ - Modified BuildRequires so we can support older Red Hat versions without defining any macros. -* Mon Jun 23 2004 Martyn Plummer <plummner(a)iarc.fr> 0:1.9.1-0.fdr.2 +* Wed Jun 23 2004 Martyn Plummer <plummner(a)iarc.fr> 0:1.9.1-0.fdr.2 - Added libtermcap-devel as BuildRequires for RH 8.0 and 9. Without this we get no readline support. @@ -1429,7 +1222,7 @@ R CMD javareconf \ * Mon Jun 14 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.4 - Added XFree86-devel as conditional BuildRequires for rh9, rh80 -* Wed Jun 08 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.3 +* Tue Jun 08 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.3 - Corrected names for fc1/fc2/el3 when using conditional BuildRequires - Configure searches for C++ preprocessor and fails if we don't have gcc-c++ installed. Added to BuildRequires for FC2. @@ -1439,7 +1232,7 @@ R CMD javareconf \ from R 1.9.1; patch supplied by Graeme Ambler) - Changed permissions of source files to 644 to please rpmlint -* Tue May 03 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.1 +* Mon May 03 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.1 - R.spec file now has mode 644. Previously it was unreadable by other users and this was causing a crash building under mach. - Changed version number to conform to Fedora conventions. @@ -1462,7 +1255,7 @@ R CMD javareconf \ - Folded info installation into %%makeinstall - Check that RPM_BASE_ROOT is not set to "/" before cleaning up -* Thu Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> +* Tue Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> - Removed tcl-devel from BuildRequires * Tue Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> diff --git a/sources b/sources index f29cb5e..282054a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -346d16bab26fcae15e53755be8a69b00 R-2.15.2.tar.gz +5fb80535b0e144a978f67aa2158015de R-3.0.0.tar.gz commit e832ac1d8602a2d1cbc383d467014d714794843d Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Apr 17 21:16:15 2013 -0400 R3 diff --git a/R.spec b/R.spec index be2521f..c17b257 100644 --- a/R.spec +++ b/R.spec @@ -4,12 +4,23 @@ %define java_arch %{_arch} %endif +# Assume not modern. Override if needed. +%global modern 0 + +%if 0%{?fedora} +%global modern 1 +%endif + +%if 0%{?rhel} >= 6 +%global modern 1 +%endif + Name: R -Version: 2.15.2 -Release: 1%{?dist} +Version: 3.0.0 +Release: 2%{?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 +Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh License: GPLv2+ @@ -20,15 +31,30 @@ BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel -BuildRequires: java-1.4.2-gcj-compat, lapack-devel +%if %{modern} +BuildRequires: java-1.5.0-gcj +%else +BuildRequires: java-1.4.2-gcj-compat +%endif +BuildRequires: lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel -BuildRequires: gcc-objc, pango-devel +BuildRequires: gcc-objc, pango-devel, xz-devel +%if %{modern} +BuildRequires: libicu-devel +%endif BuildRequires: less +%if 0%{?fedora} >= 18 +BuildRequires: tex(inconsolata.sty) +%endif # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath Requires: libRmath-devel = %{version}-%{release} +%if %{modern} +# Pull in Java bits (if you don't want this, use R-core) +Requires: R-java = %{version}-%{release} +%endif %description This is a metapackage that provides both core R userspace and @@ -51,37 +77,42 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups -Requires: perl, sed, gawk, tex(latex), less, vim-minimal +%if %{modern} +Requires: tex(dvips), vi +%else +Requires: vim-minimal +%endif +Requires: perl, sed, gawk, tex(latex), less # These are the submodules that R-core 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.3.7 -Provides: R-class = 7.3.5 -Provides: R-cluster = 1.14.3 +Provides: R-boot = 1.3.9 +Provides: R-class = 7.3.7 +Provides: R-cluster = 1.14.4 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.51 +Provides: R-foreign = 0.8.53 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.8 -Provides: R-lattice = 0.20.10 -Provides: R-MASS = 7.3.22 -Provides: R-Matrix = 1.0.9 +Provides: R-KernSmooth = 2.23.10 +Provides: R-lattice = 0.20.15 +Provides: R-MASS = 7.3.26 +Provides: R-Matrix = 1.0.12 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.7.22 -Provides: R-nlme = 3.1.105 -Provides: R-nnet = 7.3.5 +Provides: R-nlme = 3.1.109 +Provides: R-nnet = 7.3.6 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.55 -Provides: R-spatial = 7.3.5 +Provides: R-rpart = 4.1.1 +Provides: R-spatial = 7.3.6 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.14 +Provides: R-survival = 2.37.4 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -100,19 +131,84 @@ add additional functionality by defining new functions. For computationally intensive tasks, C, C++ and Fortran code can be linked and called at run time. -%package devel -Summary: Files for development of R packages +%package core-devel +Summary: Core files for development of R packages (no Java) Group: Applications/Engineering Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version -Requires: gcc-c++, gcc-gfortran, tex(latex) +Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel -Requires: tcl-devel, tk-devel, pkgconfig, texinfo-tex -Provides: R-Matrix-devel = 1.0.9 +Requires: tcl-devel, tk-devel, pkgconfig +# TeX files needed +%if 0%{?fedora} >= 18 +Requires: tex(ecrm1000.tfm) +Requires: tex(inconsolata.sty) +Requires: tex(ptmr8t.tfm) +Requires: tex(ptmb8t.tfm) +Requires: tex(pcrr8t.tfm) +Requires: tex(phvr8t.tfm) +Requires: tex(ptmri8t.tfm) +Requires: tex(ptmro8t.tfm) +Requires: tex(cm-super-ts1.enc) +%endif +Provides: R-Matrix-devel = 1.0.12 Obsoletes: R-Matrix-devel < 0.999375-7 +%if %{modern} +%description core-devel +Install R-core-devel if you are going to develop or compile R packages. +This package does not configure the R environment for Java, install +R-java-devel if you want this. +%else +%description core-devel +Install R-core-devel if you are going to develop or compile R packages. +%endif + +%package devel +Summary: Full R development environment metapackage +Requires: R-core-devel = %{version}-%{release} +%if %{modern} +Requires: R-java-devel = %{version}-%{release} +%endif + %description devel -Install R-devel if you are going to develop or compile R packages. +This is a metapackage to install a complete (with Java) R development +environment. + +%if %{modern} +%package java +Summary: R with Fedora provided Java Runtime Environment +Group: Applications/Engineering +Requires(post): R-core = %{version}-%{release} +Requires(post): java + +%description java +A language and environment for statistical computing and graphics. +R is similar to the award-winning S system, which was developed at +Bell Laboratories by John Chambers et al. It provides a wide +variety of statistical and graphical techniques (linear and +nonlinear modelling, statistical tests, time series analysis, +classification, clustering, ...). + +R is designed as a true computer language with control-flow +constructions for iteration and alternation, and it allows users to +add additional functionality by defining new functions. For +computationally intensive tasks, C, C++ and Fortran code can be linked +and called at run time. + +This package also has an additional dependency on java, as provided by +Fedora's openJDK. + +%package java-devel +Summary: Development package for use with Java enabled R components +Group: Applications/Engineering +Requires(post): R-core-devel = %{version}-%{release} +Requires(post): java-devel + +%description java-devel +Install R-java-devel if you are going to develop or compile R packages +that assume java is present and configured on the system. +%endif %package -n libRmath Summary: Standalone math library from the R project @@ -164,15 +260,14 @@ chmod +x %{__perl_requires} %build # 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" -export R_BROWSER="%{_bindir}/xdg-open" # No inconsolata on RHEL tex %if 0%{?rhel} export R_RD4PDF="times,hyper" sed -i 's|inconsolata,||g' etc/Renviron.in %endif +export R_PDFVIEWER="%{_bindir}/xdg-open" +export R_PRINTCMD="lpr" +export R_BROWSER="%{_bindir}/xdg-open" case "%{_target_cpu}" in x86_64|mips64|ppc64|powerpc64|sparc64|s390x) @@ -226,7 +321,8 @@ for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admi done %install -make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf +make DESTDIR=${RPM_BUILD_ROOT} install install-info +make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old @@ -283,61 +379,33 @@ popd %defattr(-, root, root, -) %{_bindir}/R %{_bindir}/Rscript -%dir %{_datadir}/R/ -%{_datadir}/R/encodings/ -%{_datadir}/R/java/ -%{_datadir}/R/library/ -%{_datadir}/R/licenses/ -%dir %{_datadir}/R/locale/ -%lang(da) %{_datadir}/R/locale/da/ -%lang(de) %{_datadir}/R/locale/de/ -%lang(en) %{_datadir}/R/locale/en*/ -%lang(es) %{_datadir}/R/locale/es*/ -%lang(fr) %{_datadir}/R/locale/fr/ -%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(pl) %{_datadir}/R/locale/pl/ -%lang(pt) %{_datadir}/R/locale/pt*/ -%lang(ru) %{_datadir}/R/locale/ru/ -%lang(tr) %{_datadir}/R/locale/tr/ -%lang(zh) %{_datadir}/R/locale/zh*/ -%{_datadir}/R/make/ -%{_datadir}/R/R/ -%{_datadir}/R/sh/ -%{_datadir}/R/texmf/ +%{_datadir}/R/ %{_datadir}/texmf/ -%dir %{_libdir}/R -%{_libdir}/R/bin -%{_libdir}/R/etc -%{_libdir}/R/lib # Have to break this out for the translations -%dir %{_libdir}/R/library +%dir %{_libdir}/R/ +%{_libdir}/R/bin/ +%{_libdir}/R/etc/ +%{_libdir}/R/lib/ +%dir %{_libdir}/R/library/ +%dir %{_libdir}/R/library/translations/ +%{_libdir}/R/library/translations/DESCRIPTION +%lang(da) %{_libdir}/R/library/translations/da/ +%lang(de) %{_libdir}/R/library/translations/de/ +%lang(en) %{_libdir}/R/library/translations/en*/ +%lang(es) %{_libdir}/R/library/translations/es/ +%lang(fa) %{_libdir}/R/library/translations/fa/ +%lang(fr) %{_libdir}/R/library/translations/fr/ +%lang(it) %{_libdir}/R/library/translations/it/ +%lang(ja) %{_libdir}/R/library/translations/ja/ +%lang(ko) %{_libdir}/R/library/translations/ko/ +%lang(nn) %{_libdir}/R/library/translations/nn/ +%lang(pl) %{_libdir}/R/library/translations/pl/ +%lang(pt) %{_libdir}/R/library/translations/pt*/ +%lang(ru) %{_libdir}/R/library/translations/ru/ +%lang(tr) %{_libdir}/R/library/translations/tr/ +%lang(zh) %{_libdir}/R/library/translations/zh*/ # base -%dir %{_libdir}/R/library/base/ -%{_libdir}/R/library/base/CITATION -%{_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/Meta/ -%dir %{_libdir}/R/library/base/po/ -%lang(da) %{_libdir}/R/library/base/po/da/ -%lang(de) %{_libdir}/R/library/base/po/de/ -%lang(en) %{_libdir}/R/library/base/po/en*/ -%lang(fr) %{_libdir}/R/library/base/po/fr/ -%lang(it) %{_libdir}/R/library/base/po/it/ -%lang(ja) %{_libdir}/R/library/base/po/ja/ -%lang(ko) %{_libdir}/R/library/base/po/ko/ -%lang(nn) %{_libdir}/R/library/base/po/nn/ -%lang(pl) %{_libdir}/R/library/base/po/pl/ -%lang(pt) %{_libdir}/R/library/base/po/pt*/ -%lang(ru) %{_libdir}/R/library/base/po/ru/ -%lang(tr) %{_libdir}/R/library/base/po/tr/ -%lang(zh) %{_libdir}/R/library/base/po/zh*/ -%{_libdir}/R/library/base/R/ +%{_libdir}/R/library/base/ # boot %dir %{_libdir}/R/library/boot/ %{_libdir}/R/library/boot/CITATION @@ -352,6 +420,7 @@ popd %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(ko) %{_libdir}/R/library/boot/po/ko/ %lang(pl) %{_libdir}/R/library/boot/po/pl/ %lang(ru) %{_libdir}/R/library/boot/po/ru/ %{_libdir}/R/library/boot/R/ @@ -371,6 +440,7 @@ popd %lang(de) %{_libdir}/R/library/class/po/de/ %lang(en) %{_libdir}/R/library/class/po/en*/ %lang(fr) %{_libdir}/R/library/class/po/fr/ +%lang(ko) %{_libdir}/R/library/class/po/ko/ %lang(pl) %{_libdir}/R/library/class/po/pl/ %{_libdir}/R/library/class/R/ # cluster @@ -399,43 +469,18 @@ popd %{_libdir}/R/library/codetools/NAMESPACE %{_libdir}/R/library/codetools/R/ # compiler -%dir %{_libdir}/R/library/compiler/ -%{_libdir}/R/library/compiler/DESCRIPTION -%{_libdir}/R/library/compiler/help/ -%{_libdir}/R/library/compiler/html/ -%{_libdir}/R/library/compiler/INDEX -%{_libdir}/R/library/compiler/Meta/ -%{_libdir}/R/library/compiler/NAMESPACE -%{_libdir}/R/library/compiler/R/ -%dir %{_libdir}/R/library/compiler/po/ -%lang(da) %{_libdir}/R/library/compiler/po/da/ -%lang(de) %{_libdir}/R/library/compiler/po/de/ -%lang(en) %{_libdir}/R/library/compiler/po/en*/ -%lang(fr) %{_libdir}/R/library/compiler/po/fr/ -%lang(ja) %{_libdir}/R/library/compiler/po/ja/ -%lang(ko) %{_libdir}/R/library/compiler/po/ko/ -%lang(pl) %{_libdir}/R/library/compiler/po/pl/ -%lang(pt) %{_libdir}/R/library/compiler/po/pt*/ -%lang(ru) %{_libdir}/R/library/compiler/po/ru/ -%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ +%{_libdir}/R/library/compiler/ # datasets -%dir %{_libdir}/R/library/datasets/ -%{_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/Meta/ -%{_libdir}/R/library/datasets/NAMESPACE +%{_libdir}/R/library/datasets/ # foreign %dir %{_libdir}/R/library/foreign/ +%{_libdir}/R/library/foreign/COPYRIGHTS %{_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/libs/ -%{_libdir}/R/library/foreign/LICENCE %{_libdir}/R/library/foreign/Meta/ %{_libdir}/R/library/foreign/NAMESPACE %dir %{_libdir}/R/library/foreign/po/ @@ -445,75 +490,11 @@ popd %lang(pl) %{_libdir}/R/library/foreign/po/pl/ %{_libdir}/R/library/foreign/R/ # graphics -%dir %{_libdir}/R/library/graphics/ -%{_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/Meta/ -%{_libdir}/R/library/graphics/NAMESPACE -%dir %{_libdir}/R/library/graphics/po/ -%lang(da) %{_libdir}/R/library/graphics/po/da/ -%lang(de) %{_libdir}/R/library/graphics/po/de/ -%lang(en) %{_libdir}/R/library/graphics/po/en*/ -%lang(fr) %{_libdir}/R/library/graphics/po/fr/ -%lang(it) %{_libdir}/R/library/graphics/po/it/ -%lang(ja) %{_libdir}/R/library/graphics/po/ja/ -%lang(ko) %{_libdir}/R/library/graphics/po/ko/ -%lang(pl) %{_libdir}/R/library/graphics/po/pl/ -%lang(pt) %{_libdir}/R/library/graphics/po/pt*/ -%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/ # grDevices -%dir %{_libdir}/R/library/grDevices -%{_libdir}/R/library/grDevices/afm/ -%{_libdir}/R/library/grDevices/DESCRIPTION -%{_libdir}/R/library/grDevices/enc/ -%{_libdir}/R/library/grDevices/help/ -%{_libdir}/R/library/grDevices/html/ -%{_libdir}/R/library/grDevices/icc/ -%{_libdir}/R/library/grDevices/INDEX -%{_libdir}/R/library/grDevices/libs/ -%{_libdir}/R/library/grDevices/Meta/ -%{_libdir}/R/library/grDevices/NAMESPACE -%dir %{_libdir}/R/library/grDevices/po/ -%lang(da) %{_libdir}/R/library/grDevices/po/da/ -%lang(de) %{_libdir}/R/library/grDevices/po/de/ -%lang(en) %{_libdir}/R/library/grDevices/po/en*/ -%lang(fr) %{_libdir}/R/library/grDevices/po/fr/ -%lang(it) %{_libdir}/R/library/grDevices/po/it/ -%lang(ja) %{_libdir}/R/library/grDevices/po/ja/ -%lang(ko) %{_libdir}/R/library/grDevices/po/ko/ -%lang(pl) %{_libdir}/R/library/grDevices/po/pl/ -%lang(pt) %{_libdir}/R/library/grDevices/po/pt*/ -%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 # grid -%dir %{_libdir}/R/library/grid/ -%{_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/libs/ -%{_libdir}/R/library/grid/Meta/ -%{_libdir}/R/library/grid/NAMESPACE -%dir %{_libdir}/R/library/grid/po/ -%lang(da) %{_libdir}/R/library/grid/po/da/ -%lang(de) %{_libdir}/R/library/grid/po/de/ -%lang(en) %{_libdir}/R/library/grid/po/en*/ -%lang(fr) %{_libdir}/R/library/grid/po/fr*/ -%lang(it) %{_libdir}/R/library/grid/po/it/ -%lang(ja) %{_libdir}/R/library/grid/po/ja/ -%lang(ko) %{_libdir}/R/library/grid/po/ko/ -%lang(pl) %{_libdir}/R/library/grid/po/pl/ -%lang(pt) %{_libdir}/R/library/grid/po/pt*/ -%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/ # KernSmooth %dir %{_libdir}/R/library/KernSmooth/ %{_libdir}/R/library/KernSmooth/DESCRIPTION @@ -521,12 +502,12 @@ popd %{_libdir}/R/library/KernSmooth/html/ %{_libdir}/R/library/KernSmooth/INDEX %{_libdir}/R/library/KernSmooth/libs/ -%{_libdir}/R/library/KernSmooth/LICENCE %{_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*/ +%lang(ko) %{_libdir}/R/library/KernSmooth/po/ko/ %lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/ %{_libdir}/R/library/KernSmooth/R/ # lattice @@ -539,7 +520,6 @@ popd %{_libdir}/R/library/lattice/html/ %{_libdir}/R/library/lattice/INDEX %{_libdir}/R/library/lattice/libs/ -%{_libdir}/R/library/lattice/LICENSE %{_libdir}/R/library/lattice/Meta/ %{_libdir}/R/library/lattice/NAMESPACE %{_libdir}/R/library/lattice/NEWS @@ -565,6 +545,7 @@ popd %lang(de) %{_libdir}/R/library/MASS/po/de/ %lang(en) %{_libdir}/R/library/MASS/po/en*/ %lang(fr) %{_libdir}/R/library/MASS/po/fr/ +%lang(ko) %{_libdir}/R/library/MASS/po/ko/ %lang(pl) %{_libdir}/R/library/MASS/po/pl/ %{_libdir}/R/library/MASS/R/ %{_libdir}/R/library/MASS/scripts/ @@ -592,38 +573,9 @@ popd %{_libdir}/R/library/Matrix/test-tools-1.R %{_libdir}/R/library/Matrix/test-tools-Matrix.R # methods -%dir %{_libdir}/R/library/methods/ -%{_libdir}/R/library/methods/DESCRIPTION -%{_libdir}/R/library/methods/help/ -%{_libdir}/R/library/methods/html/ -%{_libdir}/R/library/methods/INDEX -%{_libdir}/R/library/methods/libs/ -%{_libdir}/R/library/methods/Meta/ -%{_libdir}/R/library/methods/NAMESPACE -%dir %{_libdir}/R/library/methods/po/ -%lang(da) %{_libdir}/R/library/methods/po/da/ -%lang(de) %{_libdir}/R/library/methods/po/de/ -%lang(en) %{_libdir}/R/library/methods/po/en*/ -%lang(fr) %{_libdir}/R/library/methods/po/fr/ -%lang(ja) %{_libdir}/R/library/methods/po/ja/ -%lang(ko) %{_libdir}/R/library/methods/po/ko/ -%lang(pl) %{_libdir}/R/library/methods/po/pl/ -%lang(pt) %{_libdir}/R/library/methods/po/pt*/ -%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/ # mgcv -%dir %{_libdir}/R/library/mgcv/ -%{_libdir}/R/library/mgcv/CITATION -%{_libdir}/R/library/mgcv/DESCRIPTION -%{_libdir}/R/library/mgcv/data/ -%{_libdir}/R/library/mgcv/help/ -%{_libdir}/R/library/mgcv/html/ -%{_libdir}/R/library/mgcv/INDEX -%{_libdir}/R/library/mgcv/libs/ -%{_libdir}/R/library/mgcv/Meta/ -%{_libdir}/R/library/mgcv/NAMESPACE -%{_libdir}/R/library/mgcv/R/ +%{_libdir}/R/library/mgcv/ # nlme %dir %{_libdir}/R/library/nlme/ %{_libdir}/R/library/nlme/CITATION @@ -660,42 +612,28 @@ popd %lang(de) %{_libdir}/R/library/nnet/po/de/ %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ +%lang(ko) %{_libdir}/R/library/nnet/po/ko/ %lang(pl) %{_libdir}/R/library/nnet/po/pl/ %{_libdir}/R/library/nnet/R/ # parallel -%dir %{_libdir}/R/library/parallel/ -%{_libdir}/R/library/parallel/DESCRIPTION -%{_libdir}/R/library/parallel/doc/ -%{_libdir}/R/library/parallel/help/ -%{_libdir}/R/library/parallel/html/ -%{_libdir}/R/library/parallel/INDEX -%{_libdir}/R/library/parallel/libs/ -%{_libdir}/R/library/parallel/Meta/ -%{_libdir}/R/library/parallel/NAMESPACE -%dir %{_libdir}/R/library/parallel/po -%lang(da) %{_libdir}/R/library/parallel/po/da/ -%lang(de) %{_libdir}/R/library/parallel/po/de/ -%lang(en) %{_libdir}/R/library/parallel/po/en*/ -%lang(fr) %{_libdir}/R/library/parallel/po/fr/ -%lang(ko) %{_libdir}/R/library/parallel/po/ko/ -%lang(pl) %{_libdir}/R/library/parallel/po/pl/ -%lang(ru) %{_libdir}/R/library/parallel/po/ru/ -%lang(zh) %{_libdir}/R/library/parallel/po/zh*/ -%{_libdir}/R/library/parallel/R/ +%{_libdir}/R/library/parallel/ # rpart %dir %{_libdir}/R/library/rpart/ %{_libdir}/R/library/rpart/data/ %{_libdir}/R/library/rpart/DESCRIPTION +%{_libdir}/R/library/rpart/doc/ %{_libdir}/R/library/rpart/help/ %{_libdir}/R/library/rpart/html/ %{_libdir}/R/library/rpart/INDEX %{_libdir}/R/library/rpart/libs/ %{_libdir}/R/library/rpart/Meta/ %{_libdir}/R/library/rpart/NAMESPACE +%{_libdir}/R/library/rpart/NEWS.Rd %dir %{_libdir}/R/library/rpart/po %lang(de) %{_libdir}/R/library/rpart/po/de/ %lang(en) %{_libdir}/R/library/rpart/po/en*/ %lang(fr) %{_libdir}/R/library/rpart/po/fr/ +%lang(ko) %{_libdir}/R/library/rpart/po/ko/ %lang(pl) %{_libdir}/R/library/rpart/po/pl/ %lang(ru) %{_libdir}/R/library/rpart/po/ru/ %{_libdir}/R/library/rpart/R/ @@ -720,160 +658,19 @@ popd %{_libdir}/R/library/spatial/PP.files %{_libdir}/R/library/spatial/R/ # splines -%dir %{_libdir}/R/library/splines/ -%{_libdir}/R/library/splines/DESCRIPTION -%{_libdir}/R/library/splines/help/ -%{_libdir}/R/library/splines/html/ -%{_libdir}/R/library/splines/INDEX -%{_libdir}/R/library/splines/libs/ -%{_libdir}/R/library/splines/Meta/ -%{_libdir}/R/library/splines/NAMESPACE -%dir %{_libdir}/R/library/splines/po -%lang(da) %{_libdir}/R/library/splines/po/da/ -%lang(de) %{_libdir}/R/library/splines/po/de/ -%lang(en) %{_libdir}/R/library/splines/po/en*/ -%lang(fr) %{_libdir}/R/library/splines/po/fr/ -%lang(ja) %{_libdir}/R/library/splines/po/ja/ -%lang(ko) %{_libdir}/R/library/splines/po/ko/ -%lang(pl) %{_libdir}/R/library/splines/po/pl/ -%lang(pt) %{_libdir}/R/library/splines/po/pt*/ -%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/ # stats -%dir %{_libdir}/R/library/stats/ -%{_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/libs/ -%{_libdir}/R/library/stats/Meta/ -%{_libdir}/R/library/stats/NAMESPACE -%dir %{_libdir}/R/library/stats/po -%lang(da) %{_libdir}/R/library/stats/po/da/ -%lang(de) %{_libdir}/R/library/stats/po/de/ -%lang(en) %{_libdir}/R/library/stats/po/en*/ -%lang(fr) %{_libdir}/R/library/stats/po/fr/ -%lang(it) %{_libdir}/R/library/stats/po/it/ -%lang(ja) %{_libdir}/R/library/stats/po/ja/ -%lang(ko) %{_libdir}/R/library/stats/po/ko/ -%lang(pl) %{_libdir}/R/library/stats/po/pl/ -%lang(pt) %{_libdir}/R/library/stats/po/pt*/ -%lang(ru) %{_libdir}/R/library/stats/po/ru/ -%lang(tr) %{_libdir}/R/library/stats/po/tr/ -%lang(zh) %{_libdir}/R/library/stats/po/zh*/ -%{_libdir}/R/library/stats/R/ -%{_libdir}/R/library/stats/SOURCES.ts +%{_libdir}/R/library/stats/ # stats4 -%dir %{_libdir}/R/library/stats4/ -%{_libdir}/R/library/stats4/DESCRIPTION -%{_libdir}/R/library/stats4/help/ -%{_libdir}/R/library/stats4/html/ -%{_libdir}/R/library/stats4/INDEX -%{_libdir}/R/library/stats4/Meta/ -%{_libdir}/R/library/stats4/NAMESPACE -%dir %{_libdir}/R/library/stats4/po -%lang(da) %{_libdir}/R/library/stats4/po/da/ -%lang(de) %{_libdir}/R/library/stats4/po/de/ -%lang(en) %{_libdir}/R/library/stats4/po/en*/ -%lang(fr) %{_libdir}/R/library/stats4/po/fr/ -%lang(it) %{_libdir}/R/library/stats4/po/it/ -%lang(ja) %{_libdir}/R/library/stats4/po/ja/ -%lang(ko) %{_libdir}/R/library/stats4/po/ko/ -%lang(pl) %{_libdir}/R/library/stats4/po/pl/ -%lang(pt) %{_libdir}/R/library/stats4/po/pt*/ -%lang(ru) %{_libdir}/R/library/stats4/po/ru/ -%lang(tr) %{_libdir}/R/library/stats4/po/tr/ -%lang(zh) %{_libdir}/R/library/stats4/po/zh*/ -%{_libdir}/R/library/stats4/R/ +%{_libdir}/R/library/stats4/ # survival -%dir %{_libdir}/R/library/survival/ -%{_libdir}/R/library/survival/data/ -%{_libdir}/R/library/survival/CITATION -%{_libdir}/R/library/survival/DESCRIPTION -%{_libdir}/R/library/survival/doc/ -%{_libdir}/R/library/survival/help/ -%{_libdir}/R/library/survival/html/ -%{_libdir}/R/library/survival/INDEX -%{_libdir}/R/library/survival/libs/ -%{_libdir}/R/library/survival/Meta/ -%{_libdir}/R/library/survival/NAMESPACE -%{_libdir}/R/library/survival/NEWS.Rd -%{_libdir}/R/library/survival/R/ +%{_libdir}/R/library/survival/ # tcltk -%dir %{_libdir}/R/library/tcltk/ -%{_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/libs/ -%{_libdir}/R/library/tcltk/Meta/ -%{_libdir}/R/library/tcltk/NAMESPACE -%dir %{_libdir}/R/library/tcltk/po/ -%lang(da) %{_libdir}/R/library/tcltk/po/da/ -%lang(de) %{_libdir}/R/library/tcltk/po/de/ -%lang(en) %{_libdir}/R/library/tcltk/po/en*/ -%lang(fr) %{_libdir}/R/library/tcltk/po/fr/ -%lang(it) %{_libdir}/R/library/tcltk/po/it/ -%lang(ja) %{_libdir}/R/library/tcltk/po/ja/ -%lang(ko) %{_libdir}/R/library/tcltk/po/ko/ -%lang(pl) %{_libdir}/R/library/tcltk/po/pl/ -%lang(pt) %{_libdir}/R/library/tcltk/po/pt*/ -%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/ # tools -%dir %{_libdir}/R/library/tools/ -%{_libdir}/R/library/tools/DESCRIPTION -%{_libdir}/R/library/tools/help/ -%{_libdir}/R/library/tools/html/ -%{_libdir}/R/library/tools/INDEX -%{_libdir}/R/library/tools/libs/ -%{_libdir}/R/library/tools/Meta/ -%{_libdir}/R/library/tools/NAMESPACE -%dir %{_libdir}/R/library/tools/po -%lang(da) %{_libdir}/R/library/tools/po/da/ -%lang(de) %{_libdir}/R/library/tools/po/de/ -%lang(en) %{_libdir}/R/library/tools/po/en*/ -%lang(fr) %{_libdir}/R/library/tools/po/fr/ -%lang(it) %{_libdir}/R/library/tools/po/it/ -%lang(ja) %{_libdir}/R/library/tools/po/ja/ -%lang(ko) %{_libdir}/R/library/tools/po/ko/ -%lang(pl) %{_libdir}/R/library/tools/po/pl/ -%lang(pt) %{_libdir}/R/library/tools/po/pt*/ -%lang(ru) %{_libdir}/R/library/tools/po/ru/ -%lang(tr) %{_libdir}/R/library/tools/po/tr/ -%lang(zh) %{_libdir}/R/library/tools/po/zh*/ -%{_libdir}/R/library/tools/R/ +%{_libdir}/R/library/tools/ # utils -%dir %{_libdir}/R/library/utils/ -%{_libdir}/R/library/utils/DESCRIPTION -%{_libdir}/R/library/utils/doc/ -%{_libdir}/R/library/utils/help/ -%{_libdir}/R/library/utils/html/ -%{_libdir}/R/library/utils/iconvlist -%{_libdir}/R/library/utils/INDEX -%{_libdir}/R/library/utils/Meta/ -%{_libdir}/R/library/utils/misc/ -%{_libdir}/R/library/utils/NAMESPACE -%dir %{_libdir}/R/library/utils/po -%lang(da) %{_libdir}/R/library/utils/po/da/ -%lang(de) %{_libdir}/R/library/utils/po/de/ -%lang(en) %{_libdir}/R/library/utils/po/en*/ -%lang(fr) %{_libdir}/R/library/utils/po/fr/ -%lang(ja) %{_libdir}/R/library/utils/po/ja/ -%lang(ko) %{_libdir}/R/library/utils/po/ko/ -%lang(pl) %{_libdir}/R/library/utils/po/pl/ -%lang(pt) %{_libdir}/R/library/utils/po/pt*/ -%lang(ru) %{_libdir}/R/library/utils/po/ru/ -%lang(tr) %{_libdir}/R/library/utils/po/tr/ -%lang(zh) %{_libdir}/R/library/utils/po/zh*/ -%{_libdir}/R/library/utils/R/ -%{_libdir}/R/library/utils/Sweave/ +%{_libdir}/R/library/utils/ %{_libdir}/R/modules %{_libdir}/R/COPYING %{_libdir}/R/NEWS* @@ -886,13 +683,24 @@ popd %docdir %{_docdir}/R-%{version} /etc/ld.so.conf.d/* -%files devel +%files core-devel %defattr(-, root, root, -) %{_libdir}/pkgconfig/libR.pc %{_includedir}/R # Symlink to %{_includedir}/R/ %{_libdir}/R/include +%files devel +# Nothing, all files provided by R-core-devel + +%if %{modern} +%files java +# Nothing, all files provided by R-core + +%files java-devel +# Nothing, all files provided by R-core-devel +%endif + %files -n libRmath %defattr(-, root, root, -) %doc doc/COPYING @@ -962,13 +770,64 @@ fi %posttrans core /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : +%if %{modern} +%post java +R CMD javareconf \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + 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 + +%post java-devel +R CMD javareconf \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + 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 +%endif + %post -n libRmath -p /sbin/ldconfig %postun -n libRmath -p /sbin/ldconfig %changelog +* Sat Apr 13 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.0-2 +- add Requires: tex(inconsolata.sty) to -core-devel to fix module PDF building + +* Fri Apr 5 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.0.0-1 +- update to 3.0.0 + +* Wed Feb 27 2013 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-7 +- add BuildRequires: xz-devel (for system xz/lzma support) +- create R-core-devel + +* Sat Jan 26 2013 Kevin Fenzi <kevin(a)scrye.com> - 2.15.2-6 +- Rebuild for new icu + +* Sun Jan 20 2013 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-5 +- apply upstream fix for cairo issues (bz 891983) + +* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 2.15.2-4 +- rebuild due to "jpeg8-ABI" feature drop + +* Tue Nov 27 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-3 +- add Requires: tex(cm-super-ts1.enc) for R-devel + +* Tue Nov 27 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-2 +- add additional TeX font requirements to R-devel for Fedora 18+ (due to new texlive) + * Mon Oct 29 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-1 - update to 2.15.2 +- R now Requires: R-java (for a more complete base install) + +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.15.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild * Mon Jul 2 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.1-1 - update to 2.15.1 @@ -976,9 +835,21 @@ fi * Mon Jul 2 2012 Jindrich Novy <jnovy(a)redhat.com> - 2.15.0-4 - fix LaTeX and dvips dependencies (#836817) +* Mon May 7 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-3 +- rebuild for new libtiff + +* Tue Apr 24 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-2 +- rebuild for new icu + * Fri Mar 30 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-1 - Update to 2.15.0 +* Fri Feb 10 2012 Petr Pisar <ppisar(a)redhat.com> - 2.14.1-3 +- Rebuild against PCRE 8.30 + +* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Jan 4 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.14.1-1 - update to 2.14.1 @@ -991,6 +862,12 @@ fi * Wed Nov 2 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-1 - update to 2.14.0 +* Fri Oct 7 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.2-1 +- update to 2.13.2 + +* Mon Sep 12 2011 Michel Salim <salimma(a)fedoraproject.org> - 2.13.1-5 +- rebuild for libicu 4.8.x + * Tue Aug 9 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-4 - fix salimma's scriptlets to be on -core instead of the metapackage @@ -1003,14 +880,20 @@ fi * Mon Jul 11 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-1 - update to 2.13.1 -* Thu Apr 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.0-1 +* Tue Apr 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.0-1 - update to 2.13.0 - add convenience symlink for include directory (bz 688295) +* Mon Mar 07 2011 Caoln McNamara <caolanm(a)redhat.com> - 2.12.2-2 +- rebuild for icu 4.6 + * Sun Feb 27 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.12.2-1 - update to 2.12.2 -* Mon Dec 20 2010 Tom Callaway <spot(a)fedoraproject.org> - 2.12.1-1 +* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 17 2010 Tom Callaway <spot(a)fedoraproject.org> - 2.12.1-1 - update to 2.12.1 * Wed Oct 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.12.0-1 @@ -1031,6 +914,9 @@ fi * Thu Apr 22 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.0-1 - update to 2.11.0 +* Fri Apr 02 2010 Caoln McNamara <caolanm(a)redhat.com> - 2.10.1-2 +- rebuild for icu 4.4 + * Mon Dec 21 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.10.1-1 - update to 2.10.1 - enable static html pages @@ -1217,7 +1103,7 @@ fi * Sun Oct 15 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.0-1 - bump for 2.4.0 -* Wed Sep 12 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.3.1-2 +* Tue Sep 12 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.3.1-2 - bump for FC-6 * Fri Jun 2 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.3.1-1 @@ -1325,7 +1211,7 @@ fi - Modified BuildRequires so we can support older Red Hat versions without defining any macros. -* Mon Jun 23 2004 Martyn Plummer <plummner(a)iarc.fr> 0:1.9.1-0.fdr.2 +* Wed Jun 23 2004 Martyn Plummer <plummner(a)iarc.fr> 0:1.9.1-0.fdr.2 - Added libtermcap-devel as BuildRequires for RH 8.0 and 9. Without this we get no readline support. @@ -1336,7 +1222,7 @@ fi * Mon Jun 14 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.4 - Added XFree86-devel as conditional BuildRequires for rh9, rh80 -* Wed Jun 08 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.3 +* Tue Jun 08 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.3 - Corrected names for fc1/fc2/el3 when using conditional BuildRequires - Configure searches for C++ preprocessor and fails if we don't have gcc-c++ installed. Added to BuildRequires for FC2. @@ -1346,7 +1232,7 @@ fi from R 1.9.1; patch supplied by Graeme Ambler) - Changed permissions of source files to 644 to please rpmlint -* Tue May 03 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.1 +* Mon May 03 2004 Martyn Plummer <plummer(a)iarc.fr> 0:1.9.0-0.fdr.1 - R.spec file now has mode 644. Previously it was unreadable by other users and this was causing a crash building under mach. - Changed version number to conform to Fedora conventions. @@ -1369,7 +1255,7 @@ fi - Folded info installation into %%makeinstall - Check that RPM_BASE_ROOT is not set to "/" before cleaning up -* Thu Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> +* Tue Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> - Removed tcl-devel from BuildRequires * Tue Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> diff --git a/sources b/sources index f29cb5e..282054a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -346d16bab26fcae15e53755be8a69b00 R-2.15.2.tar.gz +5fb80535b0e144a978f67aa2158015de R-3.0.0.tar.gz commit 2ab725992faed13d162df312fb21e7af77a018d4 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 14:26:33 2012 -0400 2.15.2 diff --git a/R.spec b/R.spec index 21e326b..91b0311 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.15.1 +Version: 2.15.2 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -29,6 +29,8 @@ BuildRequires: less Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath Requires: libRmath-devel = %{version}-%{release} +# Pull in Java bits (if you don't want this, use R-core) +Requires: R-java = %{version}-%{release} %description This is a metapackage that provides both core R userspace and @@ -57,27 +59,27 @@ Requires: perl, sed, gawk, tex(latex), tex(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.3.4 -Provides: R-class = 7.3.3 -Provides: R-cluster = 1.14.2 +Provides: R-boot = 1.3.7 +Provides: R-class = 7.3.5 +Provides: R-cluster = 1.14.3 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.50 +Provides: R-foreign = 0.8.51 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.7 -Provides: R-lattice = 0.20.6 -Provides: R-MASS = 7.3.18 -Provides: R-Matrix = 1.0.6 +Provides: R-KernSmooth = 2.23.8 +Provides: R-lattice = 0.20.10 +Provides: R-MASS = 7.3.22 +Provides: R-Matrix = 1.0.9 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.18 -Provides: R-nlme = 3.1.104 -Provides: R-nnet = 7.3.1 +Provides: R-mgcv = 1.7.22 +Provides: R-nlme = 3.1.105 +Provides: R-nnet = 7.3.5 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.53 -Provides: R-spatial = 7.3.3 +Provides: R-rpart = 3.1.55 +Provides: R-spatial = 7.3.5 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -108,7 +110,8 @@ Requires: R-core = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig -Provides: R-Matrix-devel = 1.0.6 +Requires: R-java-devel = %{version}-%{release} +Provides: R-Matrix-devel = 1.0.9 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -364,6 +367,7 @@ popd %lang(it) %{_libdir}/R/library/base/po/it/ %lang(ja) %{_libdir}/R/library/base/po/ja/ %lang(ko) %{_libdir}/R/library/base/po/ko/ +%lang(nn) %{_libdir}/R/library/base/po/nn/ %lang(pl) %{_libdir}/R/library/base/po/pl/ %lang(pt) %{_libdir}/R/library/base/po/pt*/ %lang(ru) %{_libdir}/R/library/base/po/ru/ @@ -384,6 +388,7 @@ popd %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(pl) %{_libdir}/R/library/boot/po/pl/ %lang(ru) %{_libdir}/R/library/boot/po/ru/ %{_libdir}/R/library/boot/R/ # class @@ -402,6 +407,7 @@ popd %lang(de) %{_libdir}/R/library/class/po/de/ %lang(en) %{_libdir}/R/library/class/po/en*/ %lang(fr) %{_libdir}/R/library/class/po/fr/ +%lang(pl) %{_libdir}/R/library/class/po/pl/ %{_libdir}/R/library/class/R/ # cluster %dir %{_libdir}/R/library/cluster/ @@ -418,6 +424,7 @@ popd %dir %{_libdir}/R/library/cluster/po/ %lang(de) %{_libdir}/R/library/cluster/po/de/ %lang(en) %{_libdir}/R/library/cluster/po/en*/ +%lang(pl) %{_libdir}/R/library/cluster/po/pl/ # codetools %dir %{_libdir}/R/library/codetools/ %{_libdir}/R/library/codetools/DESCRIPTION @@ -442,6 +449,7 @@ popd %lang(en) %{_libdir}/R/library/compiler/po/en*/ %lang(fr) %{_libdir}/R/library/compiler/po/fr/ %lang(ja) %{_libdir}/R/library/compiler/po/ja/ +%lang(ko) %{_libdir}/R/library/compiler/po/ko/ %lang(pl) %{_libdir}/R/library/compiler/po/pl/ %lang(pt) %{_libdir}/R/library/compiler/po/pt*/ %lang(ru) %{_libdir}/R/library/compiler/po/ru/ @@ -470,6 +478,7 @@ popd %lang(de) %{_libdir}/R/library/foreign/po/de/ %lang(en) %{_libdir}/R/library/foreign/po/en*/ %lang(fr) %{_libdir}/R/library/foreign/po/fr/ +%lang(pl) %{_libdir}/R/library/foreign/po/pl/ %{_libdir}/R/library/foreign/R/ # graphics %dir %{_libdir}/R/library/graphics/ @@ -554,6 +563,7 @@ popd %dir %{_libdir}/R/library/KernSmooth/po/ %lang(de) %{_libdir}/R/library/KernSmooth/po/de/ %lang(en) %{_libdir}/R/library/KernSmooth/po/en*/ +%lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/ %{_libdir}/R/library/KernSmooth/R/ # lattice %dir %{_libdir}/R/library/lattice/ @@ -591,6 +601,7 @@ popd %lang(de) %{_libdir}/R/library/MASS/po/de/ %lang(en) %{_libdir}/R/library/MASS/po/en*/ %lang(fr) %{_libdir}/R/library/MASS/po/fr/ +%lang(pl) %{_libdir}/R/library/MASS/po/pl/ %{_libdir}/R/library/MASS/R/ %{_libdir}/R/library/MASS/scripts/ # Matrix @@ -611,6 +622,7 @@ popd %dir %{_libdir}/R/library/Matrix/po/ %lang(de) %{_libdir}/R/library/Matrix/po/de/ %lang(en) %{_libdir}/R/library/Matrix/po/en*/ +%lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R %{_libdir}/R/library/Matrix/test-tools-1.R @@ -665,6 +677,7 @@ popd %lang(de) %{_libdir}/R/library/nlme/po/de/ %lang(en) %{_libdir}/R/library/nlme/po/en*/ %lang(fr) %{_libdir}/R/library/nlme/po/fr/ +%lang(pl) %{_libdir}/R/library/nlme/po/pl/ %{_libdir}/R/library/nlme/R/ %{_libdir}/R/library/nlme/scripts/ # nnet @@ -683,6 +696,7 @@ popd %lang(de) %{_libdir}/R/library/nnet/po/de/ %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ +%lang(pl) %{_libdir}/R/library/nnet/po/pl/ %{_libdir}/R/library/nnet/R/ # parallel %dir %{_libdir}/R/library/parallel/ @@ -699,6 +713,7 @@ popd %lang(de) %{_libdir}/R/library/parallel/po/de/ %lang(en) %{_libdir}/R/library/parallel/po/en*/ %lang(fr) %{_libdir}/R/library/parallel/po/fr/ +%lang(ko) %{_libdir}/R/library/parallel/po/ko/ %lang(pl) %{_libdir}/R/library/parallel/po/pl/ %lang(ru) %{_libdir}/R/library/parallel/po/ru/ %lang(zh) %{_libdir}/R/library/parallel/po/zh*/ @@ -717,6 +732,7 @@ popd %lang(de) %{_libdir}/R/library/rpart/po/de/ %lang(en) %{_libdir}/R/library/rpart/po/en*/ %lang(fr) %{_libdir}/R/library/rpart/po/fr/ +%lang(pl) %{_libdir}/R/library/rpart/po/pl/ %lang(ru) %{_libdir}/R/library/rpart/po/ru/ %{_libdir}/R/library/rpart/R/ # spatial @@ -735,6 +751,7 @@ popd %lang(de) %{_libdir}/R/library/spatial/po/de/ %lang(en) %{_libdir}/R/library/spatial/po/en*/ %lang(fr) %{_libdir}/R/library/spatial/po/fr/ +%lang(pl) %{_libdir}/R/library/spatial/po/pl/ %{_libdir}/R/library/spatial/ppdata/ %{_libdir}/R/library/spatial/PP.files %{_libdir}/R/library/spatial/R/ @@ -1012,6 +1029,13 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Oct 29 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-1 +- update to 2.15.2 +- R now Requires: R-java (for a more complete base install) + +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.15.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jul 2 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.1-1 - update to 2.15.1 diff --git a/sources b/sources index 3a52f71..f29cb5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcdf247e707fdade82b78bcf911a54f1 R-2.15.1.tar.gz +346d16bab26fcae15e53755be8a69b00 R-2.15.2.tar.gz commit d015e844bbb7f3194a53b2364f98a55ef7f2ebe7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 14:23:19 2012 -0400 2.15.2 diff --git a/R.spec b/R.spec index eaba814..be2521f 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.15.1 +Version: 2.15.2 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -57,27 +57,27 @@ Requires: perl, sed, gawk, tex(latex), less, vim-minimal # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.4 -Provides: R-class = 7.3.3 -Provides: R-cluster = 1.14.2 +Provides: R-boot = 1.3.7 +Provides: R-class = 7.3.5 +Provides: R-cluster = 1.14.3 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.50 +Provides: R-foreign = 0.8.51 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.7 -Provides: R-lattice = 0.20.6 -Provides: R-MASS = 7.3.18 -Provides: R-Matrix = 1.0.6 +Provides: R-KernSmooth = 2.23.8 +Provides: R-lattice = 0.20.10 +Provides: R-MASS = 7.3.22 +Provides: R-Matrix = 1.0.9 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.18 -Provides: R-nlme = 3.1.104 -Provides: R-nnet = 7.3.1 +Provides: R-mgcv = 1.7.22 +Provides: R-nlme = 3.1.105 +Provides: R-nnet = 7.3.5 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.53 -Provides: R-spatial = 7.3.3 +Provides: R-rpart = 3.1.55 +Provides: R-spatial = 7.3.5 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -108,7 +108,7 @@ Requires: R-core = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tex(latex) Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig, texinfo-tex -Provides: R-Matrix-devel = 1.0.6 +Provides: R-Matrix-devel = 1.0.9 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -331,6 +331,7 @@ popd %lang(it) %{_libdir}/R/library/base/po/it/ %lang(ja) %{_libdir}/R/library/base/po/ja/ %lang(ko) %{_libdir}/R/library/base/po/ko/ +%lang(nn) %{_libdir}/R/library/base/po/nn/ %lang(pl) %{_libdir}/R/library/base/po/pl/ %lang(pt) %{_libdir}/R/library/base/po/pt*/ %lang(ru) %{_libdir}/R/library/base/po/ru/ @@ -351,6 +352,7 @@ popd %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(pl) %{_libdir}/R/library/boot/po/pl/ %lang(ru) %{_libdir}/R/library/boot/po/ru/ %{_libdir}/R/library/boot/R/ # class @@ -369,6 +371,7 @@ popd %lang(de) %{_libdir}/R/library/class/po/de/ %lang(en) %{_libdir}/R/library/class/po/en*/ %lang(fr) %{_libdir}/R/library/class/po/fr/ +%lang(pl) %{_libdir}/R/library/class/po/pl/ %{_libdir}/R/library/class/R/ # cluster %dir %{_libdir}/R/library/cluster/ @@ -385,6 +388,7 @@ popd %dir %{_libdir}/R/library/cluster/po/ %lang(de) %{_libdir}/R/library/cluster/po/de/ %lang(en) %{_libdir}/R/library/cluster/po/en*/ +%lang(pl) %{_libdir}/R/library/cluster/po/pl/ # codetools %dir %{_libdir}/R/library/codetools/ %{_libdir}/R/library/codetools/DESCRIPTION @@ -409,6 +413,7 @@ popd %lang(en) %{_libdir}/R/library/compiler/po/en*/ %lang(fr) %{_libdir}/R/library/compiler/po/fr/ %lang(ja) %{_libdir}/R/library/compiler/po/ja/ +%lang(ko) %{_libdir}/R/library/compiler/po/ko/ %lang(pl) %{_libdir}/R/library/compiler/po/pl/ %lang(pt) %{_libdir}/R/library/compiler/po/pt*/ %lang(ru) %{_libdir}/R/library/compiler/po/ru/ @@ -437,6 +442,7 @@ popd %lang(de) %{_libdir}/R/library/foreign/po/de/ %lang(en) %{_libdir}/R/library/foreign/po/en*/ %lang(fr) %{_libdir}/R/library/foreign/po/fr/ +%lang(pl) %{_libdir}/R/library/foreign/po/pl/ %{_libdir}/R/library/foreign/R/ # graphics %dir %{_libdir}/R/library/graphics/ @@ -521,6 +527,7 @@ popd %dir %{_libdir}/R/library/KernSmooth/po/ %lang(de) %{_libdir}/R/library/KernSmooth/po/de/ %lang(en) %{_libdir}/R/library/KernSmooth/po/en*/ +%lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/ %{_libdir}/R/library/KernSmooth/R/ # lattice %dir %{_libdir}/R/library/lattice/ @@ -558,6 +565,7 @@ popd %lang(de) %{_libdir}/R/library/MASS/po/de/ %lang(en) %{_libdir}/R/library/MASS/po/en*/ %lang(fr) %{_libdir}/R/library/MASS/po/fr/ +%lang(pl) %{_libdir}/R/library/MASS/po/pl/ %{_libdir}/R/library/MASS/R/ %{_libdir}/R/library/MASS/scripts/ # Matrix @@ -578,6 +586,7 @@ popd %dir %{_libdir}/R/library/Matrix/po/ %lang(de) %{_libdir}/R/library/Matrix/po/de/ %lang(en) %{_libdir}/R/library/Matrix/po/en*/ +%lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R %{_libdir}/R/library/Matrix/test-tools-1.R @@ -632,6 +641,7 @@ popd %lang(de) %{_libdir}/R/library/nlme/po/de/ %lang(en) %{_libdir}/R/library/nlme/po/en*/ %lang(fr) %{_libdir}/R/library/nlme/po/fr/ +%lang(pl) %{_libdir}/R/library/nlme/po/pl/ %{_libdir}/R/library/nlme/R/ %{_libdir}/R/library/nlme/scripts/ # nnet @@ -650,6 +660,7 @@ popd %lang(de) %{_libdir}/R/library/nnet/po/de/ %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ +%lang(pl) %{_libdir}/R/library/nnet/po/pl/ %{_libdir}/R/library/nnet/R/ # parallel %dir %{_libdir}/R/library/parallel/ @@ -666,6 +677,7 @@ popd %lang(de) %{_libdir}/R/library/parallel/po/de/ %lang(en) %{_libdir}/R/library/parallel/po/en*/ %lang(fr) %{_libdir}/R/library/parallel/po/fr/ +%lang(ko) %{_libdir}/R/library/parallel/po/ko/ %lang(pl) %{_libdir}/R/library/parallel/po/pl/ %lang(ru) %{_libdir}/R/library/parallel/po/ru/ %lang(zh) %{_libdir}/R/library/parallel/po/zh*/ @@ -684,6 +696,7 @@ popd %lang(de) %{_libdir}/R/library/rpart/po/de/ %lang(en) %{_libdir}/R/library/rpart/po/en*/ %lang(fr) %{_libdir}/R/library/rpart/po/fr/ +%lang(pl) %{_libdir}/R/library/rpart/po/pl/ %lang(ru) %{_libdir}/R/library/rpart/po/ru/ %{_libdir}/R/library/rpart/R/ # spatial @@ -702,6 +715,7 @@ popd %lang(de) %{_libdir}/R/library/spatial/po/de/ %lang(en) %{_libdir}/R/library/spatial/po/en*/ %lang(fr) %{_libdir}/R/library/spatial/po/fr/ +%lang(pl) %{_libdir}/R/library/spatial/po/pl/ %{_libdir}/R/library/spatial/ppdata/ %{_libdir}/R/library/spatial/PP.files %{_libdir}/R/library/spatial/R/ @@ -953,6 +967,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Oct 29 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.2-1 +- update to 2.15.2 + * Mon Jul 2 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.1-1 - update to 2.15.1 diff --git a/sources b/sources index 3a52f71..f29cb5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcdf247e707fdade82b78bcf911a54f1 R-2.15.1.tar.gz +346d16bab26fcae15e53755be8a69b00 R-2.15.2.tar.gz commit 9155d7557e32b99b033c4a5637f50233554569a3 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jul 2 12:54:07 2012 -0400 2.15.1 diff --git a/R.spec b/R.spec index 926da64..21e326b 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.15.0 +Version: 2.15.1 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -16,7 +16,7 @@ License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran -BuildRequires: gcc-c++, tetex-latex, texinfo-tex +BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel @@ -51,7 +51,7 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups -Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi +Requires: perl, sed, gawk, tex(latex), tex(dvips), less, vi # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -62,26 +62,26 @@ Provides: R-class = 7.3.3 Provides: R-cluster = 1.14.2 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.49 +Provides: R-foreign = 0.8.50 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.7 Provides: R-lattice = 0.20.6 -Provides: R-MASS = 7.3.17 +Provides: R-MASS = 7.3.18 Provides: R-Matrix = 1.0.6 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.13 -Provides: R-nlme = 3.1.103 +Provides: R-mgcv = 1.7.18 +Provides: R-nlme = 3.1.104 Provides: R-nnet = 7.3.1 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.52 +Provides: R-rpart = 3.1.53 Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.12 +Provides: R-survival = 2.36.14 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -105,7 +105,7 @@ Summary: Files for development of R packages Group: Applications/Engineering Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version -Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo-tex +Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig Provides: R-Matrix-devel = 1.0.6 @@ -331,6 +331,7 @@ popd %lang(ja) %{_datadir}/R/locale/ja/ %lang(ko) %{_datadir}/R/locale/ko/ %lang(nn) %{_datadir}/R/locale/nn/ +%lang(pl) %{_datadir}/R/locale/pl/ %lang(pt) %{_datadir}/R/locale/pt*/ %lang(ru) %{_datadir}/R/locale/ru/ %lang(tr) %{_datadir}/R/locale/tr/ @@ -363,6 +364,7 @@ popd %lang(it) %{_libdir}/R/library/base/po/it/ %lang(ja) %{_libdir}/R/library/base/po/ja/ %lang(ko) %{_libdir}/R/library/base/po/ko/ +%lang(pl) %{_libdir}/R/library/base/po/pl/ %lang(pt) %{_libdir}/R/library/base/po/pt*/ %lang(ru) %{_libdir}/R/library/base/po/ru/ %lang(tr) %{_libdir}/R/library/base/po/tr/ @@ -440,6 +442,7 @@ popd %lang(en) %{_libdir}/R/library/compiler/po/en*/ %lang(fr) %{_libdir}/R/library/compiler/po/fr/ %lang(ja) %{_libdir}/R/library/compiler/po/ja/ +%lang(pl) %{_libdir}/R/library/compiler/po/pl/ %lang(pt) %{_libdir}/R/library/compiler/po/pt*/ %lang(ru) %{_libdir}/R/library/compiler/po/ru/ %lang(zh) %{_libdir}/R/library/compiler/po/zh*/ @@ -485,6 +488,7 @@ popd %lang(it) %{_libdir}/R/library/graphics/po/it/ %lang(ja) %{_libdir}/R/library/graphics/po/ja/ %lang(ko) %{_libdir}/R/library/graphics/po/ko/ +%lang(pl) %{_libdir}/R/library/graphics/po/pl/ %lang(pt) %{_libdir}/R/library/graphics/po/pt*/ %lang(ru) %{_libdir}/R/library/graphics/po/ru/ %lang(zh) %{_libdir}/R/library/graphics/po/zh*/ @@ -509,6 +513,7 @@ popd %lang(it) %{_libdir}/R/library/grDevices/po/it/ %lang(ja) %{_libdir}/R/library/grDevices/po/ja/ %lang(ko) %{_libdir}/R/library/grDevices/po/ko/ +%lang(pl) %{_libdir}/R/library/grDevices/po/pl/ %lang(pt) %{_libdir}/R/library/grDevices/po/pt*/ %lang(ru) %{_libdir}/R/library/grDevices/po/ru/ %lang(zh) %{_libdir}/R/library/grDevices/po/zh*/ @@ -531,6 +536,7 @@ popd %lang(it) %{_libdir}/R/library/grid/po/it/ %lang(ja) %{_libdir}/R/library/grid/po/ja/ %lang(ko) %{_libdir}/R/library/grid/po/ko/ +%lang(pl) %{_libdir}/R/library/grid/po/pl/ %lang(pt) %{_libdir}/R/library/grid/po/pt*/ %lang(ru) %{_libdir}/R/library/grid/po/ru/ %lang(zh) %{_libdir}/R/library/grid/po/zh*/ @@ -625,6 +631,7 @@ popd %lang(fr) %{_libdir}/R/library/methods/po/fr/ %lang(ja) %{_libdir}/R/library/methods/po/ja/ %lang(ko) %{_libdir}/R/library/methods/po/ko/ +%lang(pl) %{_libdir}/R/library/methods/po/pl/ %lang(pt) %{_libdir}/R/library/methods/po/pt*/ %lang(ru) %{_libdir}/R/library/methods/po/ru/ %lang(zh) %{_libdir}/R/library/methods/po/zh*/ @@ -692,6 +699,7 @@ popd %lang(de) %{_libdir}/R/library/parallel/po/de/ %lang(en) %{_libdir}/R/library/parallel/po/en*/ %lang(fr) %{_libdir}/R/library/parallel/po/fr/ +%lang(pl) %{_libdir}/R/library/parallel/po/pl/ %lang(ru) %{_libdir}/R/library/parallel/po/ru/ %lang(zh) %{_libdir}/R/library/parallel/po/zh*/ %{_libdir}/R/library/parallel/R/ @@ -746,6 +754,7 @@ popd %lang(fr) %{_libdir}/R/library/splines/po/fr/ %lang(ja) %{_libdir}/R/library/splines/po/ja/ %lang(ko) %{_libdir}/R/library/splines/po/ko/ +%lang(pl) %{_libdir}/R/library/splines/po/pl/ %lang(pt) %{_libdir}/R/library/splines/po/pt*/ %lang(ru) %{_libdir}/R/library/splines/po/ru/ %lang(zh) %{_libdir}/R/library/splines/po/zh*/ @@ -769,6 +778,7 @@ popd %lang(it) %{_libdir}/R/library/stats/po/it/ %lang(ja) %{_libdir}/R/library/stats/po/ja/ %lang(ko) %{_libdir}/R/library/stats/po/ko/ +%lang(pl) %{_libdir}/R/library/stats/po/pl/ %lang(pt) %{_libdir}/R/library/stats/po/pt*/ %lang(ru) %{_libdir}/R/library/stats/po/ru/ %lang(tr) %{_libdir}/R/library/stats/po/tr/ @@ -791,6 +801,7 @@ popd %lang(it) %{_libdir}/R/library/stats4/po/it/ %lang(ja) %{_libdir}/R/library/stats4/po/ja/ %lang(ko) %{_libdir}/R/library/stats4/po/ko/ +%lang(pl) %{_libdir}/R/library/stats4/po/pl/ %lang(pt) %{_libdir}/R/library/stats4/po/pt*/ %lang(ru) %{_libdir}/R/library/stats4/po/ru/ %lang(tr) %{_libdir}/R/library/stats4/po/tr/ @@ -829,6 +840,7 @@ popd %lang(it) %{_libdir}/R/library/tcltk/po/it/ %lang(ja) %{_libdir}/R/library/tcltk/po/ja/ %lang(ko) %{_libdir}/R/library/tcltk/po/ko/ +%lang(pl) %{_libdir}/R/library/tcltk/po/pl/ %lang(pt) %{_libdir}/R/library/tcltk/po/pt*/ %lang(ru) %{_libdir}/R/library/tcltk/po/ru/ %lang(zh) %{_libdir}/R/library/tcltk/po/zh*/ @@ -850,6 +862,7 @@ popd %lang(it) %{_libdir}/R/library/tools/po/it/ %lang(ja) %{_libdir}/R/library/tools/po/ja/ %lang(ko) %{_libdir}/R/library/tools/po/ko/ +%lang(pl) %{_libdir}/R/library/tools/po/pl/ %lang(pt) %{_libdir}/R/library/tools/po/pt*/ %lang(ru) %{_libdir}/R/library/tools/po/ru/ %lang(tr) %{_libdir}/R/library/tools/po/tr/ @@ -873,6 +886,7 @@ popd %lang(fr) %{_libdir}/R/library/utils/po/fr/ %lang(ja) %{_libdir}/R/library/utils/po/ja/ %lang(ko) %{_libdir}/R/library/utils/po/ko/ +%lang(pl) %{_libdir}/R/library/utils/po/pl/ %lang(pt) %{_libdir}/R/library/utils/po/pt*/ %lang(ru) %{_libdir}/R/library/utils/po/ru/ %lang(tr) %{_libdir}/R/library/utils/po/tr/ @@ -998,6 +1012,18 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Jul 2 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.1-1 +- update to 2.15.1 + +* Mon Jul 2 2012 Jindrich Novy <jnovy(a)redhat.com> - 2.15.0-4 +- fix LaTeX and dvips dependencies (#836817) + +* Mon May 7 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-3 +- rebuild for new libtiff + +* Tue Apr 24 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-2 +- rebuild for new icu + * Fri Mar 30 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-1 - Update to 2.15.0 diff --git a/sources b/sources index b040748..3a52f71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -905f638990492618559202cc1e48a867 R-2.15.0.tar.gz +fcdf247e707fdade82b78bcf911a54f1 R-2.15.1.tar.gz commit 712378546f2d9142054f6f9998f97804df17e7d0 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jul 2 12:53:48 2012 -0400 2.15.1 diff --git a/R.spec b/R.spec index ff74464..eaba814 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.15.0 +Version: 2.15.1 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -16,7 +16,7 @@ License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran -BuildRequires: gcc-c++, tetex-latex, texinfo-tex +BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel @@ -51,7 +51,7 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups -Requires: perl, sed, gawk, tetex-latex, less, vim-minimal +Requires: perl, sed, gawk, tex(latex), less, vim-minimal # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -62,26 +62,26 @@ Provides: R-class = 7.3.3 Provides: R-cluster = 1.14.2 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.49 +Provides: R-foreign = 0.8.50 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.7 Provides: R-lattice = 0.20.6 -Provides: R-MASS = 7.3.17 +Provides: R-MASS = 7.3.18 Provides: R-Matrix = 1.0.6 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.13 -Provides: R-nlme = 3.1.103 +Provides: R-mgcv = 1.7.18 +Provides: R-nlme = 3.1.104 Provides: R-nnet = 7.3.1 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.52 +Provides: R-rpart = 3.1.53 Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.12 +Provides: R-survival = 2.36.14 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -105,7 +105,7 @@ Summary: Files for development of R packages Group: Applications/Engineering Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version -Requires: gcc-c++, gcc-gfortran, tetex-latex +Requires: gcc-c++, gcc-gfortran, tex(latex) Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig, texinfo-tex Provides: R-Matrix-devel = 1.0.6 @@ -298,6 +298,7 @@ popd %lang(ja) %{_datadir}/R/locale/ja/ %lang(ko) %{_datadir}/R/locale/ko/ %lang(nn) %{_datadir}/R/locale/nn/ +%lang(pl) %{_datadir}/R/locale/pl/ %lang(pt) %{_datadir}/R/locale/pt*/ %lang(ru) %{_datadir}/R/locale/ru/ %lang(tr) %{_datadir}/R/locale/tr/ @@ -330,6 +331,7 @@ popd %lang(it) %{_libdir}/R/library/base/po/it/ %lang(ja) %{_libdir}/R/library/base/po/ja/ %lang(ko) %{_libdir}/R/library/base/po/ko/ +%lang(pl) %{_libdir}/R/library/base/po/pl/ %lang(pt) %{_libdir}/R/library/base/po/pt*/ %lang(ru) %{_libdir}/R/library/base/po/ru/ %lang(tr) %{_libdir}/R/library/base/po/tr/ @@ -407,6 +409,7 @@ popd %lang(en) %{_libdir}/R/library/compiler/po/en*/ %lang(fr) %{_libdir}/R/library/compiler/po/fr/ %lang(ja) %{_libdir}/R/library/compiler/po/ja/ +%lang(pl) %{_libdir}/R/library/compiler/po/pl/ %lang(pt) %{_libdir}/R/library/compiler/po/pt*/ %lang(ru) %{_libdir}/R/library/compiler/po/ru/ %lang(zh) %{_libdir}/R/library/compiler/po/zh*/ @@ -452,6 +455,7 @@ popd %lang(it) %{_libdir}/R/library/graphics/po/it/ %lang(ja) %{_libdir}/R/library/graphics/po/ja/ %lang(ko) %{_libdir}/R/library/graphics/po/ko/ +%lang(pl) %{_libdir}/R/library/graphics/po/pl/ %lang(pt) %{_libdir}/R/library/graphics/po/pt*/ %lang(ru) %{_libdir}/R/library/graphics/po/ru/ %lang(zh) %{_libdir}/R/library/graphics/po/zh*/ @@ -476,6 +480,7 @@ popd %lang(it) %{_libdir}/R/library/grDevices/po/it/ %lang(ja) %{_libdir}/R/library/grDevices/po/ja/ %lang(ko) %{_libdir}/R/library/grDevices/po/ko/ +%lang(pl) %{_libdir}/R/library/grDevices/po/pl/ %lang(pt) %{_libdir}/R/library/grDevices/po/pt*/ %lang(ru) %{_libdir}/R/library/grDevices/po/ru/ %lang(zh) %{_libdir}/R/library/grDevices/po/zh*/ @@ -498,6 +503,7 @@ popd %lang(it) %{_libdir}/R/library/grid/po/it/ %lang(ja) %{_libdir}/R/library/grid/po/ja/ %lang(ko) %{_libdir}/R/library/grid/po/ko/ +%lang(pl) %{_libdir}/R/library/grid/po/pl/ %lang(pt) %{_libdir}/R/library/grid/po/pt*/ %lang(ru) %{_libdir}/R/library/grid/po/ru/ %lang(zh) %{_libdir}/R/library/grid/po/zh*/ @@ -592,6 +598,7 @@ popd %lang(fr) %{_libdir}/R/library/methods/po/fr/ %lang(ja) %{_libdir}/R/library/methods/po/ja/ %lang(ko) %{_libdir}/R/library/methods/po/ko/ +%lang(pl) %{_libdir}/R/library/methods/po/pl/ %lang(pt) %{_libdir}/R/library/methods/po/pt*/ %lang(ru) %{_libdir}/R/library/methods/po/ru/ %lang(zh) %{_libdir}/R/library/methods/po/zh*/ @@ -659,6 +666,7 @@ popd %lang(de) %{_libdir}/R/library/parallel/po/de/ %lang(en) %{_libdir}/R/library/parallel/po/en*/ %lang(fr) %{_libdir}/R/library/parallel/po/fr/ +%lang(pl) %{_libdir}/R/library/parallel/po/pl/ %lang(ru) %{_libdir}/R/library/parallel/po/ru/ %lang(zh) %{_libdir}/R/library/parallel/po/zh*/ %{_libdir}/R/library/parallel/R/ @@ -713,6 +721,7 @@ popd %lang(fr) %{_libdir}/R/library/splines/po/fr/ %lang(ja) %{_libdir}/R/library/splines/po/ja/ %lang(ko) %{_libdir}/R/library/splines/po/ko/ +%lang(pl) %{_libdir}/R/library/splines/po/pl/ %lang(pt) %{_libdir}/R/library/splines/po/pt*/ %lang(ru) %{_libdir}/R/library/splines/po/ru/ %lang(zh) %{_libdir}/R/library/splines/po/zh*/ @@ -736,6 +745,7 @@ popd %lang(it) %{_libdir}/R/library/stats/po/it/ %lang(ja) %{_libdir}/R/library/stats/po/ja/ %lang(ko) %{_libdir}/R/library/stats/po/ko/ +%lang(pl) %{_libdir}/R/library/stats/po/pl/ %lang(pt) %{_libdir}/R/library/stats/po/pt*/ %lang(ru) %{_libdir}/R/library/stats/po/ru/ %lang(tr) %{_libdir}/R/library/stats/po/tr/ @@ -758,6 +768,7 @@ popd %lang(it) %{_libdir}/R/library/stats4/po/it/ %lang(ja) %{_libdir}/R/library/stats4/po/ja/ %lang(ko) %{_libdir}/R/library/stats4/po/ko/ +%lang(pl) %{_libdir}/R/library/stats4/po/pl/ %lang(pt) %{_libdir}/R/library/stats4/po/pt*/ %lang(ru) %{_libdir}/R/library/stats4/po/ru/ %lang(tr) %{_libdir}/R/library/stats4/po/tr/ @@ -796,6 +807,7 @@ popd %lang(it) %{_libdir}/R/library/tcltk/po/it/ %lang(ja) %{_libdir}/R/library/tcltk/po/ja/ %lang(ko) %{_libdir}/R/library/tcltk/po/ko/ +%lang(pl) %{_libdir}/R/library/tcltk/po/pl/ %lang(pt) %{_libdir}/R/library/tcltk/po/pt*/ %lang(ru) %{_libdir}/R/library/tcltk/po/ru/ %lang(zh) %{_libdir}/R/library/tcltk/po/zh*/ @@ -817,6 +829,7 @@ popd %lang(it) %{_libdir}/R/library/tools/po/it/ %lang(ja) %{_libdir}/R/library/tools/po/ja/ %lang(ko) %{_libdir}/R/library/tools/po/ko/ +%lang(pl) %{_libdir}/R/library/tools/po/pl/ %lang(pt) %{_libdir}/R/library/tools/po/pt*/ %lang(ru) %{_libdir}/R/library/tools/po/ru/ %lang(tr) %{_libdir}/R/library/tools/po/tr/ @@ -840,6 +853,7 @@ popd %lang(fr) %{_libdir}/R/library/utils/po/fr/ %lang(ja) %{_libdir}/R/library/utils/po/ja/ %lang(ko) %{_libdir}/R/library/utils/po/ko/ +%lang(pl) %{_libdir}/R/library/utils/po/pl/ %lang(pt) %{_libdir}/R/library/utils/po/pt*/ %lang(ru) %{_libdir}/R/library/utils/po/ru/ %lang(tr) %{_libdir}/R/library/utils/po/tr/ @@ -939,6 +953,12 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Jul 2 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.1-1 +- update to 2.15.1 + +* Mon Jul 2 2012 Jindrich Novy <jnovy(a)redhat.com> - 2.15.0-4 +- fix LaTeX and dvips dependencies (#836817) + * Fri Mar 30 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-1 - Update to 2.15.0 diff --git a/sources b/sources index b040748..3a52f71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -905f638990492618559202cc1e48a867 R-2.15.0.tar.gz +fcdf247e707fdade82b78bcf911a54f1 R-2.15.1.tar.gz commit 4792f3fdf6b16f9d9d178dcde47f348414c8b798 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Mar 31 13:54:20 2012 -0400 2.15.0 diff --git a/R.spec b/R.spec index 7756133..ff74464 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.14.1 +Version: 2.15.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -57,31 +57,31 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.3 +Provides: R-boot = 1.3.4 Provides: R-class = 7.3.3 -Provides: R-cluster = 1.14.1 +Provides: R-cluster = 1.14.2 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.46 +Provides: R-foreign = 0.8.49 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.6 -Provides: R-lattice = 0.20.0 -Provides: R-MASS = 7.3.16 -Provides: R-Matrix = 1.0.1 +Provides: R-KernSmooth = 2.23.7 +Provides: R-lattice = 0.20.6 +Provides: R-MASS = 7.3.17 +Provides: R-Matrix = 1.0.6 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.9 -Provides: R-nlme = 3.1.102 +Provides: R-mgcv = 1.7.13 +Provides: R-nlme = 3.1.103 Provides: R-nnet = 7.3.1 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.50 +Provides: R-rpart = 3.1.52 Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.10 +Provides: R-survival = 2.36.12 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -108,7 +108,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, texinfo-tex -Provides: R-Matrix-devel = 1.0.1 +Provides: R-Matrix-devel = 1.0.6 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -289,6 +289,7 @@ popd %{_datadir}/R/library/ %{_datadir}/R/licenses/ %dir %{_datadir}/R/locale/ +%lang(da) %{_datadir}/R/locale/da/ %lang(de) %{_datadir}/R/locale/de/ %lang(en) %{_datadir}/R/locale/en*/ %lang(es) %{_datadir}/R/locale/es*/ @@ -322,6 +323,7 @@ popd %{_libdir}/R/library/base/INDEX %{_libdir}/R/library/base/Meta/ %dir %{_libdir}/R/library/base/po/ +%lang(da) %{_libdir}/R/library/base/po/da/ %lang(de) %{_libdir}/R/library/base/po/de/ %lang(en) %{_libdir}/R/library/base/po/en*/ %lang(fr) %{_libdir}/R/library/base/po/fr/ @@ -400,12 +402,14 @@ popd %{_libdir}/R/library/compiler/NAMESPACE %{_libdir}/R/library/compiler/R/ %dir %{_libdir}/R/library/compiler/po/ +%lang(da) %{_libdir}/R/library/compiler/po/da/ %lang(de) %{_libdir}/R/library/compiler/po/de/ %lang(en) %{_libdir}/R/library/compiler/po/en*/ %lang(fr) %{_libdir}/R/library/compiler/po/fr/ %lang(ja) %{_libdir}/R/library/compiler/po/ja/ %lang(pt) %{_libdir}/R/library/compiler/po/pt*/ %lang(ru) %{_libdir}/R/library/compiler/po/ru/ +%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ # datasets %dir %{_libdir}/R/library/datasets/ %{_libdir}/R/library/datasets/data/ @@ -441,6 +445,7 @@ popd %{_libdir}/R/library/graphics/Meta/ %{_libdir}/R/library/graphics/NAMESPACE %dir %{_libdir}/R/library/graphics/po/ +%lang(da) %{_libdir}/R/library/graphics/po/da/ %lang(de) %{_libdir}/R/library/graphics/po/de/ %lang(en) %{_libdir}/R/library/graphics/po/en*/ %lang(fr) %{_libdir}/R/library/graphics/po/fr/ @@ -464,6 +469,7 @@ popd %{_libdir}/R/library/grDevices/Meta/ %{_libdir}/R/library/grDevices/NAMESPACE %dir %{_libdir}/R/library/grDevices/po/ +%lang(da) %{_libdir}/R/library/grDevices/po/da/ %lang(de) %{_libdir}/R/library/grDevices/po/de/ %lang(en) %{_libdir}/R/library/grDevices/po/en*/ %lang(fr) %{_libdir}/R/library/grDevices/po/fr/ @@ -485,6 +491,7 @@ popd %{_libdir}/R/library/grid/Meta/ %{_libdir}/R/library/grid/NAMESPACE %dir %{_libdir}/R/library/grid/po/ +%lang(da) %{_libdir}/R/library/grid/po/da/ %lang(de) %{_libdir}/R/library/grid/po/de/ %lang(en) %{_libdir}/R/library/grid/po/en*/ %lang(fr) %{_libdir}/R/library/grid/po/fr*/ @@ -579,6 +586,7 @@ popd %{_libdir}/R/library/methods/Meta/ %{_libdir}/R/library/methods/NAMESPACE %dir %{_libdir}/R/library/methods/po/ +%lang(da) %{_libdir}/R/library/methods/po/da/ %lang(de) %{_libdir}/R/library/methods/po/de/ %lang(en) %{_libdir}/R/library/methods/po/en*/ %lang(fr) %{_libdir}/R/library/methods/po/fr/ @@ -647,10 +655,12 @@ popd %{_libdir}/R/library/parallel/Meta/ %{_libdir}/R/library/parallel/NAMESPACE %dir %{_libdir}/R/library/parallel/po +%lang(da) %{_libdir}/R/library/parallel/po/da/ %lang(de) %{_libdir}/R/library/parallel/po/de/ %lang(en) %{_libdir}/R/library/parallel/po/en*/ %lang(fr) %{_libdir}/R/library/parallel/po/fr/ %lang(ru) %{_libdir}/R/library/parallel/po/ru/ +%lang(zh) %{_libdir}/R/library/parallel/po/zh*/ %{_libdir}/R/library/parallel/R/ # rpart %dir %{_libdir}/R/library/rpart/ @@ -697,6 +707,7 @@ popd %{_libdir}/R/library/splines/Meta/ %{_libdir}/R/library/splines/NAMESPACE %dir %{_libdir}/R/library/splines/po +%lang(da) %{_libdir}/R/library/splines/po/da/ %lang(de) %{_libdir}/R/library/splines/po/de/ %lang(en) %{_libdir}/R/library/splines/po/en*/ %lang(fr) %{_libdir}/R/library/splines/po/fr/ @@ -718,6 +729,7 @@ popd %{_libdir}/R/library/stats/Meta/ %{_libdir}/R/library/stats/NAMESPACE %dir %{_libdir}/R/library/stats/po +%lang(da) %{_libdir}/R/library/stats/po/da/ %lang(de) %{_libdir}/R/library/stats/po/de/ %lang(en) %{_libdir}/R/library/stats/po/en*/ %lang(fr) %{_libdir}/R/library/stats/po/fr/ @@ -739,6 +751,7 @@ popd %{_libdir}/R/library/stats4/Meta/ %{_libdir}/R/library/stats4/NAMESPACE %dir %{_libdir}/R/library/stats4/po +%lang(da) %{_libdir}/R/library/stats4/po/da/ %lang(de) %{_libdir}/R/library/stats4/po/de/ %lang(en) %{_libdir}/R/library/stats4/po/en*/ %lang(fr) %{_libdir}/R/library/stats4/po/fr/ @@ -753,6 +766,7 @@ popd # survival %dir %{_libdir}/R/library/survival/ %{_libdir}/R/library/survival/data/ +%{_libdir}/R/library/survival/CITATION %{_libdir}/R/library/survival/DESCRIPTION %{_libdir}/R/library/survival/doc/ %{_libdir}/R/library/survival/help/ @@ -775,6 +789,7 @@ popd %{_libdir}/R/library/tcltk/Meta/ %{_libdir}/R/library/tcltk/NAMESPACE %dir %{_libdir}/R/library/tcltk/po/ +%lang(da) %{_libdir}/R/library/tcltk/po/da/ %lang(de) %{_libdir}/R/library/tcltk/po/de/ %lang(en) %{_libdir}/R/library/tcltk/po/en*/ %lang(fr) %{_libdir}/R/library/tcltk/po/fr/ @@ -795,6 +810,7 @@ popd %{_libdir}/R/library/tools/Meta/ %{_libdir}/R/library/tools/NAMESPACE %dir %{_libdir}/R/library/tools/po +%lang(da) %{_libdir}/R/library/tools/po/da/ %lang(de) %{_libdir}/R/library/tools/po/de/ %lang(en) %{_libdir}/R/library/tools/po/en*/ %lang(fr) %{_libdir}/R/library/tools/po/fr/ @@ -818,6 +834,7 @@ popd %{_libdir}/R/library/utils/misc/ %{_libdir}/R/library/utils/NAMESPACE %dir %{_libdir}/R/library/utils/po +%lang(da) %{_libdir}/R/library/utils/po/da/ %lang(de) %{_libdir}/R/library/utils/po/de/ %lang(en) %{_libdir}/R/library/utils/po/en*/ %lang(fr) %{_libdir}/R/library/utils/po/fr/ @@ -922,6 +939,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Mar 30 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-1 +- Update to 2.15.0 + * Wed Jan 4 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.14.1-1 - update to 2.14.1 diff --git a/sources b/sources index 958edd2..b040748 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba5b6fb15b660670ea29b885348f322a R-2.14.1.tar.gz +905f638990492618559202cc1e48a867 R-2.15.0.tar.gz commit 30478c7a389d99145e45b83896de6294dfe041ed Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Mar 31 13:53:40 2012 -0400 2.15.0 diff --git a/R.spec b/R.spec index 1864eae..926da64 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.14.1 +Version: 2.15.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -57,31 +57,31 @@ 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.3.3 +Provides: R-boot = 1.3.4 Provides: R-class = 7.3.3 -Provides: R-cluster = 1.14.1 +Provides: R-cluster = 1.14.2 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.46 +Provides: R-foreign = 0.8.49 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.6 -Provides: R-lattice = 0.20.0 -Provides: R-MASS = 7.3.16 -Provides: R-Matrix = 1.0.1 +Provides: R-KernSmooth = 2.23.7 +Provides: R-lattice = 0.20.6 +Provides: R-MASS = 7.3.17 +Provides: R-Matrix = 1.0.6 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.9 -Provides: R-nlme = 3.1.102 +Provides: R-mgcv = 1.7.13 +Provides: R-nlme = 3.1.103 Provides: R-nnet = 7.3.1 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.50 +Provides: R-rpart = 3.1.52 Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.10 +Provides: R-survival = 2.36.12 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -108,7 +108,7 @@ Requires: R-core = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig -Provides: R-Matrix-devel = 1.0.1 +Provides: R-Matrix-devel = 1.0.6 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -322,6 +322,7 @@ popd %{_datadir}/R/library/ %{_datadir}/R/licenses/ %dir %{_datadir}/R/locale/ +%lang(da) %{_datadir}/R/locale/da/ %lang(de) %{_datadir}/R/locale/de/ %lang(en) %{_datadir}/R/locale/en*/ %lang(es) %{_datadir}/R/locale/es*/ @@ -355,6 +356,7 @@ popd %{_libdir}/R/library/base/INDEX %{_libdir}/R/library/base/Meta/ %dir %{_libdir}/R/library/base/po/ +%lang(da) %{_libdir}/R/library/base/po/da/ %lang(de) %{_libdir}/R/library/base/po/de/ %lang(en) %{_libdir}/R/library/base/po/en*/ %lang(fr) %{_libdir}/R/library/base/po/fr/ @@ -433,12 +435,14 @@ popd %{_libdir}/R/library/compiler/NAMESPACE %{_libdir}/R/library/compiler/R/ %dir %{_libdir}/R/library/compiler/po/ +%lang(da) %{_libdir}/R/library/compiler/po/da/ %lang(de) %{_libdir}/R/library/compiler/po/de/ %lang(en) %{_libdir}/R/library/compiler/po/en*/ %lang(fr) %{_libdir}/R/library/compiler/po/fr/ %lang(ja) %{_libdir}/R/library/compiler/po/ja/ %lang(pt) %{_libdir}/R/library/compiler/po/pt*/ %lang(ru) %{_libdir}/R/library/compiler/po/ru/ +%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ # datasets %dir %{_libdir}/R/library/datasets/ %{_libdir}/R/library/datasets/data/ @@ -474,6 +478,7 @@ popd %{_libdir}/R/library/graphics/Meta/ %{_libdir}/R/library/graphics/NAMESPACE %dir %{_libdir}/R/library/graphics/po/ +%lang(da) %{_libdir}/R/library/graphics/po/da/ %lang(de) %{_libdir}/R/library/graphics/po/de/ %lang(en) %{_libdir}/R/library/graphics/po/en*/ %lang(fr) %{_libdir}/R/library/graphics/po/fr/ @@ -497,6 +502,7 @@ popd %{_libdir}/R/library/grDevices/Meta/ %{_libdir}/R/library/grDevices/NAMESPACE %dir %{_libdir}/R/library/grDevices/po/ +%lang(da) %{_libdir}/R/library/grDevices/po/da/ %lang(de) %{_libdir}/R/library/grDevices/po/de/ %lang(en) %{_libdir}/R/library/grDevices/po/en*/ %lang(fr) %{_libdir}/R/library/grDevices/po/fr/ @@ -518,6 +524,7 @@ popd %{_libdir}/R/library/grid/Meta/ %{_libdir}/R/library/grid/NAMESPACE %dir %{_libdir}/R/library/grid/po/ +%lang(da) %{_libdir}/R/library/grid/po/da/ %lang(de) %{_libdir}/R/library/grid/po/de/ %lang(en) %{_libdir}/R/library/grid/po/en*/ %lang(fr) %{_libdir}/R/library/grid/po/fr*/ @@ -612,6 +619,7 @@ popd %{_libdir}/R/library/methods/Meta/ %{_libdir}/R/library/methods/NAMESPACE %dir %{_libdir}/R/library/methods/po/ +%lang(da) %{_libdir}/R/library/methods/po/da/ %lang(de) %{_libdir}/R/library/methods/po/de/ %lang(en) %{_libdir}/R/library/methods/po/en*/ %lang(fr) %{_libdir}/R/library/methods/po/fr/ @@ -680,10 +688,12 @@ popd %{_libdir}/R/library/parallel/Meta/ %{_libdir}/R/library/parallel/NAMESPACE %dir %{_libdir}/R/library/parallel/po +%lang(da) %{_libdir}/R/library/parallel/po/da/ %lang(de) %{_libdir}/R/library/parallel/po/de/ %lang(en) %{_libdir}/R/library/parallel/po/en*/ %lang(fr) %{_libdir}/R/library/parallel/po/fr/ %lang(ru) %{_libdir}/R/library/parallel/po/ru/ +%lang(zh) %{_libdir}/R/library/parallel/po/zh*/ %{_libdir}/R/library/parallel/R/ # rpart %dir %{_libdir}/R/library/rpart/ @@ -730,6 +740,7 @@ popd %{_libdir}/R/library/splines/Meta/ %{_libdir}/R/library/splines/NAMESPACE %dir %{_libdir}/R/library/splines/po +%lang(da) %{_libdir}/R/library/splines/po/da/ %lang(de) %{_libdir}/R/library/splines/po/de/ %lang(en) %{_libdir}/R/library/splines/po/en*/ %lang(fr) %{_libdir}/R/library/splines/po/fr/ @@ -751,6 +762,7 @@ popd %{_libdir}/R/library/stats/Meta/ %{_libdir}/R/library/stats/NAMESPACE %dir %{_libdir}/R/library/stats/po +%lang(da) %{_libdir}/R/library/stats/po/da/ %lang(de) %{_libdir}/R/library/stats/po/de/ %lang(en) %{_libdir}/R/library/stats/po/en*/ %lang(fr) %{_libdir}/R/library/stats/po/fr/ @@ -772,6 +784,7 @@ popd %{_libdir}/R/library/stats4/Meta/ %{_libdir}/R/library/stats4/NAMESPACE %dir %{_libdir}/R/library/stats4/po +%lang(da) %{_libdir}/R/library/stats4/po/da/ %lang(de) %{_libdir}/R/library/stats4/po/de/ %lang(en) %{_libdir}/R/library/stats4/po/en*/ %lang(fr) %{_libdir}/R/library/stats4/po/fr/ @@ -786,6 +799,7 @@ popd # survival %dir %{_libdir}/R/library/survival/ %{_libdir}/R/library/survival/data/ +%{_libdir}/R/library/survival/CITATION %{_libdir}/R/library/survival/DESCRIPTION %{_libdir}/R/library/survival/doc/ %{_libdir}/R/library/survival/help/ @@ -808,6 +822,7 @@ popd %{_libdir}/R/library/tcltk/Meta/ %{_libdir}/R/library/tcltk/NAMESPACE %dir %{_libdir}/R/library/tcltk/po/ +%lang(da) %{_libdir}/R/library/tcltk/po/da/ %lang(de) %{_libdir}/R/library/tcltk/po/de/ %lang(en) %{_libdir}/R/library/tcltk/po/en*/ %lang(fr) %{_libdir}/R/library/tcltk/po/fr/ @@ -828,6 +843,7 @@ popd %{_libdir}/R/library/tools/Meta/ %{_libdir}/R/library/tools/NAMESPACE %dir %{_libdir}/R/library/tools/po +%lang(da) %{_libdir}/R/library/tools/po/da/ %lang(de) %{_libdir}/R/library/tools/po/de/ %lang(en) %{_libdir}/R/library/tools/po/en*/ %lang(fr) %{_libdir}/R/library/tools/po/fr/ @@ -851,6 +867,7 @@ popd %{_libdir}/R/library/utils/misc/ %{_libdir}/R/library/utils/NAMESPACE %dir %{_libdir}/R/library/utils/po +%lang(da) %{_libdir}/R/library/utils/po/da/ %lang(de) %{_libdir}/R/library/utils/po/de/ %lang(en) %{_libdir}/R/library/utils/po/en*/ %lang(fr) %{_libdir}/R/library/utils/po/fr/ @@ -981,6 +998,15 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Mar 30 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.15.0-1 +- Update to 2.15.0 + +* Fri Feb 10 2012 Petr Pisar <ppisar(a)redhat.com> - 2.14.1-3 +- Rebuild against PCRE 8.30 + +* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Jan 4 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.14.1-1 - update to 2.14.1 diff --git a/sources b/sources index 958edd2..b040748 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba5b6fb15b660670ea29b885348f322a R-2.14.1.tar.gz +905f638990492618559202cc1e48a867 R-2.15.0.tar.gz commit 1a7a2b9a2c71647af5e0490eaf0fbedac87ef0a5 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jan 4 15:26:51 2012 -0500 2.14.1 diff --git a/R.spec b/R.spec index e497832..1864eae 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.14.0 -Release: 3%{?dist} +Version: 2.14.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 @@ -981,6 +981,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Jan 4 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.14.1-1 +- update to 2.14.1 + * Tue Nov 8 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-3 - No inconsolata for EL diff --git a/sources b/sources index 26a459e..958edd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98cf8fe74e512e1061caf1ee0c2043a8 R-2.14.0.tar.gz +ba5b6fb15b660670ea29b885348f322a R-2.14.1.tar.gz commit bbe923fd0f1b0e92e777bfa519dcfabef9d2ef44 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jan 4 15:26:35 2012 -0500 2.14.1 diff --git a/R.spec b/R.spec index 6ab7e82..7756133 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.14.0 -Release: 3%{?dist} +Version: 2.14.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 @@ -922,6 +922,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Jan 4 2012 Tom Callaway <spot(a)fedoraproject.org> - 2.14.1-1 +- update to 2.14.1 + * Tue Nov 8 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-3 - No inconsolata for EL diff --git a/sources b/sources index 26a459e..958edd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98cf8fe74e512e1061caf1ee0c2043a8 R-2.14.0.tar.gz +ba5b6fb15b660670ea29b885348f322a R-2.14.1.tar.gz commit d3497415e0309851ac38e70a3c270a58f2aeef5b Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Tue Nov 8 14:02:26 2011 -0500 no inconsolata for rhel diff --git a/R.spec b/R.spec index 4c53402..e497832 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.14.0 -Release: 1%{?dist} +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 @@ -105,7 +105,7 @@ Summary: Files for development of R packages Group: Applications/Engineering Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version -Requires: gcc-c++, gcc-gfortran, tetex-latex +Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig Provides: R-Matrix-devel = 1.0.1 @@ -197,7 +197,11 @@ chmod +x %{__perl_requires} %build # 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 - +# No inconsolata on RHEL tex +%if 0%{?rhel} +export R_RD4PDF="times,hyper" +sed -i 's|inconsolata,||g' etc/Renviron.in +%endif export R_PDFVIEWER="%{_bindir}/xdg-open" export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/xdg-open" @@ -977,6 +981,12 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Nov 8 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-3 +- No inconsolata for EL + +* Mon Nov 7 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-2 +- add texinfo-tex to Requires for -devel package + * Wed Nov 2 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-1 - update to 2.14.0 commit 6465c326665d77d9ffef8a0ac5e1e8db2312f4d9 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Tue Nov 8 14:01:52 2011 -0500 no inconsolata for rhel diff --git a/R.spec b/R.spec index 66afe58..6ab7e82 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.14.0 -Release: 1%{?dist} +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 @@ -107,7 +107,7 @@ Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tetex-latex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel -Requires: tcl-devel, tk-devel, pkgconfig +Requires: tcl-devel, tk-devel, pkgconfig, texinfo-tex Provides: R-Matrix-devel = 1.0.1 Obsoletes: R-Matrix-devel < 0.999375-7 @@ -168,6 +168,11 @@ echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/ export R_PDFVIEWER="%{_bindir}/xdg-open" export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/xdg-open" +# No inconsolata on RHEL tex +%if 0%{?rhel} +export R_RD4PDF="times,hyper" +sed -i 's|inconsolata,||g' etc/Renviron.in +%endif case "%{_target_cpu}" in x86_64|mips64|ppc64|powerpc64|sparc64|s390x) @@ -917,6 +922,12 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Nov 8 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-3 +- No inconsolata for EL + +* Mon Nov 7 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-2 +- add texinfo-tex to Requires for -devel package + * Wed Nov 2 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-1 - update to 2.14.0 commit 6d196a5ae3dc990ab0de17e1615263375fe4f3ad Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Nov 7 13:12:37 2011 -0500 2.14.0 diff --git a/R.spec b/R.spec index 68a7f71..4c53402 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.13.1 -Release: 4%{?dist} +Version: 2.14.0 +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 @@ -57,30 +57,31 @@ 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.3.2 +Provides: R-boot = 1.3.3 Provides: R-class = 7.3.3 -Provides: R-cluster = 1.14.0 +Provides: R-cluster = 1.14.1 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.44 +Provides: R-foreign = 0.8.46 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.6 -Provides: R-lattice = 0.19.30 -Provides: R-MASS = 7.3.13 -Provides: R-Matrix = 0.999375.50 +Provides: R-lattice = 0.20.0 +Provides: R-MASS = 7.3.16 +Provides: R-Matrix = 1.0.1 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.6 -Provides: R-nlme = 3.1.101 +Provides: R-mgcv = 1.7.9 +Provides: R-nlme = 3.1.102 Provides: R-nnet = 7.3.1 +Provides: R-parallel = %{version} Provides: R-rpart = 3.1.50 Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.9 +Provides: R-survival = 2.36.10 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -107,7 +108,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.50 +Provides: R-Matrix-devel = 1.0.1 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -406,6 +407,9 @@ popd %{_libdir}/R/library/cluster/Meta/ %{_libdir}/R/library/cluster/NAMESPACE %{_libdir}/R/library/cluster/R/ +%dir %{_libdir}/R/library/cluster/po/ +%lang(de) %{_libdir}/R/library/cluster/po/de/ +%lang(en) %{_libdir}/R/library/cluster/po/en*/ # codetools %dir %{_libdir}/R/library/codetools/ %{_libdir}/R/library/codetools/DESCRIPTION @@ -431,7 +435,6 @@ popd %lang(ja) %{_libdir}/R/library/compiler/po/ja/ %lang(pt) %{_libdir}/R/library/compiler/po/pt*/ %lang(ru) %{_libdir}/R/library/compiler/po/ru/ -%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ # datasets %dir %{_libdir}/R/library/datasets/ %{_libdir}/R/library/datasets/data/ @@ -440,10 +443,9 @@ popd %{_libdir}/R/library/datasets/html/ %{_libdir}/R/library/datasets/INDEX %{_libdir}/R/library/datasets/Meta/ -%{_libdir}/R/library/datasets/R/ +%{_libdir}/R/library/datasets/NAMESPACE # foreign %dir %{_libdir}/R/library/foreign/ -%{_libdir}/R/library/foreign/COPYING %{_libdir}/R/library/foreign/DESCRIPTION %{_libdir}/R/library/foreign/files/ %{_libdir}/R/library/foreign/help/ @@ -474,8 +476,8 @@ popd %lang(it) %{_libdir}/R/library/graphics/po/it/ %lang(ja) %{_libdir}/R/library/graphics/po/ja/ %lang(ko) %{_libdir}/R/library/graphics/po/ko/ -%lang(ru) %{_libdir}/R/library/graphics/po/ru/ %lang(pt) %{_libdir}/R/library/graphics/po/pt*/ +%lang(ru) %{_libdir}/R/library/graphics/po/ru/ %lang(zh) %{_libdir}/R/library/graphics/po/zh*/ %{_libdir}/R/library/graphics/R/ # grDevices @@ -497,8 +499,8 @@ popd %lang(it) %{_libdir}/R/library/grDevices/po/it/ %lang(ja) %{_libdir}/R/library/grDevices/po/ja/ %lang(ko) %{_libdir}/R/library/grDevices/po/ko/ -%lang(ru) %{_libdir}/R/library/grDevices/po/ru/ %lang(pt) %{_libdir}/R/library/grDevices/po/pt*/ +%lang(ru) %{_libdir}/R/library/grDevices/po/ru/ %lang(zh) %{_libdir}/R/library/grDevices/po/zh*/ %{_libdir}/R/library/grDevices/R/ # grid @@ -539,7 +541,6 @@ popd # lattice %dir %{_libdir}/R/library/lattice/ %{_libdir}/R/library/lattice/CITATION -%{_libdir}/R/library/lattice/COPYING %{_libdir}/R/library/lattice/data/ %{_libdir}/R/library/lattice/demo/ %{_libdir}/R/library/lattice/DESCRIPTION @@ -547,6 +548,7 @@ popd %{_libdir}/R/library/lattice/html/ %{_libdir}/R/library/lattice/INDEX %{_libdir}/R/library/lattice/libs/ +%{_libdir}/R/library/lattice/LICENSE %{_libdir}/R/library/lattice/Meta/ %{_libdir}/R/library/lattice/NAMESPACE %{_libdir}/R/library/lattice/NEWS @@ -594,6 +596,8 @@ popd %lang(en) %{_libdir}/R/library/Matrix/po/en*/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R +%{_libdir}/R/library/Matrix/test-tools-1.R +%{_libdir}/R/library/Matrix/test-tools-Matrix.R # methods %dir %{_libdir}/R/library/methods/ %{_libdir}/R/library/methods/DESCRIPTION @@ -628,7 +632,6 @@ popd # nlme %dir %{_libdir}/R/library/nlme/ %{_libdir}/R/library/nlme/CITATION -%{_libdir}/R/library/nlme/COPYING %{_libdir}/R/library/nlme/data/ %{_libdir}/R/library/nlme/DESCRIPTION %{_libdir}/R/library/nlme/help/ @@ -662,6 +665,22 @@ popd %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ %{_libdir}/R/library/nnet/R/ +# parallel +%dir %{_libdir}/R/library/parallel/ +%{_libdir}/R/library/parallel/DESCRIPTION +%{_libdir}/R/library/parallel/doc/ +%{_libdir}/R/library/parallel/help/ +%{_libdir}/R/library/parallel/html/ +%{_libdir}/R/library/parallel/INDEX +%{_libdir}/R/library/parallel/libs/ +%{_libdir}/R/library/parallel/Meta/ +%{_libdir}/R/library/parallel/NAMESPACE +%dir %{_libdir}/R/library/parallel/po +%lang(de) %{_libdir}/R/library/parallel/po/de/ +%lang(en) %{_libdir}/R/library/parallel/po/en*/ +%lang(fr) %{_libdir}/R/library/parallel/po/fr/ +%lang(ru) %{_libdir}/R/library/parallel/po/ru/ +%{_libdir}/R/library/parallel/R/ # rpart %dir %{_libdir}/R/library/rpart/ %{_libdir}/R/library/rpart/data/ @@ -762,7 +781,6 @@ popd %{_libdir}/R/library/stats4/R/ # survival %dir %{_libdir}/R/library/survival/ -%{_libdir}/R/library/survival/COPYING %{_libdir}/R/library/survival/data/ %{_libdir}/R/library/survival/DESCRIPTION %{_libdir}/R/library/survival/doc/ @@ -834,8 +852,8 @@ popd %lang(fr) %{_libdir}/R/library/utils/po/fr/ %lang(ja) %{_libdir}/R/library/utils/po/ja/ %lang(ko) %{_libdir}/R/library/utils/po/ko/ -%lang(ru) %{_libdir}/R/library/utils/po/ru/ %lang(pt) %{_libdir}/R/library/utils/po/pt*/ +%lang(ru) %{_libdir}/R/library/utils/po/ru/ %lang(tr) %{_libdir}/R/library/utils/po/tr/ %lang(zh) %{_libdir}/R/library/utils/po/zh*/ %{_libdir}/R/library/utils/R/ @@ -959,6 +977,15 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Nov 2 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-1 +- update to 2.14.0 + +* Fri Oct 7 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.2-1 +- update to 2.13.2 + +* Mon Sep 12 2011 Michel Salim <salimma(a)fedoraproject.org> - 2.13.1-5 +- rebuild for libicu 4.8.x + * Tue Aug 9 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-4 - fix salimma's scriptlets to be on -core instead of the metapackage diff --git a/sources b/sources index d8d49ad..26a459e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28dd0d68ac3a0eab93fe7035565a1c30 R-2.13.1.tar.gz +98cf8fe74e512e1061caf1ee0c2043a8 R-2.14.0.tar.gz commit 58d98de41a7152338b599fd026ca2786f4e13f63 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Nov 7 13:12:24 2011 -0500 2.14.0 diff --git a/R.spec b/R.spec index 74b4076..66afe58 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.13.1 -Release: 4%{?dist} +Version: 2.14.0 +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 @@ -57,30 +57,31 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.2 +Provides: R-boot = 1.3.3 Provides: R-class = 7.3.3 -Provides: R-cluster = 1.14.0 +Provides: R-cluster = 1.14.1 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.44 +Provides: R-foreign = 0.8.46 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.6 -Provides: R-lattice = 0.19.30 -Provides: R-MASS = 7.3.13 -Provides: R-Matrix = 0.999375.50 +Provides: R-lattice = 0.20.0 +Provides: R-MASS = 7.3.16 +Provides: R-Matrix = 1.0.1 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.6 -Provides: R-nlme = 3.1.101 +Provides: R-mgcv = 1.7.9 +Provides: R-nlme = 3.1.102 Provides: R-nnet = 7.3.1 +Provides: R-parallel = %{version} Provides: R-rpart = 3.1.50 Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.9 +Provides: R-survival = 2.36.10 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -107,7 +108,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.50 +Provides: R-Matrix-devel = 1.0.1 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -372,6 +373,9 @@ popd %{_libdir}/R/library/cluster/Meta/ %{_libdir}/R/library/cluster/NAMESPACE %{_libdir}/R/library/cluster/R/ +%dir %{_libdir}/R/library/cluster/po/ +%lang(de) %{_libdir}/R/library/cluster/po/de/ +%lang(en) %{_libdir}/R/library/cluster/po/en*/ # codetools %dir %{_libdir}/R/library/codetools/ %{_libdir}/R/library/codetools/DESCRIPTION @@ -397,7 +401,6 @@ popd %lang(ja) %{_libdir}/R/library/compiler/po/ja/ %lang(pt) %{_libdir}/R/library/compiler/po/pt*/ %lang(ru) %{_libdir}/R/library/compiler/po/ru/ -%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ # datasets %dir %{_libdir}/R/library/datasets/ %{_libdir}/R/library/datasets/data/ @@ -406,10 +409,9 @@ popd %{_libdir}/R/library/datasets/html/ %{_libdir}/R/library/datasets/INDEX %{_libdir}/R/library/datasets/Meta/ -%{_libdir}/R/library/datasets/R/ +%{_libdir}/R/library/datasets/NAMESPACE # foreign %dir %{_libdir}/R/library/foreign/ -%{_libdir}/R/library/foreign/COPYING %{_libdir}/R/library/foreign/DESCRIPTION %{_libdir}/R/library/foreign/files/ %{_libdir}/R/library/foreign/help/ @@ -505,7 +507,6 @@ popd # lattice %dir %{_libdir}/R/library/lattice/ %{_libdir}/R/library/lattice/CITATION -%{_libdir}/R/library/lattice/COPYING %{_libdir}/R/library/lattice/data/ %{_libdir}/R/library/lattice/demo/ %{_libdir}/R/library/lattice/DESCRIPTION @@ -513,9 +514,10 @@ popd %{_libdir}/R/library/lattice/html/ %{_libdir}/R/library/lattice/INDEX %{_libdir}/R/library/lattice/libs/ +%{_libdir}/R/library/lattice/LICENSE %{_libdir}/R/library/lattice/Meta/ %{_libdir}/R/library/lattice/NAMESPACE -%{_libdir}/R/library/lattice/NEWS* +%{_libdir}/R/library/lattice/NEWS %dir %{_libdir}/R/library/lattice/po/ %lang(de) %{_libdir}/R/library/lattice/po/de/ %lang(en) %{_libdir}/R/library/lattice/po/en*/ @@ -560,6 +562,8 @@ popd %lang(en) %{_libdir}/R/library/Matrix/po/en*/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R +%{_libdir}/R/library/Matrix/test-tools-1.R +%{_libdir}/R/library/Matrix/test-tools-Matrix.R # methods %dir %{_libdir}/R/library/methods/ %{_libdir}/R/library/methods/DESCRIPTION @@ -594,7 +598,6 @@ popd # nlme %dir %{_libdir}/R/library/nlme/ %{_libdir}/R/library/nlme/CITATION -%{_libdir}/R/library/nlme/COPYING %{_libdir}/R/library/nlme/data/ %{_libdir}/R/library/nlme/DESCRIPTION %{_libdir}/R/library/nlme/help/ @@ -628,6 +631,22 @@ popd %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ %{_libdir}/R/library/nnet/R/ +# parallel +%dir %{_libdir}/R/library/parallel/ +%{_libdir}/R/library/parallel/DESCRIPTION +%{_libdir}/R/library/parallel/doc/ +%{_libdir}/R/library/parallel/help/ +%{_libdir}/R/library/parallel/html/ +%{_libdir}/R/library/parallel/INDEX +%{_libdir}/R/library/parallel/libs/ +%{_libdir}/R/library/parallel/Meta/ +%{_libdir}/R/library/parallel/NAMESPACE +%dir %{_libdir}/R/library/parallel/po +%lang(de) %{_libdir}/R/library/parallel/po/de/ +%lang(en) %{_libdir}/R/library/parallel/po/en*/ +%lang(fr) %{_libdir}/R/library/parallel/po/fr/ +%lang(ru) %{_libdir}/R/library/parallel/po/ru/ +%{_libdir}/R/library/parallel/R/ # rpart %dir %{_libdir}/R/library/rpart/ %{_libdir}/R/library/rpart/data/ @@ -728,7 +747,6 @@ popd %{_libdir}/R/library/stats4/R/ # survival %dir %{_libdir}/R/library/survival/ -%{_libdir}/R/library/survival/COPYING %{_libdir}/R/library/survival/data/ %{_libdir}/R/library/survival/DESCRIPTION %{_libdir}/R/library/survival/doc/ @@ -899,6 +917,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Nov 2 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.14.0-1 +- update to 2.14.0 + * Tue Aug 9 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-4 - fix salimma's scriptlets to be on -core instead of the metapackage diff --git a/sources b/sources index d8d49ad..26a459e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28dd0d68ac3a0eab93fe7035565a1c30 R-2.13.1.tar.gz +98cf8fe74e512e1061caf1ee0c2043a8 R-2.14.0.tar.gz commit 19ba41162d3ba81f2c8fa5f7cf664078f640de9d Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Tue Aug 9 12:08:52 2011 -0400 fix scriptlets diff --git a/R.spec b/R.spec index f5c1105..68a7f71 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.13.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -304,14 +304,6 @@ pushd $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex ln -s ../../../R/texmf/tex/latex R popd -%postun -if [ $1 -eq 0 ] ; then - /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : -fi - -%posttrans -/usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : - %files # Metapackage @@ -933,7 +925,14 @@ if [ $1 = 0 ]; then done fi -%postun core -p /sbin/ldconfig +%postun core +/sbin/ldconfig +if [ $1 -eq 0 ] ; then + /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : +fi + +%posttrans core +/usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : %post java R CMD javareconf \ @@ -960,6 +959,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Aug 9 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-4 +- fix salimma's scriptlets to be on -core instead of the metapackage + * Tue Aug 9 2011 Michel Salim <salimma(a)fedoraproject.org> - 2.13.1-3 - Symlink LaTeX files, and rehash on package change when possible (# 630835) commit 72144684aeb5832973cc65a41faa1875491cd552 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Tue Aug 9 12:05:33 2011 -0400 fix scriptlets diff --git a/R.spec b/R.spec index 5808184..74b4076 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.13.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -270,14 +270,6 @@ pushd $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex ln -s ../../../R/texmf/tex/latex R popd -%postun -if [ $1 -eq 0 ] ; then - /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : -fi - -%posttrans -/usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : - %files # Metapackage @@ -893,13 +885,23 @@ if [ $1 = 0 ]; then done fi -%postun core -p /sbin/ldconfig +%postun core +/sbin/ldconfig +if [ $1 -eq 0 ] ; then + /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : +fi + +%posttrans core +/usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : %post -n libRmath -p /sbin/ldconfig %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Aug 9 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-4 +- fix salimma's scriptlets to be on -core instead of the metapackage + * Tue Aug 9 2011 Michel Salim <salimma(a)fedoraproject.org> - 2.13.1-3 - Symlink LaTeX files, and rehash on package change when possible (# 630835) commit 2eee2b7b5a07efb4cf42b005d620dd33f92a1b17 Author: Michel Alexandre Salim <salimma(a)fedoraproject.org> Date: Tue Aug 9 16:14:12 2011 +0200 Symlink LaTeX files, and rehash on package change when possible (# 630835) diff --git a/R.spec b/R.spec index 389e535..5808184 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.13.1 -Release: 2%{?dist} +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 @@ -260,10 +260,24 @@ 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 # Symbolic link for convenience -pushd %{buildroot}%{_libdir}/R +pushd $RPM_BUILD_ROOT%{_libdir}/R ln -s ../../include/R include popd +# Symbolic link for LaTeX +mkdir -p $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex +pushd $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex +ln -s ../../../R/texmf/tex/latex R +popd + +%postun +if [ $1 -eq 0 ] ; then + /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : +fi + +%posttrans +/usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : + %files # Metapackage @@ -293,6 +307,7 @@ popd %{_datadir}/R/R/ %{_datadir}/R/sh/ %{_datadir}/R/texmf/ +%{_datadir}/texmf/ %dir %{_libdir}/R %{_libdir}/R/bin %{_libdir}/R/etc @@ -885,6 +900,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Aug 9 2011 Michel Salim <salimma(a)fedoraproject.org> - 2.13.1-3 +- Symlink LaTeX files, and rehash on package change when possible (# 630835) + * Mon Aug 8 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-2 - add BuildRequires: less commit 01b8d0ea20eda29b82ef8e5b96f677c17a017d15 Author: Michel Alexandre Salim <salimma(a)fedoraproject.org> Date: Tue Aug 9 16:14:12 2011 +0200 Symlink LaTeX files, and rehash on package change when possible (# 630835) diff --git a/R.spec b/R.spec index b40fc7b..f5c1105 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.13.1 -Release: 2%{?dist} +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 @@ -294,10 +294,24 @@ 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 # Symbolic link for convenience -pushd %{buildroot}%{_libdir}/R +pushd $RPM_BUILD_ROOT%{_libdir}/R ln -s ../../include/R include popd +# Symbolic link for LaTeX +mkdir -p $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex +pushd $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex +ln -s ../../../R/texmf/tex/latex R +popd + +%postun +if [ $1 -eq 0 ] ; then + /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : +fi + +%posttrans +/usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : + %files # Metapackage @@ -327,6 +341,7 @@ popd %{_datadir}/R/R/ %{_datadir}/R/sh/ %{_datadir}/R/texmf/ +%{_datadir}/texmf/ %dir %{_libdir}/R %{_libdir}/R/bin %{_libdir}/R/etc @@ -945,6 +960,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Aug 9 2011 Michel Salim <salimma(a)fedoraproject.org> - 2.13.1-3 +- Symlink LaTeX files, and rehash on package change when possible (# 630835) + * Mon Aug 8 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-2 - add BuildRequires: less commit 33b4de2cb4a038f4c03911db7d969c251f10bcaf Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Aug 8 13:02:39 2011 -0400 BR and R less, so it is used as the default help parser diff --git a/R.spec b/R.spec index 784a17e..b40fc7b 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.13.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -24,6 +24,7 @@ BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel BuildRequires: gcc-objc, pango-devel, libicu-devel +BuildRequires: less # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath @@ -944,6 +945,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Aug 8 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-2 +- add BuildRequires: less + * Mon Jul 11 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-1 - update to 2.13.1 commit 2b51a16f4deae9619113a67a017cf8225f4f0e79 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Aug 8 13:02:21 2011 -0400 BR and R less, so it is used as the default help parser diff --git a/R.spec b/R.spec index b6b07c5..389e535 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.13.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -24,6 +24,7 @@ BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel BuildRequires: gcc-objc, pango-devel +BuildRequires: less # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath @@ -884,6 +885,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Aug 8 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-2 +- add BuildRequires: less + * Mon Jul 11 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-1 - update to 2.13.1 commit 059a4b71b2714c5393adc8fb310732dbdeb302d4 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Jul 11 15:43:56 2011 -0400 2.13.1 diff --git a/R.spec b/R.spec index 66f6c92..784a17e 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.13.0 +Version: 2.13.1 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -56,30 +56,30 @@ 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.43 +Provides: R-boot = 1.3.2 Provides: R-class = 7.3.3 -Provides: R-cluster = 1.13.3 +Provides: R-cluster = 1.14.0 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.43 +Provides: R-foreign = 0.8.44 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.4 -Provides: R-lattice = 0.19.23 -Provides: R-MASS = 7.3.12 +Provides: R-KernSmooth = 2.23.6 +Provides: R-lattice = 0.19.30 +Provides: R-MASS = 7.3.13 Provides: R-Matrix = 0.999375.50 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.5 -Provides: R-nlme = 3.1.100 +Provides: R-mgcv = 1.7.6 +Provides: R-nlme = 3.1.101 Provides: R-nnet = 7.3.1 -Provides: R-rpart = 3.1.49 +Provides: R-rpart = 3.1.50 Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.5 +Provides: R-survival = 2.36.9 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -662,7 +662,6 @@ popd %{_libdir}/R/library/rpart/html/ %{_libdir}/R/library/rpart/INDEX %{_libdir}/R/library/rpart/libs/ -%{_libdir}/R/library/rpart/LICENCE %{_libdir}/R/library/rpart/Meta/ %{_libdir}/R/library/rpart/NAMESPACE %dir %{_libdir}/R/library/rpart/po @@ -945,6 +944,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Jul 11 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-1 +- update to 2.13.1 + * Thu Apr 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.0-1 - update to 2.13.0 - add convenience symlink for include directory (bz 688295) diff --git a/sources b/sources index 870b157..d8d49ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecfb928067cfd932e75135f8b8bba3e7 R-2.13.0.tar.gz +28dd0d68ac3a0eab93fe7035565a1c30 R-2.13.1.tar.gz commit f6f0c9cab8093feb92160907439dd5329277ef6a Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Jul 11 15:43:33 2011 -0400 2.13.1 diff --git a/R.spec b/R.spec index 6336b3f..b6b07c5 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.13.0 +Version: 2.13.1 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -56,30 +56,30 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # 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.43 +Provides: R-boot = 1.3.2 Provides: R-class = 7.3.3 -Provides: R-cluster = 1.13.3 +Provides: R-cluster = 1.14.0 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.43 +Provides: R-foreign = 0.8.44 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.4 -Provides: R-lattice = 0.19.23 -Provides: R-MASS = 7.3.12 +Provides: R-KernSmooth = 2.23.6 +Provides: R-lattice = 0.19.30 +Provides: R-MASS = 7.3.13 Provides: R-Matrix = 0.999375.50 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.5 -Provides: R-nlme = 3.1.100 +Provides: R-mgcv = 1.7.6 +Provides: R-nlme = 3.1.101 Provides: R-nnet = 7.3.1 -Provides: R-rpart = 3.1.49 +Provides: R-rpart = 3.1.50 Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.5 +Provides: R-survival = 2.36.9 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -628,7 +628,6 @@ popd %{_libdir}/R/library/rpart/html/ %{_libdir}/R/library/rpart/INDEX %{_libdir}/R/library/rpart/libs/ -%{_libdir}/R/library/rpart/LICENCE %{_libdir}/R/library/rpart/Meta/ %{_libdir}/R/library/rpart/NAMESPACE %dir %{_libdir}/R/library/rpart/po @@ -885,6 +884,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Jul 11 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.1-1 +- update to 2.13.1 + * Thu Apr 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.0-1 - update to 2.13.0 - add convenience symlink for include directory (bz 688295) diff --git a/sources b/sources index 870b157..d8d49ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecfb928067cfd932e75135f8b8bba3e7 R-2.13.0.tar.gz +28dd0d68ac3a0eab93fe7035565a1c30 R-2.13.1.tar.gz commit a9e3ad5c409aaa27bd9584bab9fdaf8289c295d3 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Fri Apr 15 10:21:32 2011 -0400 minor spec fix diff --git a/R.spec b/R.spec index c2e8c66..6336b3f 100644 --- a/R.spec +++ b/R.spec @@ -779,6 +779,7 @@ popd # utils %dir %{_libdir}/R/library/utils/ %{_libdir}/R/library/utils/DESCRIPTION +%{_libdir}/R/library/utils/doc/ %{_libdir}/R/library/utils/help/ %{_libdir}/R/library/utils/html/ %{_libdir}/R/library/utils/iconvlist commit 7aa07b4a7d0f1a72e5ad5e46a8e017433aff5c11 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Thu Apr 14 13:50:57 2011 -0400 2.13.0 diff --git a/R.spec b/R.spec index 06063f2..66f6c92 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.12.2 +Version: 2.13.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -61,21 +61,21 @@ Provides: R-class = 7.3.3 Provides: R-cluster = 1.13.3 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.42 +Provides: R-foreign = 0.8.43 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.4 -Provides: R-lattice = 0.19.17 -Provides: R-MASS = 7.3.11 -Provides: R-Matrix = 0.999375.46 +Provides: R-lattice = 0.19.23 +Provides: R-MASS = 7.3.12 +Provides: R-Matrix = 0.999375.50 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.3 -Provides: R-nlme = 3.1.98 +Provides: R-mgcv = 1.7.5 +Provides: R-nlme = 3.1.100 Provides: R-nnet = 7.3.1 -Provides: R-rpart = 3.1.48 -Provides: R-spatial = 7.3.2 +Provides: R-rpart = 3.1.49 +Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -106,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.44 +Provides: R-Matrix-devel = 0.999375.50 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -292,6 +292,11 @@ done 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 +# Symbolic link for convenience +pushd %{buildroot}%{_libdir}/R +ln -s ../../include/R include +popd + %files # Metapackage @@ -315,6 +320,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(nn) %{_datadir}/R/locale/nn/ %lang(pt) %{_datadir}/R/locale/pt*/ %lang(ru) %{_datadir}/R/locale/ru/ +%lang(tr) %{_datadir}/R/locale/tr/ %lang(zh) %{_datadir}/R/locale/zh*/ %{_datadir}/R/make/ %{_datadir}/R/R/ @@ -326,7 +332,6 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/lib # Have to break this out for the translations %dir %{_libdir}/R/library -%{_libdir}/R/library/R.css # base %dir %{_libdir}/R/library/base/ %{_libdir}/R/library/base/CITATION @@ -345,6 +350,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/base/po/ko/ %lang(pt) %{_libdir}/R/library/base/po/pt*/ %lang(ru) %{_libdir}/R/library/base/po/ru/ +%lang(tr) %{_libdir}/R/library/base/po/tr/ %lang(zh) %{_libdir}/R/library/base/po/zh*/ %{_libdir}/R/library/base/R/ # boot @@ -401,6 +407,23 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/codetools/Meta/ %{_libdir}/R/library/codetools/NAMESPACE %{_libdir}/R/library/codetools/R/ +# compiler +%dir %{_libdir}/R/library/compiler/ +%{_libdir}/R/library/compiler/DESCRIPTION +%{_libdir}/R/library/compiler/help/ +%{_libdir}/R/library/compiler/html/ +%{_libdir}/R/library/compiler/INDEX +%{_libdir}/R/library/compiler/Meta/ +%{_libdir}/R/library/compiler/NAMESPACE +%{_libdir}/R/library/compiler/R/ +%dir %{_libdir}/R/library/compiler/po/ +%lang(de) %{_libdir}/R/library/compiler/po/de/ +%lang(en) %{_libdir}/R/library/compiler/po/en*/ +%lang(fr) %{_libdir}/R/library/compiler/po/fr/ +%lang(ja) %{_libdir}/R/library/compiler/po/ja/ +%lang(pt) %{_libdir}/R/library/compiler/po/pt*/ +%lang(ru) %{_libdir}/R/library/compiler/po/ru/ +%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ # datasets %dir %{_libdir}/R/library/datasets/ %{_libdir}/R/library/datasets/data/ @@ -454,6 +477,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/grDevices/enc/ %{_libdir}/R/library/grDevices/help/ %{_libdir}/R/library/grDevices/html/ +%{_libdir}/R/library/grDevices/icc/ %{_libdir}/R/library/grDevices/INDEX %{_libdir}/R/library/grDevices/libs/ %{_libdir}/R/library/grDevices/Meta/ @@ -705,6 +729,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/stats/po/ko/ %lang(pt) %{_libdir}/R/library/stats/po/pt*/ %lang(ru) %{_libdir}/R/library/stats/po/ru/ +%lang(tr) %{_libdir}/R/library/stats/po/tr/ %lang(zh) %{_libdir}/R/library/stats/po/zh*/ %{_libdir}/R/library/stats/R/ %{_libdir}/R/library/stats/SOURCES.ts @@ -725,6 +750,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/stats4/po/ko/ %lang(pt) %{_libdir}/R/library/stats4/po/pt*/ %lang(ru) %{_libdir}/R/library/stats4/po/ru/ +%lang(tr) %{_libdir}/R/library/stats4/po/tr/ %lang(zh) %{_libdir}/R/library/stats4/po/zh*/ %{_libdir}/R/library/stats4/R/ # survival @@ -781,11 +807,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/tools/po/ko/ %lang(pt) %{_libdir}/R/library/tools/po/pt*/ %lang(ru) %{_libdir}/R/library/tools/po/ru/ +%lang(tr) %{_libdir}/R/library/tools/po/tr/ %lang(zh) %{_libdir}/R/library/tools/po/zh*/ %{_libdir}/R/library/tools/R/ # utils %dir %{_libdir}/R/library/utils/ %{_libdir}/R/library/utils/DESCRIPTION +%{_libdir}/R/library/utils/doc/ %{_libdir}/R/library/utils/help/ %{_libdir}/R/library/utils/html/ %{_libdir}/R/library/utils/iconvlist @@ -801,6 +829,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/utils/po/ko/ %lang(ru) %{_libdir}/R/library/utils/po/ru/ %lang(pt) %{_libdir}/R/library/utils/po/pt*/ +%lang(tr) %{_libdir}/R/library/utils/po/tr/ %lang(zh) %{_libdir}/R/library/utils/po/zh*/ %{_libdir}/R/library/utils/R/ %{_libdir}/R/library/utils/Sweave/ @@ -820,6 +849,8 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %defattr(-, root, root, -) %{_libdir}/pkgconfig/libR.pc %{_includedir}/R +# Symlink to %{_includedir}/R/ +%{_libdir}/R/include %files java # Nothing, all files provided by R-core @@ -914,6 +945,13 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Apr 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.0-1 +- update to 2.13.0 +- add convenience symlink for include directory (bz 688295) + +* Mon Mar 07 2011 Caoln McNamara <caolanm(a)redhat.com> - 2.12.2-2 +- rebuild for icu 4.6 + * Sun Feb 27 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.12.2-1 - update to 2.12.2 diff --git a/sources b/sources index a6c55ca..870b157 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc70b51dddab8aa39066710624e55d5e R-2.12.2.tar.gz +ecfb928067cfd932e75135f8b8bba3e7 R-2.13.0.tar.gz commit a129f0ab4a496eb86e10ea4388b0a468e450f3d3 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Thu Apr 14 13:49:56 2011 -0400 2.13.0 diff --git a/R.spec b/R.spec index 6c63808..c2e8c66 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.12.2 +Version: 2.13.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -61,21 +61,21 @@ Provides: R-class = 7.3.3 Provides: R-cluster = 1.13.3 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.42 +Provides: R-foreign = 0.8.43 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.4 -Provides: R-lattice = 0.19.17 -Provides: R-MASS = 7.3.11 -Provides: R-Matrix = 0.999375.46 +Provides: R-lattice = 0.19.23 +Provides: R-MASS = 7.3.12 +Provides: R-Matrix = 0.999375.50 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.3 -Provides: R-nlme = 3.1.98 +Provides: R-mgcv = 1.7.5 +Provides: R-nlme = 3.1.100 Provides: R-nnet = 7.3.1 -Provides: R-rpart = 3.1.48 -Provides: R-spatial = 7.3.2 +Provides: R-rpart = 3.1.49 +Provides: R-spatial = 7.3.3 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -106,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.46 +Provides: R-Matrix-devel = 0.999375.50 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -258,6 +258,11 @@ done 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 +# Symbolic link for convenience +pushd %{buildroot}%{_libdir}/R +ln -s ../../include/R include +popd + %files # Metapackage @@ -281,6 +286,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(nn) %{_datadir}/R/locale/nn/ %lang(pt) %{_datadir}/R/locale/pt*/ %lang(ru) %{_datadir}/R/locale/ru/ +%lang(tr) %{_datadir}/R/locale/tr/ %lang(zh) %{_datadir}/R/locale/zh*/ %{_datadir}/R/make/ %{_datadir}/R/R/ @@ -292,7 +298,6 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/lib # Have to break this out for the translations %dir %{_libdir}/R/library -%{_libdir}/R/library/R.css # base %dir %{_libdir}/R/library/base/ %{_libdir}/R/library/base/CITATION @@ -311,6 +316,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/base/po/ko/ %lang(pt) %{_libdir}/R/library/base/po/pt*/ %lang(ru) %{_libdir}/R/library/base/po/ru/ +%lang(tr) %{_libdir}/R/library/base/po/tr/ %lang(zh) %{_libdir}/R/library/base/po/zh*/ %{_libdir}/R/library/base/R/ # boot @@ -367,6 +373,23 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/codetools/Meta/ %{_libdir}/R/library/codetools/NAMESPACE %{_libdir}/R/library/codetools/R/ +# compiler +%dir %{_libdir}/R/library/compiler/ +%{_libdir}/R/library/compiler/DESCRIPTION +%{_libdir}/R/library/compiler/help/ +%{_libdir}/R/library/compiler/html/ +%{_libdir}/R/library/compiler/INDEX +%{_libdir}/R/library/compiler/Meta/ +%{_libdir}/R/library/compiler/NAMESPACE +%{_libdir}/R/library/compiler/R/ +%dir %{_libdir}/R/library/compiler/po/ +%lang(de) %{_libdir}/R/library/compiler/po/de/ +%lang(en) %{_libdir}/R/library/compiler/po/en*/ +%lang(fr) %{_libdir}/R/library/compiler/po/fr/ +%lang(ja) %{_libdir}/R/library/compiler/po/ja/ +%lang(pt) %{_libdir}/R/library/compiler/po/pt*/ +%lang(ru) %{_libdir}/R/library/compiler/po/ru/ +%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ # datasets %dir %{_libdir}/R/library/datasets/ %{_libdir}/R/library/datasets/data/ @@ -420,6 +443,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/grDevices/enc/ %{_libdir}/R/library/grDevices/help/ %{_libdir}/R/library/grDevices/html/ +%{_libdir}/R/library/grDevices/icc/ %{_libdir}/R/library/grDevices/INDEX %{_libdir}/R/library/grDevices/libs/ %{_libdir}/R/library/grDevices/Meta/ @@ -671,6 +695,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/stats/po/ko/ %lang(pt) %{_libdir}/R/library/stats/po/pt*/ %lang(ru) %{_libdir}/R/library/stats/po/ru/ +%lang(tr) %{_libdir}/R/library/stats/po/tr/ %lang(zh) %{_libdir}/R/library/stats/po/zh*/ %{_libdir}/R/library/stats/R/ %{_libdir}/R/library/stats/SOURCES.ts @@ -691,6 +716,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/stats4/po/ko/ %lang(pt) %{_libdir}/R/library/stats4/po/pt*/ %lang(ru) %{_libdir}/R/library/stats4/po/ru/ +%lang(tr) %{_libdir}/R/library/stats4/po/tr/ %lang(zh) %{_libdir}/R/library/stats4/po/zh*/ %{_libdir}/R/library/stats4/R/ # survival @@ -747,6 +773,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/tools/po/ko/ %lang(pt) %{_libdir}/R/library/tools/po/pt*/ %lang(ru) %{_libdir}/R/library/tools/po/ru/ +%lang(tr) %{_libdir}/R/library/tools/po/tr/ %lang(zh) %{_libdir}/R/library/tools/po/zh*/ %{_libdir}/R/library/tools/R/ # utils @@ -767,6 +794,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ko) %{_libdir}/R/library/utils/po/ko/ %lang(pt) %{_libdir}/R/library/utils/po/pt*/ %lang(ru) %{_libdir}/R/library/utils/po/ru/ +%lang(tr) %{_libdir}/R/library/utils/po/tr/ %lang(zh) %{_libdir}/R/library/utils/po/zh*/ %{_libdir}/R/library/utils/R/ %{_libdir}/R/library/utils/Sweave/ @@ -786,6 +814,8 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %defattr(-, root, root, -) %{_libdir}/pkgconfig/libR.pc %{_includedir}/R +# Symlink to %{_includedir}/R/ +%{_libdir}/R/include %files -n libRmath %defattr(-, root, root, -) @@ -854,6 +884,10 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Apr 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.13.0-1 +- update to 2.13.0 +- add convenience symlink for include directory (bz 688295) + * Sun Feb 27 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.12.2-1 - update to 2.12.2 diff --git a/sources b/sources index a6c55ca..870b157 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc70b51dddab8aa39066710624e55d5e R-2.12.2.tar.gz +ecfb928067cfd932e75135f8b8bba3e7 R-2.13.0.tar.gz commit 553f25a694bb105fa837157ece261ab2afb62534 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Sun Feb 27 10:21:03 2011 -0800 2.12.2 diff --git a/R.spec b/R.spec index 03b14bb..06063f2 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.12.1 +Version: 2.12.2 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -58,28 +58,28 @@ Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi Provides: R-base = %{version} Provides: R-boot = 1.2.43 Provides: R-class = 7.3.3 -Provides: R-cluster = 1.13.2 -Provides: R-codetools = 0.2.6 +Provides: R-cluster = 1.13.3 +Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.41 +Provides: R-foreign = 0.8.42 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.4 -Provides: R-lattice = 0.19.13 -Provides: R-MASS = 7.3.9 +Provides: R-lattice = 0.19.17 +Provides: R-MASS = 7.3.11 Provides: R-Matrix = 0.999375.46 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.2 -Provides: R-nlme = 3.1.97 +Provides: R-mgcv = 1.7.3 +Provides: R-nlme = 3.1.98 Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.48 Provides: R-spatial = 7.3.2 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.2 +Provides: R-survival = 2.36.5 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -444,6 +444,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ja) %{_libdir}/R/library/graphics/po/ja/ %lang(ko) %{_libdir}/R/library/graphics/po/ko/ %lang(ru) %{_libdir}/R/library/graphics/po/ru/ +%lang(pt) %{_libdir}/R/library/graphics/po/pt*/ %lang(zh) %{_libdir}/R/library/graphics/po/zh*/ %{_libdir}/R/library/graphics/R/ # grDevices @@ -465,6 +466,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ja) %{_libdir}/R/library/grDevices/po/ja/ %lang(ko) %{_libdir}/R/library/grDevices/po/ko/ %lang(ru) %{_libdir}/R/library/grDevices/po/ru/ +%lang(pt) %{_libdir}/R/library/grDevices/po/pt*/ %lang(zh) %{_libdir}/R/library/grDevices/po/zh*/ %{_libdir}/R/library/grDevices/R/ # grid @@ -737,6 +739,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/survival/libs/ %{_libdir}/R/library/survival/Meta/ %{_libdir}/R/library/survival/NAMESPACE +%{_libdir}/R/library/survival/NEWS.Rd %{_libdir}/R/library/survival/R/ # tcltk %dir %{_libdir}/R/library/tcltk/ @@ -797,6 +800,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ja) %{_libdir}/R/library/utils/po/ja/ %lang(ko) %{_libdir}/R/library/utils/po/ko/ %lang(ru) %{_libdir}/R/library/utils/po/ru/ +%lang(pt) %{_libdir}/R/library/utils/po/pt*/ %lang(zh) %{_libdir}/R/library/utils/po/zh*/ %{_libdir}/R/library/utils/R/ %{_libdir}/R/library/utils/Sweave/ @@ -910,6 +914,12 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Sun Feb 27 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.12.2-1 +- update to 2.12.2 + +* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Dec 17 2010 Tom Callaway <spot(a)fedoraproject.org> - 2.12.1-1 - update to 2.12.1 diff --git a/sources b/sources index 461a19e..a6c55ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -078e8d1179fc9a762e326e6da2725468 R-2.12.1.tar.gz +bc70b51dddab8aa39066710624e55d5e R-2.12.2.tar.gz commit c19e49c0790cf3f70d828e339b21d0454127e2ae Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Sun Feb 27 10:20:17 2011 -0800 2.12.2 diff --git a/R.spec b/R.spec index 1f3abf0..6c63808 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.12.1 +Version: 2.12.2 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -58,28 +58,28 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal Provides: R-base = %{version} Provides: R-boot = 1.2.43 Provides: R-class = 7.3.3 -Provides: R-cluster = 1.13.2 -Provides: R-codetools = 0.2.6 +Provides: R-cluster = 1.13.3 +Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.41 +Provides: R-foreign = 0.8.42 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.4 -Provides: R-lattice = 0.19.13 -Provides: R-MASS = 7.3.9 +Provides: R-lattice = 0.19.17 +Provides: R-MASS = 7.3.11 Provides: R-Matrix = 0.999375.46 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.2 -Provides: R-nlme = 3.1.97 +Provides: R-mgcv = 1.7.3 +Provides: R-nlme = 3.1.98 Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.48 Provides: R-spatial = 7.3.2 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.2 +Provides: R-survival = 2.36.5 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -409,6 +409,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(it) %{_libdir}/R/library/graphics/po/it/ %lang(ja) %{_libdir}/R/library/graphics/po/ja/ %lang(ko) %{_libdir}/R/library/graphics/po/ko/ +%lang(pt) %{_libdir}/R/library/graphics/po/pt*/ %lang(ru) %{_libdir}/R/library/graphics/po/ru/ %lang(zh) %{_libdir}/R/library/graphics/po/zh*/ %{_libdir}/R/library/graphics/R/ @@ -430,6 +431,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(it) %{_libdir}/R/library/grDevices/po/it/ %lang(ja) %{_libdir}/R/library/grDevices/po/ja/ %lang(ko) %{_libdir}/R/library/grDevices/po/ko/ +%lang(pt) %{_libdir}/R/library/grDevices/po/pt*/ %lang(ru) %{_libdir}/R/library/grDevices/po/ru/ %lang(zh) %{_libdir}/R/library/grDevices/po/zh*/ %{_libdir}/R/library/grDevices/R/ @@ -703,6 +705,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/survival/libs/ %{_libdir}/R/library/survival/Meta/ %{_libdir}/R/library/survival/NAMESPACE +%{_libdir}/R/library/survival/NEWS.Rd %{_libdir}/R/library/survival/R/ # tcltk %dir %{_libdir}/R/library/tcltk/ @@ -762,6 +765,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(fr) %{_libdir}/R/library/utils/po/fr/ %lang(ja) %{_libdir}/R/library/utils/po/ja/ %lang(ko) %{_libdir}/R/library/utils/po/ko/ +%lang(pt) %{_libdir}/R/library/utils/po/pt*/ %lang(ru) %{_libdir}/R/library/utils/po/ru/ %lang(zh) %{_libdir}/R/library/utils/po/zh*/ %{_libdir}/R/library/utils/R/ @@ -850,6 +854,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Sun Feb 27 2011 Tom Callaway <spot(a)fedoraproject.org> - 2.12.2-1 +- update to 2.12.2 + * Mon Dec 20 2010 Tom Callaway <spot(a)fedoraproject.org> - 2.12.1-1 - update to 2.12.1 diff --git a/sources b/sources index 461a19e..a6c55ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -078e8d1179fc9a762e326e6da2725468 R-2.12.1.tar.gz +bc70b51dddab8aa39066710624e55d5e R-2.12.2.tar.gz commit 4d1f6b77fe59f3ee551223af022182999c593e15 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Dec 20 09:46:13 2010 -0500 2.12.1 diff --git a/R.spec b/R.spec index ed27ba1..03b14bb 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.12.0 +Version: 2.12.1 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -57,9 +57,9 @@ Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi # packager convenience. Provides: R-base = %{version} Provides: R-boot = 1.2.43 -Provides: R-class = 7.3.2 -Provides: R-cluster = 1.13.1 -Provides: R-codetools = 0.2.2 +Provides: R-class = 7.3.3 +Provides: R-cluster = 1.13.2 +Provides: R-codetools = 0.2.6 Provides: R-datasets = %{version} Provides: R-foreign = 0.8.41 Provides: R-graphics = %{version} @@ -67,19 +67,19 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.4 Provides: R-lattice = 0.19.13 -Provides: R-MASS = 7.3.8 -Provides: R-Matrix = 0.999375.44 +Provides: R-MASS = 7.3.9 +Provides: R-Matrix = 0.999375.46 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.6.2 +Provides: R-mgcv = 1.7.2 Provides: R-nlme = 3.1.97 Provides: R-nnet = 7.3.1 -Provides: R-rpart = 3.1.46 +Provides: R-rpart = 3.1.48 Provides: R-spatial = 7.3.2 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.35.8 +Provides: R-survival = 2.36.2 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -583,6 +583,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %dir %{_libdir}/R/library/mgcv/ %{_libdir}/R/library/mgcv/CITATION %{_libdir}/R/library/mgcv/DESCRIPTION +%{_libdir}/R/library/mgcv/data/ %{_libdir}/R/library/mgcv/help/ %{_libdir}/R/library/mgcv/html/ %{_libdir}/R/library/mgcv/INDEX @@ -729,13 +730,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/survival/COPYING %{_libdir}/R/library/survival/data/ %{_libdir}/R/library/survival/DESCRIPTION +%{_libdir}/R/library/survival/doc/ %{_libdir}/R/library/survival/help/ %{_libdir}/R/library/survival/html/ %{_libdir}/R/library/survival/INDEX %{_libdir}/R/library/survival/libs/ %{_libdir}/R/library/survival/Meta/ %{_libdir}/R/library/survival/NAMESPACE -%{_libdir}/R/library/survival/noweb/ %{_libdir}/R/library/survival/R/ # tcltk %dir %{_libdir}/R/library/tcltk/ @@ -909,6 +910,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Dec 17 2010 Tom Callaway <spot(a)fedoraproject.org> - 2.12.1-1 +- update to 2.12.1 + * Wed Oct 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.12.0-1 - update to 2.12.0 diff --git a/sources b/sources index 7e1dc43..461a19e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa003654d238d70bf5bc7433b8257aac R-2.12.0.tar.gz +078e8d1179fc9a762e326e6da2725468 R-2.12.1.tar.gz commit 4b917060b555706097bc571061f9cda87af565ec Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Mon Dec 20 09:46:09 2010 -0500 2.12.1 diff --git a/R.spec b/R.spec index 3cee898..1f3abf0 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.12.0 +Version: 2.12.1 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -57,9 +57,9 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # packager convenience. Provides: R-base = %{version} Provides: R-boot = 1.2.43 -Provides: R-class = 7.3.2 -Provides: R-cluster = 1.13.1 -Provides: R-codetools = 0.2.2 +Provides: R-class = 7.3.3 +Provides: R-cluster = 1.13.2 +Provides: R-codetools = 0.2.6 Provides: R-datasets = %{version} Provides: R-foreign = 0.8.41 Provides: R-graphics = %{version} @@ -67,19 +67,19 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.4 Provides: R-lattice = 0.19.13 -Provides: R-MASS = 7.3.8 -Provides: R-Matrix = 0.999375.44 +Provides: R-MASS = 7.3.9 +Provides: R-Matrix = 0.999375.46 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.6.2 +Provides: R-mgcv = 1.7.2 Provides: R-nlme = 3.1.97 Provides: R-nnet = 7.3.1 -Provides: R-rpart = 3.1.46 +Provides: R-rpart = 3.1.48 Provides: R-spatial = 7.3.2 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.35.8 +Provides: R-survival = 2.36.2 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -106,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.44 +Provides: R-Matrix-devel = 0.999375.46 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -549,6 +549,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %dir %{_libdir}/R/library/mgcv/ %{_libdir}/R/library/mgcv/CITATION %{_libdir}/R/library/mgcv/DESCRIPTION +%{_libdir}/R/library/mgcv/data/ %{_libdir}/R/library/mgcv/help/ %{_libdir}/R/library/mgcv/html/ %{_libdir}/R/library/mgcv/INDEX @@ -695,13 +696,13 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/survival/COPYING %{_libdir}/R/library/survival/data/ %{_libdir}/R/library/survival/DESCRIPTION +%{_libdir}/R/library/survival/doc/ %{_libdir}/R/library/survival/help/ %{_libdir}/R/library/survival/html/ %{_libdir}/R/library/survival/INDEX %{_libdir}/R/library/survival/libs/ %{_libdir}/R/library/survival/Meta/ %{_libdir}/R/library/survival/NAMESPACE -%{_libdir}/R/library/survival/noweb/ %{_libdir}/R/library/survival/R/ # tcltk %dir %{_libdir}/R/library/tcltk/ @@ -849,6 +850,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Dec 20 2010 Tom Callaway <spot(a)fedoraproject.org> - 2.12.1-1 +- update to 2.12.1 + * Wed Oct 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.12.0-1 - update to 2.12.0 diff --git a/sources b/sources index 7e1dc43..461a19e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa003654d238d70bf5bc7433b8257aac R-2.12.0.tar.gz +078e8d1179fc9a762e326e6da2725468 R-2.12.1.tar.gz commit 6de5cfaecb82b7b73717efe1642c50226583e498 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Tue Nov 2 16:21:07 2010 -0400 fix NEWS.pdf ownership diff --git a/R.spec b/R.spec index ab7a613..3cee898 100644 --- a/R.spec +++ b/R.spec @@ -767,7 +767,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/utils/Sweave/ %{_libdir}/R/modules %{_libdir}/R/COPYING -%{_libdir}/R/NEWS +%{_libdir}/R/NEWS* %{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* commit a49e005e09789d5a7c600e5706760510b11f3e80 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Tue Nov 2 16:06:27 2010 -0400 2.12.0 diff --git a/sources b/sources index 0a63667..7e1dc43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7421108ade3e9223263394b9bbe277ce R-2.11.1.tar.gz +aa003654d238d70bf5bc7433b8257aac R-2.12.0.tar.gz commit 75e2e75a7b0de1271dc5268fddd41cdaf8965b20 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Tue Nov 2 11:52:17 2010 -0400 2.12.0 diff --git a/R.spec b/R.spec index acff946..ed27ba1 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.11.1 -Release: 3%{?dist} +Version: 2.12.0 +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 @@ -56,23 +56,23 @@ 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.42 +Provides: R-boot = 1.2.43 Provides: R-class = 7.3.2 -Provides: R-cluster = 1.12.3 +Provides: R-cluster = 1.13.1 Provides: R-codetools = 0.2.2 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.40 +Provides: R-foreign = 0.8.41 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.3 -Provides: R-lattice = 0.18.8 -Provides: R-MASS = 7.3.6 -Provides: R-Matrix = 0.999375.39 +Provides: R-KernSmooth = 2.23.4 +Provides: R-lattice = 0.19.13 +Provides: R-MASS = 7.3.8 +Provides: R-Matrix = 0.999375.44 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.6.2 -Provides: R-nlme = 3.1.96 +Provides: R-nlme = 3.1.97 Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.46 Provides: R-spatial = 7.3.2 @@ -106,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.39 +Provides: R-Matrix-devel = 0.999375.44 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -317,7 +317,6 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ru) %{_datadir}/R/locale/ru/ %lang(zh) %{_datadir}/R/locale/zh*/ %{_datadir}/R/make/ -%{_datadir}/R/perl/ %{_datadir}/R/R/ %{_datadir}/R/sh/ %{_datadir}/R/texmf/ @@ -505,6 +504,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/KernSmooth/R/ # lattice %dir %{_libdir}/R/library/lattice/ +%{_libdir}/R/library/lattice/CITATION %{_libdir}/R/library/lattice/COPYING %{_libdir}/R/library/lattice/data/ %{_libdir}/R/library/lattice/demo/ @@ -801,7 +801,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/utils/Sweave/ %{_libdir}/R/modules %{_libdir}/R/COPYING -%{_libdir}/R/NEWS +%{_libdir}/R/NEWS* %{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* @@ -824,6 +824,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %files -n libRmath %defattr(-, root, root, -) +%doc doc/COPYING %{_libdir}/libRmath.so %files -n libRmath-devel @@ -908,6 +909,12 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Oct 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.12.0-1 +- update to 2.12.0 + +* Wed Jul 7 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-4 +- include COPYING in libRmath package + * Wed Jun 30 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-3 - move libRmath static lib into libRmath-static subpackage diff --git a/sources b/sources index 0a63667..7e1dc43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7421108ade3e9223263394b9bbe277ce R-2.11.1.tar.gz +aa003654d238d70bf5bc7433b8257aac R-2.12.0.tar.gz commit c95572151f7080c084ddb3d9c683af6d84cf8c24 Author: Tom "spot" Callaway <tcallawa(a)redhat.com> Date: Tue Nov 2 11:51:56 2010 -0400 2.12.0 diff --git a/R.spec b/R.spec index e6126d9..ab7a613 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.11.1 -Release: 3%{?dist} +Version: 2.12.0 +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 @@ -56,23 +56,23 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # 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.42 +Provides: R-boot = 1.2.43 Provides: R-class = 7.3.2 -Provides: R-cluster = 1.12.3 +Provides: R-cluster = 1.13.1 Provides: R-codetools = 0.2.2 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.40 +Provides: R-foreign = 0.8.41 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.3 -Provides: R-lattice = 0.18.8 -Provides: R-MASS = 7.3.6 -Provides: R-Matrix = 0.999375.39 +Provides: R-KernSmooth = 2.23.4 +Provides: R-lattice = 0.19.13 +Provides: R-MASS = 7.3.8 +Provides: R-Matrix = 0.999375.44 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.6.2 -Provides: R-nlme = 3.1.96 +Provides: R-nlme = 3.1.97 Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.46 Provides: R-spatial = 7.3.2 @@ -106,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.39 +Provides: R-Matrix-devel = 0.999375.44 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -121,7 +121,7 @@ A standalone library of mathematical and statistical functions derived 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 @@ -283,7 +283,6 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %lang(ru) %{_datadir}/R/locale/ru/ %lang(zh) %{_datadir}/R/locale/zh*/ %{_datadir}/R/make/ -%{_datadir}/R/perl/ %{_datadir}/R/R/ %{_datadir}/R/sh/ %{_datadir}/R/texmf/ @@ -471,6 +470,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/KernSmooth/R/ # lattice %dir %{_libdir}/R/library/lattice/ +%{_libdir}/R/library/lattice/CITATION %{_libdir}/R/library/lattice/COPYING %{_libdir}/R/library/lattice/data/ %{_libdir}/R/library/lattice/demo/ @@ -481,7 +481,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/lattice/libs/ %{_libdir}/R/library/lattice/Meta/ %{_libdir}/R/library/lattice/NAMESPACE -%{_libdir}/R/library/lattice/NEWS +%{_libdir}/R/library/lattice/NEWS* %dir %{_libdir}/R/library/lattice/po/ %lang(de) %{_libdir}/R/library/lattice/po/de/ %lang(en) %{_libdir}/R/library/lattice/po/en*/ @@ -784,6 +784,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %files -n libRmath %defattr(-, root, root, -) +%doc doc/COPYING %{_libdir}/libRmath.so %files -n libRmath-devel @@ -848,6 +849,12 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Oct 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.12.0-1 +- update to 2.12.0 + +* Wed Jul 7 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-4 +- include COPYING in libRmath package + * Wed Jun 30 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-3 - move libRmath static lib into libRmath-static subpackage commit 410b32003f72d93a1dd50d3b2e0c7b5c5ce1fb78 Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Wed Jul 28 09:15:24 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 9372366..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -R-2.11.1.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9372366 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +R-2.11.1.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index c22b14a..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 commit 21c965967442c02ba71d5a9a2e9b6badf09b92cf Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Wed Jul 28 09:15:14 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index bc276e4..0000000 --- a/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -R-2.0.1.tar.gz -R-2.1.0.tar.gz -R-2.1.1.tar.gz -R-2.2.0.tar.gz -R-2.2.1.tar.gz -R-2.3.0.tar.gz -R-2.3.1.tar.gz -R-2.4.0.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bc276e4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +R-2.0.1.tar.gz +R-2.1.0.tar.gz +R-2.1.1.tar.gz +R-2.2.0.tar.gz +R-2.2.1.tar.gz +R-2.3.0.tar.gz +R-2.3.1.tar.gz +R-2.4.0.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index c22b14a..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 commit 59b20e8491afecf52f293d9ac6b4150e37c16674 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jun 30 18:23:18 2010 +0000 fix stupid omission diff --git a/R.spec b/R.spec index e8ec00e..e6126d9 100644 --- a/R.spec +++ b/R.spec @@ -112,6 +112,10 @@ Obsoletes: R-Matrix-devel < 0.999375-7 %description devel Install R-devel if you are going to develop or compile R packages. +%package -n libRmath +Summary: Standalone math library from the R project +Group: Development/Libraries + %description -n libRmath A standalone library of mathematical and statistical functions derived from the R project. This package provides the shared libRmath library. commit dbc11a218bce84415863e39fdd612a547e999b7b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jun 30 18:06:42 2010 +0000 el6 merge diff --git a/R.spec b/R.spec index d5f7472..acff946 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.11.1 -Release: 1%{?dist} +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 @@ -151,17 +151,25 @@ 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 @@ -185,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" @@ -820,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}; @@ -897,6 +908,12 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Jun 30 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-3 +- move libRmath static lib into libRmath-static subpackage + +* Thu Jun 3 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-2 +- overload R_LIBS_SITE instead of R_LIBS + * Tue Jun 1 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-1 - update to 2.11.1 commit 8703c19fdd5afe5290c9147baa832c225d7a3708 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jun 30 18:05:47 2010 +0000 fix static lib bug, overload R_LIBS_SITE instead of R_LIBS diff --git a/R.spec b/R.spec index 1d4f6ce..e8ec00e 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.11.1 -Release: 1%{?dist} +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 @@ -112,13 +112,9 @@ Obsoletes: R-Matrix-devel < 0.999375-7 %description devel Install R-devel if you are going to develop or compile R packages. -%package -n libRmath -Summary: Standalone math library from the R project -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 @@ -127,8 +123,16 @@ 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 @@ -152,8 +156,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" @@ -780,10 +784,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}; @@ -837,6 +844,12 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Jun 30 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-3 +- move libRmath static lib into libRmath-static subpackage + +* Thu Jun 3 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-2 +- overload R_LIBS_SITE instead of R_LIBS + * Tue Jun 1 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-1 - update to 2.11.1 commit 7120821ee5fb1fe5f16646f778cc2e9e79a2c0f9 Author: Orion Poplawski <orion(a)fedoraproject.org> Date: Mon Jun 21 17:45:26 2010 +0000 - update to 2.11.1 diff --git a/.cvsignore b/.cvsignore index 072f2d2..9372366 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.9.2.tar.gz +R-2.11.1.tar.gz diff --git a/R.spec b/R.spec index 2589db0..d5f7472 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.11.0 +Version: 2.11.1 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -66,12 +66,12 @@ Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.3 -Provides: R-lattice = 0.18.5 -Provides: R-MASS = 7.3.5 -Provides: R-Matrix = 0.999375.38 +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.6.1 +Provides: R-mgcv = 1.6.2 Provides: R-nlme = 3.1.96 Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.46 @@ -106,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.38 +Provides: R-Matrix-devel = 0.999375.39 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -897,6 +897,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Jun 1 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-1 +- update to 2.11.1 + * Thu Apr 22 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.0-1 - update to 2.11.0 diff --git a/sources b/sources index 277310a..0a63667 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6c1e866299f533617750889c729bfb3 R-2.11.0.tar.gz +7421108ade3e9223263394b9bbe277ce R-2.11.1.tar.gz commit 5dd070567c74504d529f609fa94ec5ac4788b703 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jun 1 18:57:14 2010 +0000 2.11.1 diff --git a/R.spec b/R.spec index 7fc3dc5..1d4f6ce 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.11.0 +Version: 2.11.1 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -66,12 +66,12 @@ Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.3 -Provides: R-lattice = 0.18.5 -Provides: R-MASS = 7.3.5 -Provides: R-Matrix = 0.999375.38 +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.6.1 +Provides: R-mgcv = 1.6.2 Provides: R-nlme = 3.1.96 Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.46 @@ -106,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.38 +Provides: R-Matrix-devel = 0.999375.39 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -837,6 +837,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Jun 1 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.1-1 +- update to 2.11.1 + * Thu Apr 22 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.0-1 - update to 2.11.0 diff --git a/sources b/sources index 277310a..0a63667 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6c1e866299f533617750889c729bfb3 R-2.11.0.tar.gz +7421108ade3e9223263394b9bbe277ce R-2.11.1.tar.gz commit e395fff4c4abe11fe6046d9ba0fa7f3a04f1fcc7 Author: Dennis Gilmore <ausil(a)fedoraproject.org> Date: Sat May 8 01:41:46 2010 +0000 Initialize branch EL-6 for R diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 commit cadbf8dfc24907985350ce0ad2ccba7d321255c5 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Apr 22 21:56:31 2010 +0000 2.11.0 diff --git a/R.spec b/R.spec index 1c6e0a3..2589db0 100644 --- a/R.spec +++ b/R.spec @@ -5,14 +5,13 @@ %endif Name: R -Version: 2.10.1 +Version: 2.11.0 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 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.41 -Provides: R-class = 7.3.1 -Provides: R-cluster = 1.12.1 +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.38 +Provides: R-foreign = 0.8.40 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.3 -Provides: R-lattice = 0.17.26 -Provides: R-MASS = 7.3.4 -Provides: R-Matrix = 0.999375.33 +Provides: R-lattice = 0.18.5 +Provides: R-MASS = 7.3.5 +Provides: R-Matrix = 0.999375.38 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.6.1 Provides: R-nlme = 3.1.96 Provides: R-nnet = 7.3.1 -Provides: R-rpart = 3.1.45 -Provides: R-spatial = 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.7 +Provides: R-survival = 2.35.8 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = 7.3.1 %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.31 +Provides: R-Matrix-devel = 0.999375.38 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -167,7 +165,6 @@ and header files. %prep %setup -q -%patch1 -p1 -b .filter-little-out # Filter false positive provides. cat <<EOF > %{name}-prov @@ -730,6 +727,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/survival/libs/ %{_libdir}/R/library/survival/Meta/ %{_libdir}/R/library/survival/NAMESPACE +%{_libdir}/R/library/survival/noweb/ %{_libdir}/R/library/survival/R/ # tcltk %dir %{_libdir}/R/library/tcltk/ @@ -899,6 +897,12 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Apr 22 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.0-1 +- update to 2.11.0 + +* Fri Apr 02 2010 Caoln McNamara <caolanm(a)redhat.com> - 2.10.1-2 +- rebuild for icu 4.4 + * Mon Dec 21 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.10.1-1 - update to 2.10.1 - enable static html pages diff --git a/sources b/sources index a0f0d4c..277310a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75f8b7e875b846ea96a4c6cc0abc00a4 R-2.10.1.tar.gz +c6c1e866299f533617750889c729bfb3 R-2.11.0.tar.gz commit 7d8b3141e0c2b40e3443ead60c4a44f1696dde5e Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Apr 22 21:56:30 2010 +0000 2.11.0 diff --git a/R.spec b/R.spec index 061a75b..7fc3dc5 100644 --- a/R.spec +++ b/R.spec @@ -5,14 +5,13 @@ %endif Name: R -Version: 2.10.1 +Version: 2.11.0 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 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, tetex-latex, less, vim-minimal # 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.41 -Provides: R-class = 7.3.1 -Provides: R-cluster = 1.12.1 +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.38 +Provides: R-foreign = 0.8.40 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.3 -Provides: R-lattice = 0.17.26 -Provides: R-MASS = 7.3.4 -Provides: R-Matrix = 0.999375.33 +Provides: R-lattice = 0.18.5 +Provides: R-MASS = 7.3.5 +Provides: R-Matrix = 0.999375.38 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.6.1 Provides: R-nlme = 3.1.96 Provides: R-nnet = 7.3.1 -Provides: R-rpart = 3.1.45 -Provides: R-spatial = 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.7 +Provides: R-survival = 2.35.8 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = 7.3.1 %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.31 +Provides: R-Matrix-devel = 0.999375.38 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -134,7 +132,6 @@ and header files. %prep %setup -q -%patch1 -p1 -b .filter-little-out # Filter false positive provides. cat <<EOF > %{name}-prov @@ -696,6 +693,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/survival/libs/ %{_libdir}/R/library/survival/Meta/ %{_libdir}/R/library/survival/NAMESPACE +%{_libdir}/R/library/survival/noweb/ %{_libdir}/R/library/survival/R/ # tcltk %dir %{_libdir}/R/library/tcltk/ @@ -839,6 +837,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Apr 22 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.11.0-1 +- update to 2.11.0 + * Mon Dec 21 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.10.1-1 - update to 2.10.1 - enable static html pages diff --git a/sources b/sources index a0f0d4c..277310a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75f8b7e875b846ea96a4c6cc0abc00a4 R-2.10.1.tar.gz +c6c1e866299f533617750889c729bfb3 R-2.11.0.tar.gz commit 6a74d204a0ee6f9181a55b3ff50f633b0c3483f1 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Dec 22 23:29:51 2009 +0000 2.10.1 diff --git a/R.spec b/R.spec index 3c7c8a7..1c6e0a3 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.10.0 -Release: 2%{?dist} +Version: 2.10.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 @@ -68,11 +68,11 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.3 Provides: R-lattice = 0.17.26 -Provides: R-MASS = 7.3.3 -Provides: R-Matrix = 0.999375.31 +Provides: R-MASS = 7.3.4 +Provides: R-Matrix = 0.999375.33 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.5.6 +Provides: R-mgcv = 1.6.1 Provides: R-nlme = 3.1.96 Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.45 @@ -229,6 +229,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) \ @@ -898,6 +899,10 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.10.1-1 +- update to 2.10.1 +- enable static html pages + * Mon Nov 9 2009 Tom "spot" Callaway <tcallawa(a)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 diff --git a/sources b/sources index edafb60..a0f0d4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4486934883b1dbcd5400135e22b26a75 R-2.10.0.tar.gz +75f8b7e875b846ea96a4c6cc0abc00a4 R-2.10.1.tar.gz commit 618164e38fe22a8b456977889ecd736e84f87bef Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Dec 22 23:29:51 2009 +0000 2.10.1 diff --git a/R.spec b/R.spec index ba23434..061a75b 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.10.0 -Release: 2%{?dist} +Version: 2.10.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 @@ -68,11 +68,11 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.3 Provides: R-lattice = 0.17.26 -Provides: R-MASS = 7.3.3 -Provides: R-Matrix = 0.999375.31 +Provides: R-MASS = 7.3.4 +Provides: R-Matrix = 0.999375.33 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.5.6 +Provides: R-mgcv = 1.6.1 Provides: R-nlme = 3.1.96 Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.45 @@ -196,6 +196,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) \ @@ -838,6 +839,10 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Dec 21 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.10.1-1 +- update to 2.10.1 +- enable static html pages + * Mon Nov 9 2009 Tom "spot" Callaway <tcallawa(a)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 diff --git a/sources b/sources index edafb60..a0f0d4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4486934883b1dbcd5400135e22b26a75 R-2.10.0.tar.gz +75f8b7e875b846ea96a4c6cc0abc00a4 R-2.10.1.tar.gz commit cb9e622842a4192ab0c185fe4a53cdbe9b5bd923 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 00:21:01 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index f681062..c22b14a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 3d5b23baf8f68fc7f177edc9dcccfc92c4691889 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 00:21:01 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index f681062..c22b14a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 8b1195fd8eac715d716b472a69a4d93171677079 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Nov 9 03:11:33 2009 +0000 missed a branch diff --git a/R.spec b/R.spec index 8b917f7..3c7c8a7 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -847,15 +847,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 @@ -896,6 +898,11 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Nov 9 2009 Tom "spot" Callaway <tcallawa(a)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(a)redhat.com> - 2.10.0-1 - update to 2.10.0 - use correct compiler for ARM commit 237a73ad2786a2ccb91dd421545aed6b4c2eb3fb Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Nov 9 03:09:20 2009 +0000 fix scriptlet noise caused by 2.10.0 search index changes diff --git a/R-make-search-index.sh b/R-make-search-index.sh index 94440c2..069d1a9 100755 --- a/R-make-search-index.sh +++ b/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 diff --git a/R.spec b/R.spec index c05d56b..ba23434 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -807,15 +807,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 @@ -836,6 +838,11 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Nov 9 2009 Tom "spot" Callaway <tcallawa(a)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(a)redhat.com> - 2.10.0-1 - update to 2.10.0 - use correct compiler for ARM commit 13d73cceb04f07f0f3d7e7754fffc0f463b3f03b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Nov 9 03:09:20 2009 +0000 fix scriptlet noise caused by 2.10.0 search index changes diff --git a/R-make-search-index.sh b/R-make-search-index.sh index 94440c2..069d1a9 100755 --- a/R-make-search-index.sh +++ b/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 commit f3bd89146419a5327e66a23357074bca4482ff11 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Nov 5 04:43:17 2009 +0000 2.10.0 diff --git a/R.spec b/R.spec index c617096..8b917f7 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.9.2 +Version: 2.10.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -57,34 +57,34 @@ 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.41 +Provides: R-class = 7.3.1 +Provides: R-cluster = 1.12.1 Provides: R-codetools = 0.2.2 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.37 +Provides: R-foreign = 0.8.38 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.17.26 +Provides: R-MASS = 7.3.3 +Provides: R-Matrix = 0.999375.31 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-mgcv = 1.5.6 +Provides: R-nlme = 3.1.96 +Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.45 -Provides: R-spatial = 7.2.48 +Provides: R-spatial = 7.3.1 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.35.4 +Provides: R-survival = 2.35.7 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = 7.2.48 +Provides: R-VR = 7.3.1 %description core A language and environment for statistical computing and graphics. @@ -108,7 +108,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.31 Obsoletes: R-Matrix-devel < 0.999375-7 %description devel @@ -202,12 +202,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" @@ -277,7 +283,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 +306,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 +325,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 +342,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 +375,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 +422,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 +441,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 +462,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 +483,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 +506,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 +515,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 +533,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 +546,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 +573,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 +603,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 +621,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 +638,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 +657,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 +676,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 +698,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 +718,27 @@ 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/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 +752,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 +772,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 +791,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 @@ -996,6 +896,13 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Nov 4 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.10.0-1 +- update to 2.10.0 +- use correct compiler for ARM + +* Thu Oct 15 2009 Karsten Hopp <karsten(a)redhat.com> 2.9.2-2 +- s390 (not s390x) needs the -m31 compiler flag + * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.2-1 - Update to 2.9.2 diff --git a/sources b/sources index e8b53a0..edafb60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -112e2a1306cf71320e45d14e87e5b913 R-2.9.2.tar.gz +4486934883b1dbcd5400135e22b26a75 R-2.10.0.tar.gz commit 4c4681e11c84061317f99c657e400ffc40dab98a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Nov 5 04:43:16 2009 +0000 2.10.0 diff --git a/R.spec b/R.spec index cfb2f25..c05d56b 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.9.2 +Version: 2.10.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -57,33 +57,34 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # 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.41 +Provides: R-class = 7.3.1 +Provides: R-cluster = 1.12.1 Provides: R-codetools = 0.2.2 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.37 +Provides: R-foreign = 0.8.38 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.17.26 +Provides: R-MASS = 7.3.3 +Provides: R-Matrix = 0.999375.31 +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-mgcv = 1.5.6 +Provides: R-nlme = 3.1.96 +Provides: R-nnet = 7.3.1 Provides: R-rpart = 3.1.45 -Provides: R-spatial = 7.2.48 +Provides: R-spatial = 7.3.1 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.35.4 +Provides: R-survival = 2.35.7 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = 7.2.48 +Provides: R-VR = 7.3.1 %description core A language and environment for statistical computing and graphics. @@ -107,6 +108,8 @@ 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.31 +Obsoletes: R-Matrix-devel < 0.999375-7 %description devel Install R-devel if you are going to develop or compile R packages. @@ -166,12 +169,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" @@ -205,6 +214,7 @@ done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf + rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version} @@ -239,7 +249,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 @@ -262,6 +272,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*/ @@ -280,14 +291,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/ @@ -300,38 +308,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 @@ -340,62 +341,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/ @@ -403,17 +388,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/ @@ -426,19 +407,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/ @@ -451,18 +428,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/ @@ -476,28 +449,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/ @@ -505,9 +472,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 @@ -516,20 +481,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 @@ -538,11 +499,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/ @@ -553,27 +512,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/ @@ -586,36 +539,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 @@ -624,20 +569,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 @@ -646,19 +587,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 @@ -667,19 +604,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 @@ -690,17 +623,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 @@ -713,19 +642,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 @@ -739,17 +664,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 @@ -763,35 +684,27 @@ 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/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/ @@ -805,17 +718,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 @@ -829,17 +738,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 @@ -852,7 +757,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 @@ -932,20 +836,31 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Nov 4 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.10.0-1 +- update to 2.10.0 +- use correct compiler for ARM + +* Thu Oct 15 2009 Karsten Hopp <karsten(a)redhat.com> 2.9.2-2 +- s390 (not s390x) needs the -m31 compiler flag + * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.2-1 - Update to 2.9.2 +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 10 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.1-2 +- don't try to make the PDFs in rawhide/i586 + * Thu Jul 9 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.1-1 - update to 2.9.1 - fix versioned provides -* Wed Apr 29 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-1.1 -- take out incorrect texlive Requires (no texlive until RHEL 6) -- fix Requires: vi to be Requires: vim-minimal +* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-2 +- properly Provide/Obsolete R-Matrix * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-1 - update to 2.9.0, change vim dep to vi -- EL-5 version, no java subpackages * Tue Apr 7 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-9 - drop profile.d scripts, they broke more than they fixed diff --git a/sources b/sources index e8b53a0..edafb60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -112e2a1306cf71320e45d14e87e5b913 R-2.9.2.tar.gz +4486934883b1dbcd5400135e22b26a75 R-2.10.0.tar.gz commit 2584e95bcace87393f1a4242b7e9868d9c79fe0b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Aug 24 19:39:59 2009 +0000 update to 2.9.2 diff --git a/.cvsignore b/.cvsignore index b1523e8..072f2d2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.9.1.tar.gz +R-2.9.2.tar.gz diff --git a/R.spec b/R.spec index 920bb98..c617096 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.9.1 -Release: 3%{?dist} +Version: 2.9.2 +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 @@ -57,26 +57,26 @@ 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.37 -Provides: R-class = 7.2.47 +Provides: R-boot = 1.2.38 +Provides: R-class = 7.2.48 Provides: R-cluster = 1.12.0 Provides: R-codetools = 0.2.2 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.36 +Provides: R-foreign = 0.8.37 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.47 -Provides: R-Matrix = 0.999375.29 +Provides: R-MASS = 7.2.48 +Provides: R-Matrix = 0.999375.30 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.5.5 -Provides: R-nlme = 3.1.92 -Provides: R-nnet = 7.2.47 -Provides: R-rpart = 3.1.44 -Provides: R-spatial = 7.2.47 +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-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -84,7 +84,7 @@ Provides: R-survival = 2.35.4 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = 7.2.47 +Provides: R-VR = 7.2.48 %description core A language and environment for statistical computing and graphics. @@ -230,24 +230,18 @@ export FCFLAGS="%{optflags}" make (cd src/nmath/standalone; make) #make check-all -# 2009-07-10 -# PDF generation is not working correctly in i586/rawhide, probably a texlive bug -%ifnarch i586 make pdf -%endif make info # Convert to UTF-8 -for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do +for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,} mv $i{.utf8,} done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info -%ifnarch i586 make DESTDIR=${RPM_BUILD_ROOT} install-pdf -%endif rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old @@ -271,9 +265,7 @@ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES -%ifnarch i586 touch -r NEWS doc/manual/*.pdf -%endif touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html @@ -281,7 +273,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do - sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i + sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i done # Fix exec bits @@ -1004,6 +996,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.2-1 +- Update to 2.9.2 + * Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -1319,8 +1314,8 @@ R CMD javareconf \ avoiding warnings about UTF-8 locale not being supported * Mon Mar 15 2004 Martyn Plummer <plummer(a)iarc.fr> -- No need to export optimization flags. This is done by %configure -- Folded info installation into %makeinstall +- No need to export optimization flags. This is done by %%configure +- Folded info installation into %%makeinstall - Check that RPM_BASE_ROOT is not set to "/" before cleaning up * Thu Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> @@ -1329,7 +1324,7 @@ R CMD javareconf \ * Tue Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> - Changes from James Henstridge <james(a)daa.com.au> to allow building on IA64: - Added BuildRequires for tcl-devel tk-devel tetex-latex -- Use the %configure macro to call the configure script +- Use the %%configure macro to call the configure script - Pass --with-tcl-config and --with-tk-config arguments to configure - Set rhome to point to the build root during "make install" diff --git a/sources b/sources index 90cbf30..e8b53a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54a79eebdf0cec3fd2c489fc94d99b00 R-2.9.1.tar.gz +112e2a1306cf71320e45d14e87e5b913 R-2.9.2.tar.gz commit 363527ef3092df9a839bb29a489a33794ac7179f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Aug 24 19:39:58 2009 +0000 update to 2.9.2 diff --git a/R.spec b/R.spec index 336b77c..cfb2f25 100644 --- a/R.spec +++ b/R.spec @@ -5,7 +5,7 @@ %endif Name: R -Version: 2.9.1 +Version: 2.9.2 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -57,25 +57,25 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # 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.37 -Provides: R-class = 7.2.47 +Provides: R-boot = 1.2.38 +Provides: R-class = 7.2.48 Provides: R-cluster = 1.12.0 Provides: R-codetools = 0.2.2 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.36 +Provides: R-foreign = 0.8.37 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.47 -Provides: R-Matrix = 0.999375.29 +Provides: R-MASS = 7.2.48 +Provides: R-Matrix = 0.999375.30 Provides: R-methods = %{version} Provides: R-mgcv = 1.5.5 -Provides: R-nlme = 3.1.92 -Provides: R-nnet = 7.2.47 -Provides: R-rpart = 3.1.44 -Provides: R-spatial = 7.2.47 +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-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -83,7 +83,7 @@ Provides: R-survival = 2.35.4 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = 7.2.47 +Provides: R-VR = 7.2.48 %description core A language and environment for statistical computing and graphics. @@ -198,7 +198,7 @@ make pdf make info # Convert to UTF-8 -for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do +for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,} mv $i{.utf8,} done @@ -235,7 +235,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do - sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i + sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i done # Fix exec bits @@ -932,6 +932,9 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.2-1 +- Update to 2.9.2 + * Thu Jul 9 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.1-1 - update to 2.9.1 - fix versioned provides @@ -1243,8 +1246,8 @@ fi avoiding warnings about UTF-8 locale not being supported * Mon Mar 15 2004 Martyn Plummer <plummer(a)iarc.fr> -- No need to export optimization flags. This is done by %configure -- Folded info installation into %makeinstall +- No need to export optimization flags. This is done by %%configure +- Folded info installation into %%makeinstall - Check that RPM_BASE_ROOT is not set to "/" before cleaning up * Thu Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> @@ -1253,7 +1256,7 @@ fi * Tue Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> - Changes from James Henstridge <james(a)daa.com.au> to allow building on IA64: - Added BuildRequires for tcl-devel tk-devel tetex-latex -- Use the %configure macro to call the configure script +- Use the %%configure macro to call the configure script - Pass --with-tcl-config and --with-tk-config arguments to configure - Set rhome to point to the build root during "make install" diff --git a/sources b/sources index 90cbf30..e8b53a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54a79eebdf0cec3fd2c489fc94d99b00 R-2.9.1.tar.gz +112e2a1306cf71320e45d14e87e5b913 R-2.9.2.tar.gz commit 4c30ea5bef20c9e8cc64fb455d443f5345f26833 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Fri Jul 24 16:06:36 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/R.spec b/R.spec index ace0db0..920bb98 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.9.1 -Release: 2%{?dist} +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 @@ -1004,6 +1004,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Jul 10 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.1-2 - don't try to make the PDFs in rawhide/i586 commit aecb205f189ed779da8de8897183e45166cc0dc8 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jul 10 14:29:03 2009 +0000 dont make the pdfs in rawhide/i586 due to tex bug diff --git a/R.spec b/R.spec index 656a485..ace0db0 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -230,7 +230,11 @@ export FCFLAGS="%{optflags}" make (cd src/nmath/standalone; make) #make check-all +# 2009-07-10 +# PDF generation is not working correctly in i586/rawhide, probably a texlive bug +%ifnarch i586 make pdf +%endif make info # Convert to UTF-8 @@ -240,7 +244,11 @@ for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-ex done %install -make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf +make DESTDIR=${RPM_BUILD_ROOT} install install-info +%ifnarch i586 +make DESTDIR=${RPM_BUILD_ROOT} install-pdf +%endif + rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version} @@ -263,7 +271,9 @@ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES +%ifnarch i586 touch -r NEWS doc/manual/*.pdf +%endif touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html @@ -994,6 +1004,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Jul 10 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.1-2 +- don't try to make the PDFs in rawhide/i586 + * Thu Jul 9 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.1-1 - update to 2.9.1 - fix versioned provides commit a83a316576942af0716624c8512be816f6961740 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jul 9 20:59:55 2009 +0000 update to 2.9.1, fix versioned Provides diff --git a/.cvsignore b/.cvsignore index b649cad..b1523e8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.9.0.tar.gz +R-2.9.1.tar.gz diff --git a/R.spec b/R.spec index cf0eebe..656a485 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.9.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 @@ -24,7 +24,7 @@ BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel -BuildRequires: gcc-objc, pango-devel +BuildRequires: gcc-objc, pango-devel, libicu-devel # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath @@ -57,34 +57,34 @@ 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 -Provides: R-class = 7.2 -Provides: R-cluster = 1.11.13 -Provides: R-codetools = 0.2 +Provides: R-boot = 1.2.37 +Provides: R-class = 7.2.47 +Provides: R-cluster = 1.12.0 +Provides: R-codetools = 0.2.2 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8 +Provides: R-foreign = 0.8.36 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.22 -Provides: R-lattice = 0.17 -Provides: R-MASS = 7.2 -Provides: R-Matrix = 0.999375-7 +Provides: R-KernSmooth = 2.23.2 +Provides: R-lattice = 0.17.25 +Provides: R-MASS = 7.2.47 +Provides: R-Matrix = 0.999375.29 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.5 -Provides: R-nlme = 3.1 -Provides: R-nnet = 7.2 -Provides: R-rpart = 3.1 -Provides: R-spatial = 7.2 +Provides: R-mgcv = 1.5.5 +Provides: R-nlme = 3.1.92 +Provides: R-nnet = 7.2.47 +Provides: R-rpart = 3.1.44 +Provides: R-spatial = 7.2.47 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.35 +Provides: R-survival = 2.35.4 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = 7.2 +Provides: R-VR = 7.2.47 %description core A language and environment for statistical computing and graphics. @@ -372,6 +372,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/class/NAMESPACE %{_libdir}/R/library/class/NEWS %dir %{_libdir}/R/library/class/po/ +%lang(de) %{_libdir}/R/library/class/po/de/ %lang(en) %{_libdir}/R/library/class/po/en*/ %lang(fr) %{_libdir}/R/library/class/po/fr/ %{_libdir}/R/library/class/R/ @@ -434,6 +435,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/foreign/Meta/ %{_libdir}/R/library/foreign/NAMESPACE %dir %{_libdir}/R/library/foreign/po/ +%lang(de) %{_libdir}/R/library/foreign/po/de/ %lang(en) %{_libdir}/R/library/foreign/po/en*/ %lang(fr) %{_libdir}/R/library/foreign/po/fr/ %{_libdir}/R/library/foreign/R/ @@ -524,6 +526,9 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_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 @@ -542,6 +547,10 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/lattice/Meta/ %{_libdir}/R/library/lattice/NAMESPACE %{_libdir}/R/library/lattice/NEWS +%dir %{_libdir}/R/library/lattice/po/ +%lang(de) %{_libdir}/R/library/lattice/po/de/ +%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 @@ -561,6 +570,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/MASS/NAMESPACE %{_libdir}/R/library/MASS/NEWS %dir %{_libdir}/R/library/MASS/po +%lang(de) %{_libdir}/R/library/MASS/po/de/ %lang(en) %{_libdir}/R/library/MASS/po/en*/ %lang(fr) %{_libdir}/R/library/MASS/po/fr/ %{_libdir}/R/library/MASS/R/ @@ -584,6 +594,9 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_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 @@ -643,6 +656,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/nlme/mlbook/ %{_libdir}/R/library/nlme/NAMESPACE %dir %{_libdir}/R/library/nlme/po/ +%lang(de) %{_libdir}/R/library/nlme/po/de/ %lang(en) %{_libdir}/R/library/nlme/po/en*/ %lang(fr) %{_libdir}/R/library/nlme/po/fr/ %{_libdir}/R/library/nlme/R/ @@ -664,6 +678,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/nnet/NAMESPACE %{_libdir}/R/library/nnet/NEWS %dir %{_libdir}/R/library/nnet/po +%lang(de) %{_libdir}/R/library/nnet/po/de/ %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ %{_libdir}/R/library/nnet/R/ @@ -683,6 +698,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/rpart/Meta/ %{_libdir}/R/library/rpart/NAMESPACE %dir %{_libdir}/R/library/rpart/po +%lang(de) %{_libdir}/R/library/rpart/po/de/ %lang(en) %{_libdir}/R/library/rpart/po/en*/ %lang(fr) %{_libdir}/R/library/rpart/po/fr/ %lang(ru) %{_libdir}/R/library/rpart/po/ru/ @@ -704,6 +720,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/spatial/NAMESPACE %{_libdir}/R/library/spatial/NEWS %dir %{_libdir}/R/library/spatial/po +%lang(de) %{_libdir}/R/library/spatial/po/de/ %lang(en) %{_libdir}/R/library/spatial/po/en*/ %lang(fr) %{_libdir}/R/library/spatial/po/fr/ %{_libdir}/R/library/spatial/ppdata/ @@ -977,6 +994,10 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Jul 9 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.1-1 +- update to 2.9.1 +- fix versioned provides + * Mon Apr 20 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-2 - properly Provide/Obsolete R-Matrix diff --git a/sources b/sources index b590a05..90cbf30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5b79a2bc1372136cda4674b5f46d146 R-2.9.0.tar.gz +54a79eebdf0cec3fd2c489fc94d99b00 R-2.9.1.tar.gz commit 0d3e2b89259ecd31117c2a8bf769d19461ef34d8 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jul 9 20:59:48 2009 +0000 update to 2.9.1, fix versioned Provides diff --git a/R.spec b/R.spec index bb68825..336b77c 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.9.0 -Release: 1%{?dist}.1 +Version: 2.9.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 @@ -57,33 +57,33 @@ Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # 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 = 7.2 -Provides: R-cluster = 1.11.13 -Provides: R-codetools = 0.2 +Provides: R-boot = 1.2.37 +Provides: R-class = 7.2.47 +Provides: R-cluster = 1.12.0 +Provides: R-codetools = 0.2.2 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8 +Provides: R-foreign = 0.8.36 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.22 -Provides: R-lattice = 0.17 -Provides: R-MASS = 7.2 -Provides: R-Matrix = 0.999375 +Provides: R-KernSmooth = 2.23.2 +Provides: R-lattice = 0.17.25 +Provides: R-MASS = 7.2.47 +Provides: R-Matrix = 0.999375.29 Provides: R-methods = %{version} -Provides: R-mgcv = 1.5 -Provides: R-nlme = 3.1 -Provides: R-nnet = 7.2 -Provides: R-rpart = 3.1 -Provides: R-spatial = 7.2 +Provides: R-mgcv = 1.5.5 +Provides: R-nlme = 3.1.92 +Provides: R-nnet = 7.2.47 +Provides: R-rpart = 3.1.44 +Provides: R-spatial = 7.2.47 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.35 +Provides: R-survival = 2.35.4 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = 7.2 +Provides: R-VR = 7.2.47 %description core A language and environment for statistical computing and graphics. @@ -336,6 +336,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/class/NAMESPACE %{_libdir}/R/library/class/NEWS %dir %{_libdir}/R/library/class/po/ +%lang(de) %{_libdir}/R/library/class/po/de/ %lang(en) %{_libdir}/R/library/class/po/en*/ %lang(fr) %{_libdir}/R/library/class/po/fr/ %{_libdir}/R/library/class/R/ @@ -398,6 +399,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/foreign/Meta/ %{_libdir}/R/library/foreign/NAMESPACE %dir %{_libdir}/R/library/foreign/po/ +%lang(de) %{_libdir}/R/library/foreign/po/de/ %lang(en) %{_libdir}/R/library/foreign/po/en*/ %lang(fr) %{_libdir}/R/library/foreign/po/fr/ %{_libdir}/R/library/foreign/R/ @@ -488,6 +490,9 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_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 @@ -506,6 +511,10 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/lattice/Meta/ %{_libdir}/R/library/lattice/NAMESPACE %{_libdir}/R/library/lattice/NEWS +%dir %{_libdir}/R/library/lattice/po/ +%lang(de) %{_libdir}/R/library/lattice/po/de/ +%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 @@ -525,6 +534,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/MASS/NAMESPACE %{_libdir}/R/library/MASS/NEWS %dir %{_libdir}/R/library/MASS/po +%lang(de) %{_libdir}/R/library/MASS/po/de/ %lang(en) %{_libdir}/R/library/MASS/po/en*/ %lang(fr) %{_libdir}/R/library/MASS/po/fr/ %{_libdir}/R/library/MASS/R/ @@ -548,6 +558,9 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_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 @@ -607,6 +620,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/nlme/mlbook/ %{_libdir}/R/library/nlme/NAMESPACE %dir %{_libdir}/R/library/nlme/po/ +%lang(de) %{_libdir}/R/library/nlme/po/de/ %lang(en) %{_libdir}/R/library/nlme/po/en*/ %lang(fr) %{_libdir}/R/library/nlme/po/fr/ %{_libdir}/R/library/nlme/R/ @@ -628,6 +642,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/nnet/NAMESPACE %{_libdir}/R/library/nnet/NEWS %dir %{_libdir}/R/library/nnet/po +%lang(de) %{_libdir}/R/library/nnet/po/de/ %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ %{_libdir}/R/library/nnet/R/ @@ -647,6 +662,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/rpart/Meta/ %{_libdir}/R/library/rpart/NAMESPACE %dir %{_libdir}/R/library/rpart/po +%lang(de) %{_libdir}/R/library/rpart/po/de/ %lang(en) %{_libdir}/R/library/rpart/po/en*/ %lang(fr) %{_libdir}/R/library/rpart/po/fr/ %lang(ru) %{_libdir}/R/library/rpart/po/ru/ @@ -668,6 +684,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/spatial/NAMESPACE %{_libdir}/R/library/spatial/NEWS %dir %{_libdir}/R/library/spatial/po +%lang(de) %{_libdir}/R/library/spatial/po/de/ %lang(en) %{_libdir}/R/library/spatial/po/en*/ %lang(fr) %{_libdir}/R/library/spatial/po/fr/ %{_libdir}/R/library/spatial/ppdata/ @@ -915,6 +932,10 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Jul 9 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.1-1 +- update to 2.9.1 +- fix versioned provides + * Wed Apr 29 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-1.1 - take out incorrect texlive Requires (no texlive until RHEL 6) - fix Requires: vi to be Requires: vim-minimal diff --git a/sources b/sources index b590a05..90cbf30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5b79a2bc1372136cda4674b5f46d146 R-2.9.0.tar.gz +54a79eebdf0cec3fd2c489fc94d99b00 R-2.9.1.tar.gz commit 0653ba4ecd4c6bec9b25212e4b34e57001dbc84e Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Apr 29 20:26:23 2009 +0000 EPEL build fixes diff --git a/R.spec b/R.spec index f5a5f90..bb68825 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.9.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 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 @@ -51,7 +51,7 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups -Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi +Requires: perl, sed, gawk, tetex-latex, less, vim-minimal # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -915,6 +915,10 @@ fi %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed Apr 29 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-1.1 +- take out incorrect texlive Requires (no texlive until RHEL 6) +- fix Requires: vi to be Requires: vim-minimal + * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-1 - update to 2.9.0, change vim dep to vi - EL-5 version, no java subpackages commit c1ad31fc54357d44c7c1fb9a95efb686ff138b19 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Apr 20 14:45:15 2009 +0000 Provide/Obsolete R-Matrix package diff --git a/R.spec b/R.spec index 3c1c871..cf0eebe 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -69,7 +69,8 @@ Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 Provides: R-lattice = 0.17 Provides: R-MASS = 7.2 -Provides: R-Matrix = 0.999375 +Provides: R-Matrix = 0.999375-7 +Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.5 Provides: R-nlme = 3.1 @@ -107,6 +108,8 @@ 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 +Obsoletes: R-Matrix-devel < 0.999375-7 %description devel Install R-devel if you are going to develop or compile R packages. @@ -974,6 +977,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Apr 20 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-2 +- properly Provide/Obsolete R-Matrix + * Fri Apr 17 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-1 - update to 2.9.0, change vim dep to vi commit 80a21942ca0b5b851c8362382fb58f2202a99757 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Apr 17 20:12:43 2009 +0000 2.9.0 diff --git a/.cvsignore b/.cvsignore index 6c23972..b649cad 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.8.1.tar.gz +R-2.9.0.tar.gz diff --git a/R.spec b/R.spec index 8196bf2..3c1c871 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.8.1 -Release: 9%{?dist} +Version: 2.9.0 +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 @@ -51,7 +51,7 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups -Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim +Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -59,7 +59,7 @@ Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = 7.2 -Provides: R-cluster = 1.11.11 +Provides: R-cluster = 1.11.13 Provides: R-codetools = 0.2 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -69,8 +69,9 @@ Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 Provides: R-lattice = 0.17 Provides: R-MASS = 7.2 +Provides: R-Matrix = 0.999375 Provides: R-methods = %{version} -Provides: R-mgcv = 1.4 +Provides: R-mgcv = 1.5 Provides: R-nlme = 3.1 Provides: R-nnet = 7.2 Provides: R-rpart = 3.1 @@ -78,7 +79,7 @@ Provides: R-spatial = 7.2 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.34 +Provides: R-survival = 2.35 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -562,6 +563,27 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_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/ +%{_libdir}/R/library/Matrix/DESCRIPTION +%{_libdir}/R/library/Matrix/Doxyfile +%{_libdir}/R/library/Matrix/external/ +%{_libdir}/R/library/Matrix/help/ +%{_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 +%{_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 @@ -774,7 +796,6 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/library/survival/NAMESPACE %{_libdir}/R/library/survival/R/ %{_libdir}/R/library/survival/R-ex/ -%{_libdir}/R/library/survival/survival.ps* # tcltk %dir %{_libdir}/R/library/tcltk/ %{_libdir}/R/library/tcltk/CONTENTS @@ -953,6 +974,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-1 +- update to 2.9.0, change vim dep to vi + * Tue Apr 7 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-9 - drop profile.d scripts, they broke more than they fixed - minimize hard-coded Requires based on Martyn Plummer's analysis diff --git a/sources b/sources index db054dd..b590a05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acd40621b8942a2464daa2f9cef3273d R-2.8.1.tar.gz +a5b79a2bc1372136cda4674b5f46d146 R-2.9.0.tar.gz commit f0519a4a49d8dace32fb3a7595052334d761f494 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Apr 17 20:12:42 2009 +0000 2.9.0 diff --git a/R.spec b/R.spec index 0a54a33..f5a5f90 100644 --- a/R.spec +++ b/R.spec @@ -5,8 +5,8 @@ %endif Name: R -Version: 2.8.1 -Release: 3%{?dist} +Version: 2.9.0 +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 @@ -51,6 +51,7 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups +Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -58,7 +59,7 @@ Requires: xdg-utils, cups Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = 7.2 -Provides: R-cluster = 1.11.11 +Provides: R-cluster = 1.11.13 Provides: R-codetools = 0.2 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -68,8 +69,9 @@ Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 Provides: R-lattice = 0.17 Provides: R-MASS = 7.2 +Provides: R-Matrix = 0.999375 Provides: R-methods = %{version} -Provides: R-mgcv = 1.4 +Provides: R-mgcv = 1.5 Provides: R-nlme = 3.1 Provides: R-nnet = 7.2 Provides: R-rpart = 3.1 @@ -77,7 +79,7 @@ Provides: R-spatial = 7.2 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.34 +Provides: R-survival = 2.35 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -98,21 +100,19 @@ computationally intensive tasks, C, C++ and Fortran code can be linked and called at run time. %package devel -Summary: files for development of R packages. +Summary: Files for development of R packages Group: Applications/Engineering Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version -Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo -Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel -Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -Requires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel +Requires: gcc-c++, gcc-gfortran, tetex-latex +Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig %description devel Install R-devel if you are going to develop or compile R packages. %package -n libRmath -Summary: standalone math library from the R project +Summary: Standalone math library from the R project Group: Development/Libraries %description -n libRmath @@ -120,7 +120,7 @@ A standalone library of mathematical and statistical functions derived from the R project. This packages provides the shared libRmath library. %package -n libRmath-devel -Summary: standalone math library from the R project +Summary: Standalone math library from the R project Group: Development/Libraries Requires: libRmath = %{version}-%{release}, pkgconfig @@ -197,6 +197,12 @@ make make pdf make info +# Convert to UTF-8 +for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do + iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,} + mv $i{.utf8,} +done + %install make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -232,6 +238,10 @@ for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i 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%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES + %files # Metapackage @@ -239,12 +249,594 @@ done %defattr(-, root, root, -) %{_bindir}/R %{_bindir}/Rscript -%{_datadir}/R +%dir %{_datadir}/R/ +%{_datadir}/R/encodings/ +%{_datadir}/R/java/ +%{_datadir}/R/library/ +%{_datadir}/R/licenses/ +%dir %{_datadir}/R/locale/ +%lang(de) %{_datadir}/R/locale/de/ +%lang(en) %{_datadir}/R/locale/en*/ +%lang(es) %{_datadir}/R/locale/es*/ +%lang(fr) %{_datadir}/R/locale/fr/ +%lang(it) %{_datadir}/R/locale/it/ +%lang(ja) %{_datadir}/R/locale/ja/ +%lang(ko) %{_datadir}/R/locale/ko/ +%lang(pt) %{_datadir}/R/locale/pt*/ +%lang(ru) %{_datadir}/R/locale/ru/ +%lang(zh) %{_datadir}/R/locale/zh*/ +%{_datadir}/R/make/ +%{_datadir}/R/perl/ +%{_datadir}/R/R/ +%{_datadir}/R/sh/ +%{_datadir}/R/texmf/ %dir %{_libdir}/R %{_libdir}/R/bin %{_libdir}/R/etc %{_libdir}/R/lib -%{_libdir}/R/library +# Have to break this out for the translations +%dir %{_libdir}/R/library +%{_libdir}/R/library/R.css +# 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/ +%lang(en) %{_libdir}/R/library/base/po/en*/ +%lang(fr) %{_libdir}/R/library/base/po/fr/ +%lang(it) %{_libdir}/R/library/base/po/it/ +%lang(ja) %{_libdir}/R/library/base/po/ja/ +%lang(ko) %{_libdir}/R/library/base/po/ko/ +%lang(pt) %{_libdir}/R/library/base/po/pt*/ +%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(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 +%dir %{_libdir}/R/library/class/po/ +%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/ +%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/ +%lang(de) %{_libdir}/R/library/graphics/po/de/ +%lang(en) %{_libdir}/R/library/graphics/po/en*/ +%lang(fr) %{_libdir}/R/library/graphics/po/fr/ +%lang(it) %{_libdir}/R/library/graphics/po/it/ +%lang(ja) %{_libdir}/R/library/graphics/po/ja/ +%lang(ko) %{_libdir}/R/library/graphics/po/ko/ +%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/ +%lang(de) %{_libdir}/R/library/grDevices/po/de/ +%lang(en) %{_libdir}/R/library/grDevices/po/en*/ +%lang(fr) %{_libdir}/R/library/grDevices/po/fr/ +%lang(it) %{_libdir}/R/library/grDevices/po/it/ +%lang(ja) %{_libdir}/R/library/grDevices/po/ja/ +%lang(ko) %{_libdir}/R/library/grDevices/po/ko/ +%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/ +%lang(de) %{_libdir}/R/library/grid/po/de/ +%lang(en) %{_libdir}/R/library/grid/po/en*/ +%lang(fr) %{_libdir}/R/library/grid/po/fr*/ +%lang(it) %{_libdir}/R/library/grid/po/it/ +%lang(ja) %{_libdir}/R/library/grid/po/ja/ +%lang(ko) %{_libdir}/R/library/grid/po/ko/ +%lang(pt) %{_libdir}/R/library/grid/po/pt*/ +%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 +%{_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/ +%{_libdir}/R/library/lattice/DESCRIPTION +%{_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 +%{_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 +%dir %{_libdir}/R/library/MASS/po +%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/ +%{_libdir}/R/library/Matrix/DESCRIPTION +%{_libdir}/R/library/Matrix/Doxyfile +%{_libdir}/R/library/Matrix/external/ +%{_libdir}/R/library/Matrix/help/ +%{_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 +%{_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/ +%lang(de) %{_libdir}/R/library/methods/po/de/ +%lang(en) %{_libdir}/R/library/methods/po/en*/ +%lang(fr) %{_libdir}/R/library/methods/po/fr/ +%lang(ja) %{_libdir}/R/library/methods/po/ja/ +%lang(ko) %{_libdir}/R/library/methods/po/ko/ +%lang(pt) %{_libdir}/R/library/methods/po/pt*/ +%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 +%dir %{_libdir}/R/library/nlme/po/ +%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 +%dir %{_libdir}/R/library/nnet/po +%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 +%lang(en) %{_libdir}/R/library/rpart/po/en*/ +%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 +%dir %{_libdir}/R/library/spatial/po +%lang(en) %{_libdir}/R/library/spatial/po/en*/ +%lang(fr) %{_libdir}/R/library/spatial/po/fr/ +%{_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 +%lang(de) %{_libdir}/R/library/splines/po/de/ +%lang(en) %{_libdir}/R/library/splines/po/en*/ +%lang(fr) %{_libdir}/R/library/splines/po/fr/ +%lang(ja) %{_libdir}/R/library/splines/po/ja/ +%lang(ko) %{_libdir}/R/library/splines/po/ko/ +%lang(pt) %{_libdir}/R/library/splines/po/pt*/ +%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 +%lang(de) %{_libdir}/R/library/stats/po/de/ +%lang(en) %{_libdir}/R/library/stats/po/en*/ +%lang(fr) %{_libdir}/R/library/stats/po/fr/ +%lang(it) %{_libdir}/R/library/stats/po/it/ +%lang(ja) %{_libdir}/R/library/stats/po/ja/ +%lang(ko) %{_libdir}/R/library/stats/po/ko/ +%lang(pt) %{_libdir}/R/library/stats/po/pt*/ +%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 +%lang(de) %{_libdir}/R/library/stats4/po/de/ +%lang(en) %{_libdir}/R/library/stats4/po/en*/ +%lang(fr) %{_libdir}/R/library/stats4/po/fr/ +%lang(it) %{_libdir}/R/library/stats4/po/it/ +%lang(ja) %{_libdir}/R/library/stats4/po/ja/ +%lang(ko) %{_libdir}/R/library/stats4/po/ko/ +%lang(pt) %{_libdir}/R/library/stats4/po/pt*/ +%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/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/ +%lang(de) %{_libdir}/R/library/tcltk/po/de/ +%lang(en) %{_libdir}/R/library/tcltk/po/en*/ +%lang(fr) %{_libdir}/R/library/tcltk/po/fr/ +%lang(it) %{_libdir}/R/library/tcltk/po/it/ +%lang(ja) %{_libdir}/R/library/tcltk/po/ja/ +%lang(ko) %{_libdir}/R/library/tcltk/po/ko/ +%lang(pt) %{_libdir}/R/library/tcltk/po/pt*/ +%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 +%lang(de) %{_libdir}/R/library/tools/po/de/ +%lang(en) %{_libdir}/R/library/tools/po/en*/ +%lang(fr) %{_libdir}/R/library/tools/po/fr/ +%lang(it) %{_libdir}/R/library/tools/po/it/ +%lang(ja) %{_libdir}/R/library/tools/po/ja/ +%lang(ko) %{_libdir}/R/library/tools/po/ko/ +%lang(pt) %{_libdir}/R/library/tools/po/pt*/ +%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 +%dir %{_libdir}/R/library/utils/po +%lang(de) %{_libdir}/R/library/utils/po/de/ +%lang(en) %{_libdir}/R/library/utils/po/en*/ +%lang(fr) %{_libdir}/R/library/utils/po/fr/ +%lang(ja) %{_libdir}/R/library/utils/po/ja/ +%lang(ko) %{_libdir}/R/library/utils/po/ko/ +%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 %{_libdir}/R/NEWS @@ -316,20 +908,42 @@ if [ $1 = 0 ]; then done fi -%postun core -/sbin/ldconfig +%postun core -p /sbin/ldconfig -%post -n libRmath -/sbin/ldconfig +%post -n libRmath -p /sbin/ldconfig -%postun -n libRmath -/sbin/ldconfig +%postun -n libRmath -p /sbin/ldconfig %changelog -* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-3 -- fix R-make-search-index.sh (bz 487022) +* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.9.0-1 +- update to 2.9.0, change vim dep to vi +- EL-5 version, no java subpackages + +* Tue Apr 7 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-9 +- drop profile.d scripts, they broke more than they fixed +- minimize hard-coded Requires based on Martyn Plummer's analysis + +* Sat Mar 28 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-8 +- fix profile scripts for situation where R_HOME is already defined + (bugzilla 492706) + +* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-7 +- bump for new tag + +* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-6 +- add profile.d scripts to set R_HOME +- rpmlint cleanups + +* Mon Mar 23 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-5 +- add R-java and R-java-devel "dummy" packages, so that we can get java dependent R-modules + to build/install + +* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-4 - update post scriptlet (bz 477076) +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jan 5 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-2 - add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard) - fix libRmath requires to need V-R (thanks to Martyn Plummer) diff --git a/sources b/sources index db054dd..b590a05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acd40621b8942a2464daa2f9cef3273d R-2.8.1.tar.gz +a5b79a2bc1372136cda4674b5f46d146 R-2.9.0.tar.gz commit 59e07a1dbad8d2f7b1cb06536b3bd52ec0a562c5 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 7 18:07:05 2009 +0000 drop profile.d scripts, minimize hard coded Requires diff --git a/R.spec b/R.spec index d0d11f8..8196bf2 100644 --- a/R.spec +++ b/R.spec @@ -6,14 +6,12 @@ Name: R Version: 2.8.1 -Release: 8%{?dist} +Release: 9%{?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 -Source3: R.sh -Source4: R.csh Patch1: R-2.7.2-filter_asoption.patch License: GPLv2+ Group: Applications/Engineering @@ -53,6 +51,7 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups +Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -104,10 +103,8 @@ Summary: Files for development of R packages Group: Applications/Engineering Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version -Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo -Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel -Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -Requires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel +Requires: gcc-c++, gcc-gfortran, tetex-latex +Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig %description devel @@ -260,11 +257,6 @@ install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ -# Install profile.d RHOME scripts -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ -install -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ -install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ - # Fix multilib touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES touch -r NEWS doc/manual/*.pdf @@ -863,7 +855,6 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d %{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* -%{_sysconfdir}/profile.d/R.*sh %{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* %{_docdir}/R-%{version} @@ -962,6 +953,10 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Apr 7 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-9 +- drop profile.d scripts, they broke more than they fixed +- minimize hard-coded Requires based on Martyn Plummer's analysis + * Sat Mar 28 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-8 - fix profile scripts for situation where R_HOME is already defined (bugzilla 492706) commit ea5471d7ce6dc8f582ffd4ebb11872a87b8683ee Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Mar 28 16:42:48 2009 +0000 fix profile scripts to handle case where R_HOME is already defined diff --git a/R.csh b/R.csh index 9fc3fba..1566bfe 100644 --- a/R.csh +++ b/R.csh @@ -1,4 +1,7 @@ # Some R modules are not smart enough to ask R for the value of RHOME # and instead depend on the R_HOME environment variable. -set RHOME = `R RHOME` -setenv R_HOME $RHOME +# Set R_HOME only if it is not already set. +if ( ${?R_HOME} == 0 ) then + set RHOME = `R RHOME` + setenv R_HOME $RHOME +endif diff --git a/R.sh b/R.sh index 0965404..14941df 100644 --- a/R.sh +++ b/R.sh @@ -1,3 +1,4 @@ # Some R modules are not smart enough to ask R for the value of RHOME # and instead depend on the R_HOME environment variable. -export R_HOME="`R RHOME`" +# Set R_HOME only if it is not already set. +test "a$R_HOME" = "a" && export R_HOME="`R RHOME`" diff --git a/R.spec b/R.spec index 35bca6b..d0d11f8 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 7%{?dist} +Release: 8%{?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 @@ -962,6 +962,10 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Sat Mar 28 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-8 +- fix profile scripts for situation where R_HOME is already defined + (bugzilla 492706) + * Tue Mar 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-7 - bump for new tag commit c8c2d280a879a759c43159f0d6e4bcf2adec82cc Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 25 01:59:42 2009 +0000 bump to 7, forgot to cvs add scripts diff --git a/R.spec b/R.spec index 1f08ac9..35bca6b 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 6%{?dist} +Release: 7%{?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 @@ -962,6 +962,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-7 +- bump for new tag + * Tue Mar 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-6 - add profile.d scripts to set R_HOME - rpmlint cleanups commit 47692b3b671f8b67c5b0a9cff63ce65c2ea0166a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 25 01:55:47 2009 +0000 add RHOME shell helper scripts, rpmlint cleanups diff --git a/R.csh b/R.csh new file mode 100644 index 0000000..9fc3fba --- /dev/null +++ b/R.csh @@ -0,0 +1,4 @@ +# Some R modules are not smart enough to ask R for the value of RHOME +# and instead depend on the R_HOME environment variable. +set RHOME = `R RHOME` +setenv R_HOME $RHOME diff --git a/R.sh b/R.sh new file mode 100644 index 0000000..0965404 --- /dev/null +++ b/R.sh @@ -0,0 +1,3 @@ +# Some R modules are not smart enough to ask R for the value of RHOME +# and instead depend on the R_HOME environment variable. +export R_HOME="`R RHOME`" diff --git a/R.spec b/R.spec index 8bfdd71..1f08ac9 100644 --- a/R.spec +++ b/R.spec @@ -6,12 +6,14 @@ Name: R Version: 2.8.1 -Release: 5%{?dist} +Release: 6%{?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 +Source3: R.sh +Source4: R.csh Patch1: R-2.7.2-filter_asoption.patch License: GPLv2+ Group: Applications/Engineering @@ -145,7 +147,7 @@ Install R-java-devel if you are going to develop or compile R packages that assume java is present and configured on the system. %package -n libRmath -Summary: standalone math library from the R project +Summary: Standalone math library from the R project Group: Development/Libraries %description -n libRmath @@ -153,7 +155,7 @@ A standalone library of mathematical and statistical functions derived from the R project. This packages provides the shared libRmath library. %package -n libRmath-devel -Summary: standalone math library from the R project +Summary: Standalone math library from the R project Group: Development/Libraries Requires: libRmath = %{version}-%{release}, pkgconfig @@ -230,6 +232,12 @@ make make pdf make info +# Convert to UTF-8 +for i in doc/manual/R-intro.info doc/manual/R-FAQ.info-1 doc/FAQ doc/manual/R-exts.info-1; do + iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,} + mv $i{.utf8,} +done + %install make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -252,6 +260,11 @@ install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ +# Install profile.d RHOME scripts +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ +install -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ +install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ + # Fix multilib touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES touch -r NEWS doc/manual/*.pdf @@ -265,6 +278,10 @@ for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i 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%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES + %files # Metapackage @@ -272,18 +289,581 @@ done %defattr(-, root, root, -) %{_bindir}/R %{_bindir}/Rscript -%{_datadir}/R +%dir %{_datadir}/R/ +%{_datadir}/R/encodings/ +%{_datadir}/R/java/ +%{_datadir}/R/library/ +%{_datadir}/R/licenses/ +%dir %{_datadir}/R/locale/ +%lang(de) %{_datadir}/R/locale/de/ +%lang(en) %{_datadir}/R/locale/en*/ +%lang(es) %{_datadir}/R/locale/es*/ +%lang(fr) %{_datadir}/R/locale/fr/ +%lang(it) %{_datadir}/R/locale/it/ +%lang(ja) %{_datadir}/R/locale/ja/ +%lang(ko) %{_datadir}/R/locale/ko/ +%lang(pt) %{_datadir}/R/locale/pt*/ +%lang(ru) %{_datadir}/R/locale/ru/ +%lang(zh) %{_datadir}/R/locale/zh*/ +%{_datadir}/R/make/ +%{_datadir}/R/perl/ +%{_datadir}/R/R/ +%{_datadir}/R/sh/ +%{_datadir}/R/texmf/ %dir %{_libdir}/R %{_libdir}/R/bin %{_libdir}/R/etc %{_libdir}/R/lib -%{_libdir}/R/library +# Have to break this out for the translations +%dir %{_libdir}/R/library +%{_libdir}/R/library/R.css +# 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/ +%lang(en) %{_libdir}/R/library/base/po/en*/ +%lang(fr) %{_libdir}/R/library/base/po/fr/ +%lang(it) %{_libdir}/R/library/base/po/it/ +%lang(ja) %{_libdir}/R/library/base/po/ja/ +%lang(ko) %{_libdir}/R/library/base/po/ko/ +%lang(pt) %{_libdir}/R/library/base/po/pt*/ +%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(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 +%dir %{_libdir}/R/library/class/po/ +%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/ +%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/ +%lang(de) %{_libdir}/R/library/graphics/po/de/ +%lang(en) %{_libdir}/R/library/graphics/po/en*/ +%lang(fr) %{_libdir}/R/library/graphics/po/fr/ +%lang(it) %{_libdir}/R/library/graphics/po/it/ +%lang(ja) %{_libdir}/R/library/graphics/po/ja/ +%lang(ko) %{_libdir}/R/library/graphics/po/ko/ +%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/ +%lang(de) %{_libdir}/R/library/grDevices/po/de/ +%lang(en) %{_libdir}/R/library/grDevices/po/en*/ +%lang(fr) %{_libdir}/R/library/grDevices/po/fr/ +%lang(it) %{_libdir}/R/library/grDevices/po/it/ +%lang(ja) %{_libdir}/R/library/grDevices/po/ja/ +%lang(ko) %{_libdir}/R/library/grDevices/po/ko/ +%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/ +%lang(de) %{_libdir}/R/library/grid/po/de/ +%lang(en) %{_libdir}/R/library/grid/po/en*/ +%lang(fr) %{_libdir}/R/library/grid/po/fr*/ +%lang(it) %{_libdir}/R/library/grid/po/it/ +%lang(ja) %{_libdir}/R/library/grid/po/ja/ +%lang(ko) %{_libdir}/R/library/grid/po/ko/ +%lang(pt) %{_libdir}/R/library/grid/po/pt*/ +%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 +%{_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/ +%{_libdir}/R/library/lattice/DESCRIPTION +%{_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 +%{_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 +%dir %{_libdir}/R/library/MASS/po +%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/ +# 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/ +%lang(de) %{_libdir}/R/library/methods/po/de/ +%lang(en) %{_libdir}/R/library/methods/po/en*/ +%lang(fr) %{_libdir}/R/library/methods/po/fr/ +%lang(ja) %{_libdir}/R/library/methods/po/ja/ +%lang(ko) %{_libdir}/R/library/methods/po/ko/ +%lang(pt) %{_libdir}/R/library/methods/po/pt*/ +%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 +%dir %{_libdir}/R/library/nlme/po/ +%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 +%dir %{_libdir}/R/library/nnet/po +%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 +%lang(en) %{_libdir}/R/library/rpart/po/en*/ +%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 +%dir %{_libdir}/R/library/spatial/po +%lang(en) %{_libdir}/R/library/spatial/po/en*/ +%lang(fr) %{_libdir}/R/library/spatial/po/fr/ +%{_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 +%lang(de) %{_libdir}/R/library/splines/po/de/ +%lang(en) %{_libdir}/R/library/splines/po/en*/ +%lang(fr) %{_libdir}/R/library/splines/po/fr/ +%lang(ja) %{_libdir}/R/library/splines/po/ja/ +%lang(ko) %{_libdir}/R/library/splines/po/ko/ +%lang(pt) %{_libdir}/R/library/splines/po/pt*/ +%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 +%lang(de) %{_libdir}/R/library/stats/po/de/ +%lang(en) %{_libdir}/R/library/stats/po/en*/ +%lang(fr) %{_libdir}/R/library/stats/po/fr/ +%lang(it) %{_libdir}/R/library/stats/po/it/ +%lang(ja) %{_libdir}/R/library/stats/po/ja/ +%lang(ko) %{_libdir}/R/library/stats/po/ko/ +%lang(pt) %{_libdir}/R/library/stats/po/pt*/ +%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 +%lang(de) %{_libdir}/R/library/stats4/po/de/ +%lang(en) %{_libdir}/R/library/stats4/po/en*/ +%lang(fr) %{_libdir}/R/library/stats4/po/fr/ +%lang(it) %{_libdir}/R/library/stats4/po/it/ +%lang(ja) %{_libdir}/R/library/stats4/po/ja/ +%lang(ko) %{_libdir}/R/library/stats4/po/ko/ +%lang(pt) %{_libdir}/R/library/stats4/po/pt*/ +%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/R/ +%{_libdir}/R/library/survival/R-ex/ +%{_libdir}/R/library/survival/survival.ps* +# 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/ +%lang(de) %{_libdir}/R/library/tcltk/po/de/ +%lang(en) %{_libdir}/R/library/tcltk/po/en*/ +%lang(fr) %{_libdir}/R/library/tcltk/po/fr/ +%lang(it) %{_libdir}/R/library/tcltk/po/it/ +%lang(ja) %{_libdir}/R/library/tcltk/po/ja/ +%lang(ko) %{_libdir}/R/library/tcltk/po/ko/ +%lang(pt) %{_libdir}/R/library/tcltk/po/pt*/ +%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 +%lang(de) %{_libdir}/R/library/tools/po/de/ +%lang(en) %{_libdir}/R/library/tools/po/en*/ +%lang(fr) %{_libdir}/R/library/tools/po/fr/ +%lang(it) %{_libdir}/R/library/tools/po/it/ +%lang(ja) %{_libdir}/R/library/tools/po/ja/ +%lang(ko) %{_libdir}/R/library/tools/po/ko/ +%lang(pt) %{_libdir}/R/library/tools/po/pt*/ +%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 +%dir %{_libdir}/R/library/utils/po +%lang(de) %{_libdir}/R/library/utils/po/de/ +%lang(en) %{_libdir}/R/library/utils/po/en*/ +%lang(fr) %{_libdir}/R/library/utils/po/fr/ +%lang(ja) %{_libdir}/R/library/utils/po/ja/ +%lang(ko) %{_libdir}/R/library/utils/po/ko/ +%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 %{_libdir}/R/NEWS %{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* +%{_sysconfdir}/profile.d/R.*sh %{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* %{_docdir}/R-%{version} @@ -355,8 +935,7 @@ if [ $1 = 0 ]; then done fi -%postun core -/sbin/ldconfig +%postun core -p /sbin/ldconfig %post java R CMD javareconf \ @@ -378,13 +957,15 @@ 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 -%post -n libRmath -/sbin/ldconfig +%post -n libRmath -p /sbin/ldconfig -%postun -n libRmath -/sbin/ldconfig +%postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Mar 24 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-6 +- add profile.d scripts to set R_HOME +- rpmlint cleanups + * Mon Mar 23 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-5 - add R-java and R-java-devel "dummy" packages, so that we can get java dependent R-modules to build/install commit 4ea483f39299e5bd1674978547d38fe0f51fc0e1 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Mar 23 22:38:12 2009 +0000 enable R-java, R-java-devel dummy packages diff --git a/R.spec b/R.spec index 9241ae0..8bfdd71 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 4%{?dist} +Release: 5%{?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 @@ -98,7 +98,7 @@ computationally intensive tasks, C, C++ and Fortran code can be linked and called at run time. %package devel -Summary: files for development of R packages. +Summary: Files for development of R packages Group: Applications/Engineering Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version @@ -111,6 +111,39 @@ Requires: tcl-devel, tk-devel, pkgconfig %description devel Install R-devel if you are going to develop or compile R packages. +%package java +Summary: R with Fedora provided Java Runtime Environment +Group: Applications/Engineering +Requires(post): R-core = %{version}-%{release} +Requires(post): java + +%description java +A language and environment for statistical computing and graphics. +R is similar to the award-winning S system, which was developed at +Bell Laboratories by John Chambers et al. It provides a wide +variety of statistical and graphical techniques (linear and +nonlinear modelling, statistical tests, time series analysis, +classification, clustering, ...). + +R is designed as a true computer language with control-flow +constructions for iteration and alternation, and it allows users to +add additional functionality by defining new functions. For +computationally intensive tasks, C, C++ and Fortran code can be linked +and called at run time. + +This package also has an additional dependency on java, as provided by +Fedora's openJDK. + +%package java-devel +Summary: Development package for use with Java enabled R components +Group: Applications/Engineering +Requires(post): R-devel = %{version}-%{release} +Requires(post): java-devel + +%description java-devel +Install R-java-devel if you are going to develop or compile R packages +that assume java is present and configured on the system. + %package -n libRmath Summary: standalone math library from the R project Group: Development/Libraries @@ -262,6 +295,12 @@ done %{_libdir}/pkgconfig/libR.pc %{_includedir}/R +%files java +# Nothing, all files provided by R-core + +%files java-devel +# Nothing, all files provided by R-devel + %files -n libRmath %defattr(-, root, root, -) %{_libdir}/libRmath.so @@ -319,6 +358,26 @@ fi %postun core /sbin/ldconfig +%post java +R CMD javareconf \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + 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 + +%post java-devel +R CMD javareconf \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + 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 + %post -n libRmath /sbin/ldconfig @@ -326,6 +385,10 @@ fi /sbin/ldconfig %changelog +* Mon Mar 23 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-5 +- add R-java and R-java-devel "dummy" packages, so that we can get java dependent R-modules + to build/install + * Wed Mar 4 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-4 - update post scriptlet (bz 477076) commit 0207d3fe527015aca76cf5df1fa7a637de1c7739 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 4 20:50:11 2009 +0000 fix EPEL R-make-search-index.sh, improve java scriptlet diff --git a/R-make-search-index.sh b/R-make-search-index.sh index f0a119e..94440c2 100755 --- a/R-make-search-index.sh +++ b/R-make-search-index.sh @@ -3,9 +3,19 @@ # Figure out what RHOME is set to TMP_R_HOME=`R RHOME` -# Write out all the contents in arch and noarch library locations -cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null -cat /usr/share/R/library/*/CONTENTS >> $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null +# Figure out what R_DOC_DIR is set to +# Ideally, we could ask R just like we do for RHOME, but we can't yet. +TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2` + +# Write out all the contents in arch library locations +cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +# Don't use .. based paths, substitute TMP_R_HOME +sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt + +# Write out all the contents in noarch library locations +cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +# Don't use .. based paths, substitute /usr/share/R +sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt exit 0 diff --git a/R.spec b/R.spec index 595c1fa..0a54a33 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 2%{?dist} +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 @@ -286,16 +286,12 @@ for doc in admin exts FAQ intro lang; do done /sbin/ldconfig R CMD javareconf \ - JAR=%{jar} \ - JAVA=%{java} \ - JAVAC=%{javac} \ - JAVA_HOME=%{java_home}/jre \ - JAVAH=%{java_home}/bin/javah \ - JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ - JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ - -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + 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 # Update package indices @@ -330,6 +326,10 @@ fi /sbin/ldconfig %changelog +* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-3 +- fix R-make-search-index.sh (bz 487022) +- update post scriptlet (bz 477076) + * Mon Jan 5 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-2 - add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard) - fix libRmath requires to need V-R (thanks to Martyn Plummer) commit c025d0732ff92f6fb75a609a5dd193149f97f815 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Mar 4 20:50:11 2009 +0000 fix EPEL R-make-search-index.sh, improve java scriptlet diff --git a/R.spec b/R.spec index 3403fdf..9241ae0 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -286,16 +286,12 @@ for doc in admin exts FAQ intro lang; do done /sbin/ldconfig R CMD javareconf \ - JAR=%{jar} \ - JAVA=%{java} \ - JAVAC=%{javac} \ - JAVA_HOME=%{java_home}/jre \ - JAVAH=%{java_home}/bin/javah \ - JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ - JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ - -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + JAVA_HOME=%{_jvmdir}/jre \ + JAVA_CPPFLAGS='-I%{_jvmdir}/java/include\ -I%{_jvmdir}/java/include/linux' \ + JAVA_LIBS='-L%{_jvmdir}/jre/lib/%{java_arch}/server \ + -L%{_jvmdir}/jre/lib/%{java_arch}\ -L%{_jvmdir}/java/lib/%{java_arch} \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ - JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + 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 # Update package indices @@ -330,6 +326,9 @@ fi /sbin/ldconfig %changelog +* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.8.1-4 +- update post scriptlet (bz 477076) + * Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild commit ef5b8412cff270f7dbb7a73faca6ca399dd9e0a5 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Mon Feb 23 22:44:31 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/R.spec b/R.spec index 4b4ffbd..3403fdf 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 2%{?dist} +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 @@ -330,6 +330,9 @@ fi /sbin/ldconfig %changelog +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jan 5 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-2 - add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard) - fix libRmath requires to need V-R (thanks to Martyn Plummer) commit dceed37d30e242b8e579e63a5ec3effbe81a0882 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jan 5 15:11:51 2009 +0000 Add pango-devel to BuildRequires, fix versioned dependency on libRmath diff --git a/R.spec b/R.spec index 1a9fda6..4b4ffbd 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -24,7 +24,7 @@ BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel -BuildRequires: gcc-objc +BuildRequires: gcc-objc, pango-devel # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath @@ -122,7 +122,7 @@ from the R project. This packages provides the shared libRmath library. %package -n libRmath-devel Summary: standalone math library from the R project Group: Development/Libraries -Requires: libRmath = %{version}, pkgconfig +Requires: libRmath = %{version}-%{release}, pkgconfig %description -n libRmath-devel A standalone library of mathematical and statistical functions derived @@ -330,6 +330,10 @@ fi /sbin/ldconfig %changelog +* Mon Jan 5 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-2 +- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard) +- fix libRmath requires to need V-R (thanks to Martyn Plummer) + * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-1 - update javareconf call in %%post (bz 477076) - 2.8.1 commit a5e1a9d6982a265626296864bb3649b0f15cdd69 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jan 5 15:11:49 2009 +0000 Add pango-devel to BuildRequires, fix versioned dependency on libRmath diff --git a/R.spec b/R.spec index 355015f..595c1fa 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ Name: R Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -24,7 +24,7 @@ BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel -BuildRequires: gcc-objc +BuildRequires: gcc-objc, pango-devel # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath @@ -122,7 +122,7 @@ from the R project. This packages provides the shared libRmath library. %package -n libRmath-devel Summary: standalone math library from the R project Group: Development/Libraries -Requires: libRmath = %{version}, pkgconfig +Requires: libRmath = %{version}-%{release}, pkgconfig %description -n libRmath-devel A standalone library of mathematical and statistical functions derived @@ -330,6 +330,10 @@ fi /sbin/ldconfig %changelog +* Mon Jan 5 2009 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-2 +- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard) +- fix libRmath requires to need V-R (thanks to Martyn Plummer) + * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-1 - update javareconf call in %%post (bz 477076) - 2.8.1 commit 4c6489b85e35dc12a9c49f8e57052c2f0794d3ac Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Dec 22 16:27:50 2008 +0000 2.8.1 diff --git a/.cvsignore b/.cvsignore index 7dec012..6c23972 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.8.0.tar.gz +R-2.8.1.tar.gz diff --git a/R.spec b/R.spec index 3a77cab..1a9fda6 100644 --- a/R.spec +++ b/R.spec @@ -1,14 +1,18 @@ +%ifarch x86_64 +%define java_arch amd64 +%else +%define java_arch %{_arch} +%endif + Name: R -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.8.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 Source1: macros.R Source2: R-make-search-index.sh Patch1: R-2.7.2-filter_asoption.patch -# fix bzlib2 detection, sent upstream 10-26-2008 -Patch2: R-2.8.0-HAVE_BZLIB_H.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,7 +132,6 @@ and header files. %prep %setup -q %patch1 -p1 -b .filter-little-out -%patch2 -p1 -b .BZLIB_H # Filter false positive provides. cat <<EOF > %{name}-prov @@ -282,7 +285,18 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig -R CMD javareconf > /dev/null 2>&1 || exit 0 +R CMD javareconf \ + JAR=%{jar} \ + JAVA=%{java} \ + JAVAC=%{javac} \ + JAVA_HOME=%{java_home}/jre \ + JAVAH=%{java_home}/bin/javah \ + JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ + JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ + -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + > /dev/null 2>&1 || exit 0 # Update package indices %__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null @@ -316,6 +330,10 @@ fi /sbin/ldconfig %changelog +* Mon Dec 22 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-1 +- update javareconf call in %%post (bz 477076) +- 2.8.1 + * Sun Oct 26 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.0-2 - enable libtiff interface diff --git a/sources b/sources index 4d9e9f1..db054dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5213c9644aec984278b669df1a63a2ce R-2.8.0.tar.gz +acd40621b8942a2464daa2f9cef3273d R-2.8.1.tar.gz commit b78d665c771a7917fbd6249ea01a116879da10e6 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Dec 22 16:27:48 2008 +0000 2.8.1 diff --git a/R.spec b/R.spec index 98220ae..355015f 100644 --- a/R.spec +++ b/R.spec @@ -1,14 +1,18 @@ +%ifarch x86_64 +%define java_arch amd64 +%else +%define java_arch %{_arch} +%endif + Name: R -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.8.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 Source1: macros.R Source2: R-make-search-index.sh Patch1: R-2.7.2-filter_asoption.patch -# fix bzlib2 detection, sent upstream 10-26-2008 -Patch2: R-2.8.0-HAVE_BZLIB_H.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,7 +132,6 @@ and header files. %prep %setup -q %patch1 -p1 -b .filter-little-out -%patch2 -p1 -b .BZLIB_H # Filter false positive provides. cat <<EOF > %{name}-prov @@ -282,7 +285,18 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig -R CMD javareconf > /dev/null 2>&1 || exit 0 +R CMD javareconf \ + JAR=%{jar} \ + JAVA=%{java} \ + JAVAC=%{javac} \ + JAVA_HOME=%{java_home}/jre \ + JAVAH=%{java_home}/bin/javah \ + JAVA_CPPFLAGS='-I%{java_home}/include\ -I%{java_home}/include/linux' \ + JAVA_LIBS='-L%{java_home}/jre/lib/%{java_arch}/server \ + -L%{java_home}/jre/lib/%{java_arch}\ -L%{java_home}/lib/%{java_arch} \ + -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ + JAVA_LD_LIBRARY_PATH=%{java_home}/jre/lib/%{java_arch}/server:%{java_home}/jre/lib/%{java_arch}:%{java_home}/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ + > /dev/null 2>&1 || exit 0 # Update package indices %__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null @@ -316,6 +330,10 @@ fi /sbin/ldconfig %changelog +* Mon Dec 22 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.1-1 +- update javareconf call in %%post (bz 477076) +- 2.8.1 + * Sun Oct 26 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.0-2 - enable libtiff interface diff --git a/sources b/sources index 4d9e9f1..db054dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5213c9644aec984278b669df1a63a2ce R-2.8.0.tar.gz +acd40621b8942a2464daa2f9cef3273d R-2.8.1.tar.gz commit 589d7e08733f3fa1556dbe04e919523d4e703017 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sun Oct 26 20:15:26 2008 +0000 enable libtiff interface diff --git a/R.spec b/R.spec index 1ea760c..3a77cab 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -19,7 +19,7 @@ BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -BuildRequires: bzip2-devel, libXmu-devel, cairo-devel +BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel BuildRequires: gcc-objc # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} @@ -101,7 +101,7 @@ Requires: R-core = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -Requires: bzip2-devel, libXmu-devel, cairo-devel +Requires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel Requires: tcl-devel, tk-devel, pkgconfig %description devel @@ -316,6 +316,9 @@ fi /sbin/ldconfig %changelog +* Sun Oct 26 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.0-2 +- enable libtiff interface + * Sun Oct 26 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.0-1 - Update to 2.8.0 - New subpackage layout: R-core is functional userspace, R is metapackage commit b285438f3a26cd554f58918cddf126b3f3f71f88 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sun Oct 26 20:15:25 2008 +0000 enable libtiff interface diff --git a/R.spec b/R.spec index cd95cee..98220ae 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -19,7 +19,7 @@ BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -BuildRequires: bzip2-devel, libXmu-devel, cairo-devel +BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel BuildRequires: gcc-objc # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} @@ -101,7 +101,7 @@ Requires: R-core = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -Requires: bzip2-devel, libXmu-devel, cairo-devel +Requires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel Requires: tcl-devel, tk-devel, pkgconfig %description devel @@ -316,6 +316,9 @@ fi /sbin/ldconfig %changelog +* Sun Oct 26 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.0-2 +- enable libtiff interface + * Sun Oct 26 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.0-1 - Update to 2.8.0 - New subpackage layout: R-core is functional userspace, R is metapackage commit 72b771423eee3117a016ef21b3944b59d3c4b572 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sun Oct 26 20:11:25 2008 +0000 push 2.8.0 to all branches diff --git a/R-2.7.2-filter_asoption.patch b/R-2.7.2-filter_asoption.patch new file mode 100644 index 0000000..e200e71 --- /dev/null +++ b/R-2.7.2-filter_asoption.patch @@ -0,0 +1,11 @@ +--- R-2.7.2/configure.org 2008-09-25 15:00:20.000000000 +0900 ++++ R-2.7.2/configure 2008-09-25 15:00:35.000000000 +0900 +@@ -26995,7 +26995,7 @@ + + ;; + # Ignore these flags. +- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) ++ -little | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) + ;; + -lkernel32) + test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" diff --git a/R-2.8.0-HAVE_BZLIB_H.patch b/R-2.8.0-HAVE_BZLIB_H.patch new file mode 100644 index 0000000..eec7fc7 --- /dev/null +++ b/R-2.8.0-HAVE_BZLIB_H.patch @@ -0,0 +1,26 @@ +diff -up R-2.8.0/configure.BAD R-2.8.0/configure +--- R-2.8.0/configure.BAD 2008-10-26 11:51:56.000000000 -0400 ++++ R-2.8.0/configure 2008-10-26 11:52:31.000000000 -0400 +@@ -44779,6 +44779,11 @@ else + have_bzlib=no + fi + if test "x${have_bzlib}" = xyes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_BZLIB_H 1 ++_ACEOF ++ + { echo "$as_me:$LINENO: checking if bzip2 version >= 1.0.5" >&5 + echo $ECHO_N "checking if bzip2 version >= 1.0.5... $ECHO_C" >&6; } + if test "${r_cv_have_bzlib+set}" = set; then +diff -up R-2.8.0/m4/R.m4.BAD R-2.8.0/m4/R.m4 +--- R-2.8.0/m4/R.m4.BAD 2008-09-21 18:05:06.000000000 -0400 ++++ R-2.8.0/m4/R.m4 2008-10-26 11:53:05.000000000 -0400 +@@ -3055,6 +3055,7 @@ else + have_bzlib=no + fi + if test "x${have_bzlib}" = xyes; then ++AC_DEFINE(HAVE_BZLIB_H, 1, [Define to 1 if you have bzlib.h.]) + AC_CACHE_CHECK([if bzip2 version >= 1.0.5], [r_cv_have_bzlib], + [AC_LANG_PUSH(C) + r_save_LIBS="${LIBS}" diff --git a/R.spec b/R.spec index 169c4c3..cd95cee 100644 --- a/R.spec +++ b/R.spec @@ -1,14 +1,14 @@ Name: R -Version: 2.7.2 +Version: 2.8.0 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 Source1: macros.R Source2: R-make-search-index.sh -# Sent upstream: -# http://bugs.r-project.org/cgi-bin/R/incoming?id=12636 -Patch0: R-2.7.1-javareconf-tmpfix.patch +Patch1: R-2.7.2-filter_asoption.patch +# fix bzlib2 detection, sent upstream 10-26-2008 +Patch2: R-2.8.0-HAVE_BZLIB_H.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,11 +21,36 @@ BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel BuildRequires: gcc-objc +# R-devel will pull in R-core +Requires: R-devel = %{version}-%{release} +# libRmath-devel will pull in libRmath +Requires: libRmath-devel = %{version}-%{release} + +%description +This is a metapackage that provides both core R userspace and +all R development components. + +R is a language and environment for statistical computing and graphics. +R is similar to the award-winning S system, which was developed at +Bell Laboratories by John Chambers et al. It provides a wide +variety of statistical and graphical techniques (linear and +nonlinear modelling, statistical tests, time series analysis, +classification, clustering, ...). + +R is designed as a true computer language with control-flow +constructions for iteration and alternation, and it allows users to +add additional functionality by defining new functions. For +computationally intensive tasks, C, C++ and Fortran code can be linked +and called at run time. + +%package core +Summary: The minimal R components necessary for a functional runtime +Group: Applications/Engineering Requires: xdg-utils, cups -# 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. +# These are the submodules that R-core 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 = 7.2 @@ -54,10 +79,10 @@ Provides: R-tools = %{version} Provides: R-utils = %{version} Provides: R-VR = 7.2 -%description -A language and environment for statistical computing and graphics. -R is similar to the award-winning S system, which was developed at -Bell Laboratories by John Chambers et al. It provides a wide +%description core +A language and environment for statistical computing and graphics. +R is similar to the award-winning S system, which was developed at +Bell Laboratories by John Chambers et al. It provides a wide variety of statistical and graphical techniques (linear and nonlinear modelling, statistical tests, time series analysis, classification, clustering, ...). @@ -71,7 +96,7 @@ and called at run time. %package devel Summary: files for development of R packages. Group: Applications/Engineering -Requires: R = %{version}-%{release} +Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel @@ -102,7 +127,8 @@ and header files. %prep %setup -q -%patch0 -p1 -b .javareconf-tmpfix +%patch1 -p1 -b .filter-little-out +%patch2 -p1 -b .BZLIB_H # Filter false positive provides. cat <<EOF > %{name}-prov @@ -137,7 +163,7 @@ case "%{_target_cpu}" in export F77="gfortran -m64" export FC="gfortran -m64" ;; - ia64|alpha) + ia64|alpha|sh*) export CC="gcc" export CXX="g++" export F77="gfortran" @@ -204,7 +230,10 @@ for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do done %files -%defattr(-, root, root) +# Metapackage + +%files core +%defattr(-, root, root, -) %{_bindir}/R %{_bindir}/Rscript %{_datadir}/R @@ -226,16 +255,16 @@ done /etc/ld.so.conf.d/* %files devel -%defattr(-, root, root) +%defattr(-, root, root, -) %{_libdir}/pkgconfig/libR.pc %{_includedir}/R %files -n libRmath -%defattr(-, root, root) +%defattr(-, root, root, -) %{_libdir}/libRmath.so %files -n libRmath-devel -%defattr(-, root, root) +%defattr(-, root, root, -) %{_libdir}/libRmath.a %{_includedir}/Rmath.h %{_libdir}/pkgconfig/libRmath.pc @@ -243,7 +272,7 @@ done %clean rm -rf ${RPM_BUILD_ROOT}; -%post +%post core # Create directory entries for info files # (optional doc files, so we must check that they are installed) for doc in admin exts FAQ intro lang; do @@ -266,7 +295,7 @@ sed -i "s!../../..!%{_libdir}/R!g" %{_docdir}/R-%{version}/html/search/index.txt sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt -%preun +%preun core if [ $1 = 0 ]; then # Delete directory entries for info files (if they were installed) for doc in admin exts FAQ intro lang; do @@ -277,7 +306,7 @@ if [ $1 = 0 ]; then done fi -%postun +%postun core /sbin/ldconfig %post -n libRmath @@ -287,6 +316,15 @@ fi /sbin/ldconfig %changelog +* Sun Oct 26 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.0-1 +- Update to 2.8.0 +- New subpackage layout: R-core is functional userspace, R is metapackage + requiring everything +- Fix system bzip2 detection + +* Thu Oct 16 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.2-2 +- fix sh compile (bz 464055) + * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.2-1 - update to 2.7.2 - fix spec for alpha compile (bz 458931) diff --git a/sources b/sources index 48ccee7..4d9e9f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6122945e9301825b97a506151b3cefde R-2.7.2.tar.gz +5213c9644aec984278b669df1a63a2ce R-2.8.0.tar.gz commit c6b2c8e7c5c054cdadea060b46d21242bebfdb3c Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sun Oct 26 19:59:58 2008 +0000 R 2.8.0 diff --git a/.cvsignore b/.cvsignore index 59aef1f..7dec012 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.7.2.tar.gz +R-2.8.0.tar.gz diff --git a/R-2.8.0-HAVE_BZLIB_H.patch b/R-2.8.0-HAVE_BZLIB_H.patch new file mode 100644 index 0000000..eec7fc7 --- /dev/null +++ b/R-2.8.0-HAVE_BZLIB_H.patch @@ -0,0 +1,26 @@ +diff -up R-2.8.0/configure.BAD R-2.8.0/configure +--- R-2.8.0/configure.BAD 2008-10-26 11:51:56.000000000 -0400 ++++ R-2.8.0/configure 2008-10-26 11:52:31.000000000 -0400 +@@ -44779,6 +44779,11 @@ else + have_bzlib=no + fi + if test "x${have_bzlib}" = xyes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_BZLIB_H 1 ++_ACEOF ++ + { echo "$as_me:$LINENO: checking if bzip2 version >= 1.0.5" >&5 + echo $ECHO_N "checking if bzip2 version >= 1.0.5... $ECHO_C" >&6; } + if test "${r_cv_have_bzlib+set}" = set; then +diff -up R-2.8.0/m4/R.m4.BAD R-2.8.0/m4/R.m4 +--- R-2.8.0/m4/R.m4.BAD 2008-09-21 18:05:06.000000000 -0400 ++++ R-2.8.0/m4/R.m4 2008-10-26 11:53:05.000000000 -0400 +@@ -3055,6 +3055,7 @@ else + have_bzlib=no + fi + if test "x${have_bzlib}" = xyes; then ++AC_DEFINE(HAVE_BZLIB_H, 1, [Define to 1 if you have bzlib.h.]) + AC_CACHE_CHECK([if bzip2 version >= 1.0.5], [r_cv_have_bzlib], + [AC_LANG_PUSH(C) + r_save_LIBS="${LIBS}" diff --git a/R.spec b/R.spec index f7c2597..1ea760c 100644 --- a/R.spec +++ b/R.spec @@ -1,15 +1,14 @@ Name: R -Version: 2.7.2 -Release: 2%{?dist} +Version: 2.8.0 +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 Source1: macros.R Source2: R-make-search-index.sh -# Sent upstream: -# http://bugs.r-project.org/cgi-bin/R/incoming?id=12636 -Patch0: R-2.7.1-javareconf-tmpfix.patch Patch1: R-2.7.2-filter_asoption.patch +# fix bzlib2 detection, sent upstream 10-26-2008 +Patch2: R-2.8.0-HAVE_BZLIB_H.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,11 +21,36 @@ BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel BuildRequires: gcc-objc +# R-devel will pull in R-core +Requires: R-devel = %{version}-%{release} +# libRmath-devel will pull in libRmath +Requires: libRmath-devel = %{version}-%{release} + +%description +This is a metapackage that provides both core R userspace and +all R development components. + +R is a language and environment for statistical computing and graphics. +R is similar to the award-winning S system, which was developed at +Bell Laboratories by John Chambers et al. It provides a wide +variety of statistical and graphical techniques (linear and +nonlinear modelling, statistical tests, time series analysis, +classification, clustering, ...). + +R is designed as a true computer language with control-flow +constructions for iteration and alternation, and it allows users to +add additional functionality by defining new functions. For +computationally intensive tasks, C, C++ and Fortran code can be linked +and called at run time. + +%package core +Summary: The minimal R components necessary for a functional runtime +Group: Applications/Engineering Requires: xdg-utils, cups -# 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. +# These are the submodules that R-core 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 = 7.2 @@ -55,10 +79,10 @@ Provides: R-tools = %{version} Provides: R-utils = %{version} Provides: R-VR = 7.2 -%description -A language and environment for statistical computing and graphics. -R is similar to the award-winning S system, which was developed at -Bell Laboratories by John Chambers et al. It provides a wide +%description core +A language and environment for statistical computing and graphics. +R is similar to the award-winning S system, which was developed at +Bell Laboratories by John Chambers et al. It provides a wide variety of statistical and graphical techniques (linear and nonlinear modelling, statistical tests, time series analysis, classification, clustering, ...). @@ -72,7 +96,7 @@ and called at run time. %package devel Summary: files for development of R packages. Group: Applications/Engineering -Requires: R = %{version}-%{release} +Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel @@ -103,8 +127,8 @@ and header files. %prep %setup -q -%patch0 -p1 -b .javareconf-tmpfix %patch1 -p1 -b .filter-little-out +%patch2 -p1 -b .BZLIB_H # Filter false positive provides. cat <<EOF > %{name}-prov @@ -206,7 +230,10 @@ for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do done %files -%defattr(-, root, root) +# Metapackage + +%files core +%defattr(-, root, root, -) %{_bindir}/R %{_bindir}/Rscript %{_datadir}/R @@ -228,16 +255,16 @@ done /etc/ld.so.conf.d/* %files devel -%defattr(-, root, root) +%defattr(-, root, root, -) %{_libdir}/pkgconfig/libR.pc %{_includedir}/R %files -n libRmath -%defattr(-, root, root) +%defattr(-, root, root, -) %{_libdir}/libRmath.so %files -n libRmath-devel -%defattr(-, root, root) +%defattr(-, root, root, -) %{_libdir}/libRmath.a %{_includedir}/Rmath.h %{_libdir}/pkgconfig/libRmath.pc @@ -245,7 +272,7 @@ done %clean rm -rf ${RPM_BUILD_ROOT}; -%post +%post core # Create directory entries for info files # (optional doc files, so we must check that they are installed) for doc in admin exts FAQ intro lang; do @@ -268,7 +295,7 @@ sed -i "s!../../..!%{_libdir}/R!g" %{_docdir}/R-%{version}/html/search/index.txt sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt -%preun +%preun core if [ $1 = 0 ]; then # Delete directory entries for info files (if they were installed) for doc in admin exts FAQ intro lang; do @@ -279,7 +306,7 @@ if [ $1 = 0 ]; then done fi -%postun +%postun core /sbin/ldconfig %post -n libRmath @@ -289,6 +316,12 @@ fi /sbin/ldconfig %changelog +* Sun Oct 26 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.8.0-1 +- Update to 2.8.0 +- New subpackage layout: R-core is functional userspace, R is metapackage + requiring everything +- Fix system bzip2 detection + * Thu Oct 16 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.2-2 - fix sh compile (bz 464055) diff --git a/sources b/sources index 48ccee7..4d9e9f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6122945e9301825b97a506151b3cefde R-2.7.2.tar.gz +5213c9644aec984278b669df1a63a2ce R-2.8.0.tar.gz commit 98300c833320412b33f05326d3a139e89f90c419 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Oct 16 20:45:20 2008 +0000 fix sh compile, bz 464055 diff --git a/R-2.7.2-filter_asoption.patch b/R-2.7.2-filter_asoption.patch new file mode 100644 index 0000000..e200e71 --- /dev/null +++ b/R-2.7.2-filter_asoption.patch @@ -0,0 +1,11 @@ +--- R-2.7.2/configure.org 2008-09-25 15:00:20.000000000 +0900 ++++ R-2.7.2/configure 2008-09-25 15:00:35.000000000 +0900 +@@ -26995,7 +26995,7 @@ + + ;; + # Ignore these flags. +- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) ++ -little | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) + ;; + -lkernel32) + test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" diff --git a/R.spec b/R.spec index 182388e..f7c2597 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.7.2 -Release: 1%{?dist} +Release: 2%{?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 @@ -9,6 +9,7 @@ Source2: R-make-search-index.sh # Sent upstream: # http://bugs.r-project.org/cgi-bin/R/incoming?id=12636 Patch0: R-2.7.1-javareconf-tmpfix.patch +Patch1: R-2.7.2-filter_asoption.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -103,6 +104,7 @@ and header files. %prep %setup -q %patch0 -p1 -b .javareconf-tmpfix +%patch1 -p1 -b .filter-little-out # Filter false positive provides. cat <<EOF > %{name}-prov @@ -137,7 +139,7 @@ case "%{_target_cpu}" in export F77="gfortran -m64" export FC="gfortran -m64" ;; - ia64|alpha) + ia64|alpha|sh*) export CC="gcc" export CXX="g++" export F77="gfortran" @@ -287,6 +289,9 @@ fi /sbin/ldconfig %changelog +* Thu Oct 16 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.2-2 +- fix sh compile (bz 464055) + * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.2-1 - update to 2.7.2 - fix spec for alpha compile (bz 458931) commit 0672b69fcb4fe38040fa6048334379ff8d0ea5be Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Aug 29 15:53:54 2008 +0000 update everyone to 2.7.2, fix security bug 460658 diff --git a/.cvsignore b/.cvsignore index e7f3621..59aef1f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.7.1.tar.gz +R-2.7.2.tar.gz diff --git a/R-2.7.1-javareconf-tmpfix.patch b/R-2.7.1-javareconf-tmpfix.patch new file mode 100644 index 0000000..a5fcea9 --- /dev/null +++ b/R-2.7.1-javareconf-tmpfix.patch @@ -0,0 +1,27 @@ +diff -up R-2.7.1/src/scripts/javareconf.BAD R-2.7.1/src/scripts/javareconf +--- R-2.7.1/src/scripts/javareconf.BAD 2008-08-29 11:04:21.000000000 -0400 ++++ R-2.7.1/src/scripts/javareconf 2008-08-29 11:05:34.000000000 -0400 +@@ -125,16 +125,17 @@ fi + javac_works='not present' + if test -n "$JAVAC"; then + javac_works='not functional' +- rm -rf /tmp/A.java /tmp/A.class +- echo "public class A { }" > /tmp/A.java +- if test -e /tmp/A.java; then +- if "${JAVAC}" /tmp/A.java >/dev/null; then +- if test -e /tmp/A.class; then ++ tempdir=`mktemp -d` ++ echo "public class A { }" > ${tempdir}/A.java ++ if test -e ${tempdir}/A.java; then ++ if "${JAVAC}" ${tempdir}/A.java >/dev/null; then ++ if test -e ${tempdir}/A.class; then + javac_works=yes + fi + fi + fi +- rm -rf /tmp/A.java /tmp/A.class ++ rm -rf ${tempdir} ++ + fi + if test "${javac_works}" = yes; then + echo "Java compiler : ${JAVAC}" diff --git a/R.spec b/R.spec index 7728888..182388e 100644 --- a/R.spec +++ b/R.spec @@ -1,11 +1,14 @@ Name: R -Version: 2.7.1 +Version: 2.7.2 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 Source1: macros.R Source2: R-make-search-index.sh +# Sent upstream: +# http://bugs.r-project.org/cgi-bin/R/incoming?id=12636 +Patch0: R-2.7.1-javareconf-tmpfix.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -99,6 +102,7 @@ and header files. %prep %setup -q +%patch0 -p1 -b .javareconf-tmpfix # Filter false positive provides. cat <<EOF > %{name}-prov @@ -133,7 +137,7 @@ case "%{_target_cpu}" in export F77="gfortran -m64" export FC="gfortran -m64" ;; - ia64) + ia64|alpha) export CC="gcc" export CXX="g++" export F77="gfortran" @@ -283,6 +287,11 @@ fi /sbin/ldconfig %changelog +* Fri Aug 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.2-1 +- update to 2.7.2 +- fix spec for alpha compile (bz 458931) +- fix security issue in javareconf script (bz 460658) + * Mon Jul 7 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.1-1 - update to 2.7.1 diff --git a/sources b/sources index 67119f3..48ccee7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -565b06a1f3f11020399934cc7b47a59d R-2.7.1.tar.gz +6122945e9301825b97a506151b3cefde R-2.7.2.tar.gz commit f42738475467ad802f4d1c811b7179101bddbc52 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Aug 29 15:53:53 2008 +0000 update everyone to 2.7.2, fix security bug 460658 diff --git a/R-2.7.1-javareconf-tmpfix.patch b/R-2.7.1-javareconf-tmpfix.patch new file mode 100644 index 0000000..a5fcea9 --- /dev/null +++ b/R-2.7.1-javareconf-tmpfix.patch @@ -0,0 +1,27 @@ +diff -up R-2.7.1/src/scripts/javareconf.BAD R-2.7.1/src/scripts/javareconf +--- R-2.7.1/src/scripts/javareconf.BAD 2008-08-29 11:04:21.000000000 -0400 ++++ R-2.7.1/src/scripts/javareconf 2008-08-29 11:05:34.000000000 -0400 +@@ -125,16 +125,17 @@ fi + javac_works='not present' + if test -n "$JAVAC"; then + javac_works='not functional' +- rm -rf /tmp/A.java /tmp/A.class +- echo "public class A { }" > /tmp/A.java +- if test -e /tmp/A.java; then +- if "${JAVAC}" /tmp/A.java >/dev/null; then +- if test -e /tmp/A.class; then ++ tempdir=`mktemp -d` ++ echo "public class A { }" > ${tempdir}/A.java ++ if test -e ${tempdir}/A.java; then ++ if "${JAVAC}" ${tempdir}/A.java >/dev/null; then ++ if test -e ${tempdir}/A.class; then + javac_works=yes + fi + fi + fi +- rm -rf /tmp/A.java /tmp/A.class ++ rm -rf ${tempdir} ++ + fi + if test "${javac_works}" = yes; then + echo "Java compiler : ${JAVAC}" diff --git a/R.spec b/R.spec index c220502..169c4c3 100644 --- a/R.spec +++ b/R.spec @@ -1,11 +1,14 @@ Name: R -Version: 2.6.1 +Version: 2.7.2 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 Source1: macros.R Source2: R-make-search-index.sh +# Sent upstream: +# http://bugs.r-project.org/cgi-bin/R/incoming?id=12636 +Patch0: R-2.7.1-javareconf-tmpfix.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,7 +19,7 @@ BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -BuildRequires: bzip2-devel, libXmu-devel +BuildRequires: bzip2-devel, libXmu-devel, cairo-devel BuildRequires: gcc-objc Requires: xdg-utils, cups @@ -25,9 +28,9 @@ Requires: xdg-utils, cups # provided for packager convenience. Provides: R-base = %{version} Provides: R-boot = 1.2 -Provides: R-class = %{version} -Provides: R-cluster = 1.11.9 -Provides: R-codetools = 0.1 +Provides: R-class = 7.2 +Provides: R-cluster = 1.11.11 +Provides: R-codetools = 0.2 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 Provides: R-graphics = %{version} @@ -35,14 +38,13 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 Provides: R-lattice = 0.17 -Provides: R-MASS = %{version} +Provides: R-MASS = 7.2 Provides: R-methods = %{version} -Provides: R-mgcv = 1.3 +Provides: R-mgcv = 1.4 Provides: R-nlme = 3.1 -Provides: R-nnet = %{version} -Provides: R-rcompgen = 0.1 +Provides: R-nnet = 7.2 Provides: R-rpart = 3.1 -Provides: R-spatial = %{version} +Provides: R-spatial = 7.2 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -52,9 +54,6 @@ Provides: R-tools = %{version} Provides: R-utils = %{version} Provides: R-VR = 7.2 -# Temporary fix to avoid the SNAFU of the 0.fdr.2.* release -Conflicts: R-devel < %{version}-%{release} - %description A language and environment for statistical computing and graphics. R is similar to the award-winning S system, which was developed at @@ -72,12 +71,12 @@ and called at run time. %package devel Summary: files for development of R packages. Group: Applications/Engineering -Requires: R = %{version} +Requires: R = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -Requires: bzip2-devel, libXmu-devel +Requires: bzip2-devel, libXmu-devel, cairo-devel Requires: tcl-devel, tk-devel, pkgconfig %description devel @@ -103,6 +102,7 @@ and header files. %prep %setup -q +%patch0 -p1 -b .javareconf-tmpfix # Filter false positive provides. cat <<EOF > %{name}-prov @@ -129,13 +129,38 @@ echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/ export R_PDFVIEWER="%{_bindir}/xdg-open" export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/xdg-open" -export F77="gfortran" + +case "%{_target_cpu}" in + x86_64|mips64|ppc64|powerpc64|sparc64|s390x) + export CC="gcc -m64" + export CXX="g++ -m64" + export F77="gfortran -m64" + export FC="gfortran -m64" + ;; + ia64|alpha) + export CC="gcc" + export CXX="g++" + export F77="gfortran" + export FC="gfortran" + ;; + *) + export CC="gcc -m32" + export CXX="g++ -m32" + export F77="gfortran -m32" + export FC="gfortran -m32" + ;; +esac + +export FCFLAGS="%{optflags}" ( %configure \ --with-system-zlib --with-system-bzlib --with-system-pcre \ --with-lapack \ --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ - --enable-R-shlib )\ + --enable-R-shlib \ + rdocdir=%{_docdir}/R-%{version} \ + rincludedir=%{_includedir}/R \ + rsharedir=%{_datadir}/R) \ | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) @@ -144,39 +169,13 @@ make pdf make info %install -%makeinstall rhome=${RPM_BUILD_ROOT}%{_libdir}/R install-info +make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old +install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version} #Install libRmath files -(cd src/nmath/standalone; make install \ - includedir=${RPM_BUILD_ROOT}%{_includedir} \ - libdir=${RPM_BUILD_ROOT}%{_libdir}) - -#Fix location of R_HOME_DIR in shell wrapper. -# -sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \ - > ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R -sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \ - > ${RPM_BUILD_ROOT}%{_bindir}/R -chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R -chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R - -# Get rid of buildroot in script -for i in $RPM_BUILD_ROOT%{_libdir}/R/bin/Rscript $RPM_BUILD_ROOT%{_bindir}/Rscript $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libR*.pc; -do - sed -i "s|$RPM_BUILD_ROOT||g" $i; -done - -# Remove package indices. They are rebuilt by the postinstall script. -# -rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/function.html -rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/packages.html -rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/search/index.txt - -# Some doc files are also installed. We don't need them -(cd %{buildroot}%{_libdir}/R; - rm -f AUTHORS COPYING COPYING.LIB COPYRIGHTS FAQ NEWS ONEWS RESOURCES THANKS) +(cd src/nmath/standalone; make install DESTDIR=${RPM_BUILD_ROOT}) mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf @@ -192,33 +191,44 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib -touch -r NEWS CAPABILITIES +touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES touch -r NEWS doc/manual/*.pdf touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R +# Fix html/packages.html +# We can safely use RHOME here, because all of these are system packages. +sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html + +for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do + sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i +done + %files %defattr(-, root, root) %{_bindir}/R %{_bindir}/Rscript %{_datadir}/R -%{_libdir}/R +%dir %{_libdir}/R +%{_libdir}/R/bin +%{_libdir}/R/etc +%{_libdir}/R/lib +%{_libdir}/R/library +%{_libdir}/R/modules +%{_libdir}/R/COPYING +%{_libdir}/R/NEWS +%{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* %{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* +%{_docdir}/R-%{version} +%docdir %{_docdir}/R-%{version} /etc/ld.so.conf.d/* -%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS -%doc ONEWS README doc/RESOURCES doc/THANKS VERSION -%doc doc/manual/R-admin.pdf -%doc doc/manual/R-FAQ.pdf -%doc doc/manual/R-lang.pdf -%doc doc/manual/R-data.pdf -%doc doc/manual/R-intro.pdf %files devel %defattr(-, root, root) -%doc doc/manual/R-exts.pdf %{_libdir}/pkgconfig/libR.pc +%{_includedir}/R %files -n libRmath %defattr(-, root, root) @@ -243,13 +253,18 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig -R CMD javareconf || exit 0 +R CMD javareconf > /dev/null 2>&1 || exit 0 # Update package indices -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null -%__cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/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 + # This could fail if there are no noarch R libraries on the system. -%__cat %{_datadir}/R/library/*/CONTENTS >> %{_libdir}/R/doc/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 + %preun if [ $1 = 0 ]; then @@ -260,10 +275,6 @@ if [ $1 = 0 ]; then /sbin/install-info --delete R-${doc} %{_infodir}/dir 2>/dev/null || : fi done - # Remove package indices - %__rm -f %{_libdir}/R/doc/html/function.html - %__rm -f %{_libdir}/R/doc/html/packages.html - %__rm -f %{_libdir}/R/doc/html/search/index.txt fi %postun @@ -276,6 +287,56 @@ fi /sbin/ldconfig %changelog +* Fri Aug 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.2-1 +- update to 2.7.2 +- fix spec for alpha compile (bz 458931) +- fix security issue in javareconf script (bz 460658) + +* Mon Jul 7 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.1-1 +- update to 2.7.1 + +* Wed May 28 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-5 +- add cairo-devel to BR/R, so that cairo backend gets built + +* Wed May 21 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-4 +- fixup sed invocation added in -3 +- make -devel package depend on base R = version-release +- fix bad paths in package html files + +* Wed May 21 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-3 +- fix poorly constructed file paths in html/packages.html (bz 442727) + +* Tue May 13 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-2 +- add patch from Martyn Plummer to avoid possible bad path hardcoding in + /usr/bin/Rscript +- properly handle ia64 case (bz 446181) + +* Mon Apr 28 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-1 +- update to 2.70 +- rcompgen is no longer a standalone package +- redirect javareconf to /dev/null (bz 442366) + +* Fri Feb 8 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.2-1 +- properly version the items in the VR bundle +- 2.6.2 +- don't use setarch for java setup +- fix R post script file + +* Thu Jan 31 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-4 +- multilib handling (thanks Martyn Plummer) +- Update indices in the right place. + +* Mon Jan 7 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-3 +- move INSTALL back into R main package, as it is useful without the + other -devel bits (e.g. installing noarch package from CRAN) + +* Tue Dec 11 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-2 +- based on changes from Martyn Plummer <martyn.plummer(a)r-project.org> +- use configure options rdocdir, rincludedir, rsharedir +- use DESTDIR at installation +- remove obsolete generation of packages.html +- move header files and INSTALL R-devel package + * Mon Nov 26 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-1 - bump to 2.6.1 @@ -300,9 +361,6 @@ fi * Thu Jul 5 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-2 - add rpm helper macros, script -* Tue Jul 3 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-1.1 -- fix BR for EL-5 - * Mon Jul 2 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-1 - drop patch, upstream fixed - bump to 2.5.1 diff --git a/sources b/sources index 3b0368d..48ccee7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19c35a69e1afa73f5f70f91ff9939233 R-2.6.1.tar.gz +6122945e9301825b97a506151b3cefde R-2.7.2.tar.gz commit d6615bafd50d1ce41d6dd09fa15210db09934ccb Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jul 7 20:56:13 2008 +0000 update to 2.7.1 diff --git a/.cvsignore b/.cvsignore index 442f991..e7f3621 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.7.0.tar.gz +R-2.7.1.tar.gz diff --git a/R.spec b/R.spec index 7440cc1..7728888 100644 --- a/R.spec +++ b/R.spec @@ -1,12 +1,11 @@ Name: R -Version: 2.7.0 -Release: 5%{?dist} +Version: 2.7.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 Source1: macros.R Source2: R-make-search-index.sh -Patch0: R-2.7.0-bad-path.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +26,7 @@ Requires: xdg-utils, cups Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = 7.2 -Provides: R-cluster = 1.11.10 +Provides: R-cluster = 1.11.11 Provides: R-codetools = 0.2 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -38,7 +37,7 @@ Provides: R-KernSmooth = 2.22 Provides: R-lattice = 0.17 Provides: R-MASS = 7.2 Provides: R-methods = %{version} -Provides: R-mgcv = 1.3 +Provides: R-mgcv = 1.4 Provides: R-nlme = 3.1 Provides: R-nnet = 7.2 Provides: R-rpart = 3.1 @@ -100,7 +99,6 @@ and header files. %prep %setup -q -%patch0 -p0 # Filter false positive provides. cat <<EOF > %{name}-prov @@ -285,6 +283,9 @@ fi /sbin/ldconfig %changelog +* Mon Jul 7 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.1-1 +- update to 2.7.1 + * Wed May 28 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-5 - add cairo-devel to BR/R, so that cairo backend gets built diff --git a/sources b/sources index 2a48996..67119f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9eaee3eceec1d5f72cea5640ca90768c R-2.7.0.tar.gz +565b06a1f3f11020399934cc7b47a59d R-2.7.1.tar.gz commit bc7734f61cbd4a4ff217377ad510aa1eae1ff179 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed May 28 21:07:13 2008 +0000 build cairo backend diff --git a/R.spec b/R.spec index 8de441e..7440cc1 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.7.0 -Release: 4%{?dist} +Release: 5%{?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 @@ -17,7 +17,7 @@ BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -BuildRequires: bzip2-devel, libXmu-devel +BuildRequires: bzip2-devel, libXmu-devel, cairo-devel BuildRequires: gcc-objc Requires: xdg-utils, cups @@ -74,7 +74,7 @@ Requires: R = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -Requires: bzip2-devel, libXmu-devel +Requires: bzip2-devel, libXmu-devel, cairo-devel Requires: tcl-devel, tk-devel, pkgconfig %description devel @@ -285,6 +285,9 @@ fi /sbin/ldconfig %changelog +* Wed May 28 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-5 +- add cairo-devel to BR/R, so that cairo backend gets built + * Wed May 21 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-4 - fixup sed invocation added in -3 - make -devel package depend on base R = version-release commit 52ac3e0efba9a29366567c7663facf15d1e09fb4 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed May 21 19:26:30 2008 +0000 fix all the broken links diff --git a/R.spec b/R.spec index 98db847..8de441e 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.7.0 -Release: 3%{?dist} +Release: 4%{?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 @@ -69,7 +69,7 @@ and called at run time. %package devel Summary: files for development of R packages. Group: Applications/Engineering -Requires: R = %{version} +Requires: R = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel @@ -195,7 +195,11 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html # We can safely use RHOME here, because all of these are system packages. -sed -i "s!../..!%{_libdir}/R!g" $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html +sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html + +for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do + sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i +done %files %defattr(-, root, root) @@ -281,6 +285,11 @@ fi /sbin/ldconfig %changelog +* Wed May 21 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-4 +- fixup sed invocation added in -3 +- make -devel package depend on base R = version-release +- fix bad paths in package html files + * Wed May 21 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-3 - fix poorly constructed file paths in html/packages.html (bz 442727) commit 9604248e933353bba61604880c3bc7de1f2d4bff Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed May 21 15:31:07 2008 +0000 fix poorly constructed file paths in html/packages.html (bz 442727) diff --git a/R.spec b/R.spec index 1cc4491..98db847 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.7.0 -Release: 2%{?dist} +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 @@ -193,6 +193,10 @@ touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES touch -r NEWS doc/manual/*.pdf touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R +# Fix html/packages.html +# We can safely use RHOME here, because all of these are system packages. +sed -i "s!../..!%{_libdir}/R!g" $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html + %files %defattr(-, root, root) %{_bindir}/R @@ -277,6 +281,9 @@ fi /sbin/ldconfig %changelog +* Wed May 21 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-3 +- fix poorly constructed file paths in html/packages.html (bz 442727) + * Tue May 13 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-2 - add patch from Martyn Plummer to avoid possible bad path hardcoding in /usr/bin/Rscript commit 4ac1a69ba21e836cc4e9293b4bea530a5f669de0 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue May 13 16:55:43 2008 +0000 R 2.7.0 everywhere diff --git a/R-2.7.0-bad-path.patch b/R-2.7.0-bad-path.patch new file mode 100644 index 0000000..76bc91e --- /dev/null +++ b/R-2.7.0-bad-path.patch @@ -0,0 +1,18 @@ +Index: src/unix/Makefile.in +=================================================================== +--- src/unix/Makefile.in (revision 45534) ++++ src/unix/Makefile.in (revision 45535) +@@ -78,11 +78,11 @@ + -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \ + > "$(DESTDIR)$(libdir)/pkgconfig/libR.pc" + +-install: install-main install-Rscript ++install: install-main + install: @WANT_R_SHLIB_TRUE@ install-pc + install: @WANT_R_STATIC_TRUE@ install-pc + +-install-main: ++install-main: install-Rscript + @$(MKINSTALLDIRS) "$(DESTDIR)$(bindir)" + @$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(bindir)/Rscript" + diff --git a/R.spec b/R.spec index 92a1ef4..1cc4491 100644 --- a/R.spec +++ b/R.spec @@ -1,11 +1,12 @@ Name: R Version: 2.7.0 -Release: 1%{?dist} +Release: 2%{?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 +Patch0: R-2.7.0-bad-path.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -99,6 +100,7 @@ and header files. %prep %setup -q +%patch0 -p0 # Filter false positive provides. cat <<EOF > %{name}-prov @@ -133,6 +135,12 @@ case "%{_target_cpu}" in export F77="gfortran -m64" export FC="gfortran -m64" ;; + ia64) + export CC="gcc" + export CXX="g++" + export F77="gfortran" + export FC="gfortran" + ;; *) export CC="gcc -m32" export CXX="g++ -m32" @@ -269,6 +277,11 @@ fi /sbin/ldconfig %changelog +* Tue May 13 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-2 +- add patch from Martyn Plummer to avoid possible bad path hardcoding in + /usr/bin/Rscript +- properly handle ia64 case (bz 446181) + * Mon Apr 28 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-1 - update to 2.70 - rcompgen is no longer a standalone package commit 9d6fa355016b292bb1e08994950192077ecc38b4 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Apr 29 20:09:52 2008 +0000 . diff --git a/.cvsignore b/.cvsignore index 9729ef8..442f991 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.6.2.tar.gz +R-2.7.0.tar.gz diff --git a/R-make-search-index.sh b/R-make-search-index.sh index fb4a462..94440c2 100755 --- a/R-make-search-index.sh +++ b/R-make-search-index.sh @@ -7,9 +7,15 @@ TMP_R_HOME=`R RHOME` # Ideally, we could ask R just like we do for RHOME, but we can't yet. TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2` -# Write out all the contents in arch and noarch library locations +# Write out all the contents in arch library locations cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +# Don't use .. based paths, substitute TMP_R_HOME +sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt + +# Write out all the contents in noarch library locations cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +# Don't use .. based paths, substitute /usr/share/R +sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt exit 0 diff --git a/R.spec b/R.spec index 80fe35d..92a1ef4 100644 --- a/R.spec +++ b/R.spec @@ -1,5 +1,5 @@ Name: R -Version: 2.6.2 +Version: 2.7.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -26,8 +26,8 @@ Requires: xdg-utils, cups Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = 7.2 -Provides: R-cluster = 1.11.9 -Provides: R-codetools = 0.1 +Provides: R-cluster = 1.11.10 +Provides: R-codetools = 0.2 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 Provides: R-graphics = %{version} @@ -40,7 +40,6 @@ Provides: R-methods = %{version} Provides: R-mgcv = 1.3 Provides: R-nlme = 3.1 Provides: R-nnet = 7.2 -Provides: R-rcompgen = 0.1 Provides: R-rpart = 3.1 Provides: R-spatial = 7.2 Provides: R-splines = %{version} @@ -52,9 +51,6 @@ Provides: R-tools = %{version} Provides: R-utils = %{version} Provides: R-VR = 7.2 -# Temporary fix to avoid the SNAFU of the 0.fdr.2.* release -Conflicts: R-devel < %{version}-%{release} - %description A language and environment for statistical computing and graphics. R is similar to the award-winning S system, which was developed at @@ -239,13 +235,18 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig -R CMD javareconf || exit 0 +R CMD javareconf > /dev/null 2>&1 || exit 0 # Update package indices %__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 # 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 +# Don't use .. based paths, substitute /usr/share/R +sed -i "s!../../..!/usr/share/R!g" %{_docdir}/R-%{version}/html/search/index.txt + %preun if [ $1 = 0 ]; then @@ -268,6 +269,11 @@ fi /sbin/ldconfig %changelog +* Mon Apr 28 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.7.0-1 +- update to 2.70 +- rcompgen is no longer a standalone package +- redirect javareconf to /dev/null (bz 442366) + * Fri Feb 8 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.2-1 - properly version the items in the VR bundle - 2.6.2 diff --git a/sources b/sources index 15d19e1..2a48996 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1099cbf02c624ceb459d9bbc4d0d1448 R-2.6.2.tar.gz +9eaee3eceec1d5f72cea5640ca90768c R-2.7.0.tar.gz commit bf8154d26eed1325b8f85a372c2baedb8f79d205 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Feb 8 19:27:58 2008 +0000 2.6.2, take package cleanups to all active releases diff --git a/.cvsignore b/.cvsignore index 92cdc85..9729ef8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -R-2.6.1.tar.gz +R-2.6.2.tar.gz diff --git a/R-make-search-index.sh b/R-make-search-index.sh index f0a119e..fb4a462 100755 --- a/R-make-search-index.sh +++ b/R-make-search-index.sh @@ -3,9 +3,13 @@ # Figure out what RHOME is set to TMP_R_HOME=`R RHOME` +# Figure out what R_DOC_DIR is set to +# Ideally, we could ask R just like we do for RHOME, but we can't yet. +TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2` + # Write out all the contents in arch and noarch library locations -cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null -cat /usr/share/R/library/*/CONTENTS >> $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null +cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null +cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null exit 0 diff --git a/R.spec b/R.spec index a4e6353..80fe35d 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R -Version: 2.6.1 -Release: 4%{?dist} +Version: 2.6.2 +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 @@ -25,7 +25,7 @@ Requires: xdg-utils, cups # provided for packager convenience. Provides: R-base = %{version} Provides: R-boot = 1.2 -Provides: R-class = %{version} +Provides: R-class = 7.2 Provides: R-cluster = 1.11.9 Provides: R-codetools = 0.1 Provides: R-datasets = %{version} @@ -35,14 +35,14 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 Provides: R-lattice = 0.17 -Provides: R-MASS = %{version} +Provides: R-MASS = 7.2 Provides: R-methods = %{version} Provides: R-mgcv = 1.3 Provides: R-nlme = 3.1 -Provides: R-nnet = %{version} +Provides: R-nnet = 7.2 Provides: R-rcompgen = 0.1 Provides: R-rpart = 3.1 -Provides: R-spatial = %{version} +Provides: R-spatial = 7.2 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -130,7 +130,7 @@ export R_PDFVIEWER="%{_bindir}/xdg-open" export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/xdg-open" -case "%{_build_cpu}" in +case "%{_target_cpu}" in x86_64|mips64|ppc64|powerpc64|sparc64|s390x) export CC="gcc -m64" export CXX="g++ -m64" @@ -239,7 +239,7 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig -setarch %{_build_cpu} R CMD javareconf || exit 0 +R CMD javareconf || exit 0 # Update package indices %__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null @@ -268,6 +268,12 @@ fi /sbin/ldconfig %changelog +* Fri Feb 8 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.2-1 +- properly version the items in the VR bundle +- 2.6.2 +- don't use setarch for java setup +- fix R post script file + * Thu Jan 31 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-4 - multilib handling (thanks Martyn Plummer) - Update indices in the right place. diff --git a/sources b/sources index 3b0368d..15d19e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19c35a69e1afa73f5f70f91ff9939233 R-2.6.1.tar.gz +1099cbf02c624ceb459d9bbc4d0d1448 R-2.6.2.tar.gz commit 994f9f71257516b2fc1af7d20b77cfffb7dbe32a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jan 31 19:48:25 2008 +0000 multilib handling, update indices in the right place diff --git a/R.spec b/R.spec index 5156f0e..a4e6353 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.6.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -129,7 +129,23 @@ echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/ export R_PDFVIEWER="%{_bindir}/xdg-open" export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/xdg-open" -export F77="gfortran" + +case "%{_build_cpu}" in + x86_64|mips64|ppc64|powerpc64|sparc64|s390x) + export CC="gcc -m64" + export CXX="g++ -m64" + export F77="gfortran -m64" + export FC="gfortran -m64" + ;; + *) + export CC="gcc -m32" + export CXX="g++ -m32" + export F77="gfortran -m32" + export FC="gfortran -m32" + ;; +esac + +export FCFLAGS="%{optflags}" ( %configure \ --with-system-zlib --with-system-bzlib --with-system-pcre \ --with-lapack \ @@ -223,12 +239,13 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig -R CMD javareconf || exit 0 +setarch %{_build_cpu} R CMD javareconf || exit 0 # Update package indices -%__cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt 2>/dev/null +%__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null + # This could fail if there are no noarch R libraries on the system. -%__cat %{_datadir}/R/library/*/CONTENTS >> %{_libdir}/R/doc/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 %preun if [ $1 = 0 ]; then @@ -251,6 +268,10 @@ fi /sbin/ldconfig %changelog +* Thu Jan 31 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-4 +- multilib handling (thanks Martyn Plummer) +- Update indices in the right place. + * Mon Jan 7 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-3 - move INSTALL back into R main package, as it is useful without the other -devel bits (e.g. installing noarch package from CRAN) commit c2f0695c1b6b8882d241ad0b4bed35549eb698b9 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jan 11 22:10:52 2008 +0000 Bring EL-5 current diff --git a/R.spec b/R.spec index ae212ce..c220502 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R -Version: 2.5.1 -Release: 2%{?dist} +Version: 2.6.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 @@ -18,7 +18,7 @@ BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel BuildRequires: gcc-objc -Requires: evince, cups, firefox +Requires: xdg-utils, cups # These are the submodules that R provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are @@ -26,7 +26,7 @@ Requires: evince, cups, firefox Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = 1.11.7 +Provides: R-cluster = 1.11.9 Provides: R-codetools = 0.1 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -34,7 +34,7 @@ Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 -Provides: R-lattice = 0.15 +Provides: R-lattice = 0.17 Provides: R-MASS = %{version} Provides: R-methods = %{version} Provides: R-mgcv = 1.3 @@ -46,7 +46,7 @@ Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.32 +Provides: R-survival = 2.34 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -104,13 +104,31 @@ and header files. %prep %setup -q +# Filter false positive provides. +cat <<EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} \ +| grep -v 'File::Copy::Recursive' | grep -v 'Text::DelimMatch' +EOF +%define __perl_provides %{_builddir}/R-%{version}/%{name}-prov +chmod +x %{__perl_provides} + +# Filter unwanted Requires: +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} \ +| grep -v 'perl(Text::DelimMatch)' +EOF +%define __perl_requires %{_builddir}/R-%{version}/%{name}-req +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 -export R_PDFVIEWER="%{_bindir}/evince" +export R_PDFVIEWER="%{_bindir}/xdg-open" export R_PRINTCMD="lpr" -export R_BROWSER="%{_bindir}/firefox" +export R_BROWSER="%{_bindir}/xdg-open" export F77="gfortran" ( %configure \ --with-system-zlib --with-system-bzlib --with-system-pcre \ @@ -173,6 +191,11 @@ install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ +# Fix multilib +touch -r NEWS CAPABILITIES +touch -r NEWS doc/manual/*.pdf +touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R + %files %defattr(-, root, root) %{_bindir}/R @@ -220,6 +243,7 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig +R CMD javareconf || exit 0 # Update package indices %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null @@ -252,6 +276,27 @@ fi /sbin/ldconfig %changelog +* Mon Nov 26 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-1 +- bump to 2.6.1 + +* Tue Oct 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-3.1 +- fix missing perl requires + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-3 +- fix multilib conflicts (bz 343061) + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-2 +- add R CMD javareconf to post (bz 354541) +- don't pickup bogus perl provides (bz 356071) +- use xdg-open, drop requires for firefox/evince (bz 351841) + +* Thu Oct 4 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-1 +- bump to 2.6.0 + +* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-3 +- fix license tag +- rebuild for ppc32 + * Thu Jul 5 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-2 - add rpm helper macros, script diff --git a/sources b/sources index 2ac86c4..3b0368d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -162f6d5a1bd7c60fd652145e050f3f3c R-2.5.1.tar.gz +19c35a69e1afa73f5f70f91ff9939233 R-2.6.1.tar.gz commit bc7b26279016f1c21075bf346da69886308dbbb5 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jan 7 15:25:50 2008 +0000 Move INSTALL back into main package. diff --git a/R.spec b/R.spec index fc78243..5156f0e 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.6.1 -Release: 2%{?dist} +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 @@ -179,7 +179,7 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R %{_bindir}/Rscript %{_datadir}/R %dir %{_libdir}/R -%{_libdir}/R/bin/[!I]* +%{_libdir}/R/bin %{_libdir}/R/etc %{_libdir}/R/lib %{_libdir}/R/library @@ -199,7 +199,6 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R %defattr(-, root, root) %{_libdir}/pkgconfig/libR.pc %{_includedir}/R -%{_libdir}/R/bin/INSTALL %files -n libRmath %defattr(-, root, root) @@ -252,6 +251,10 @@ fi /sbin/ldconfig %changelog +* Mon Jan 7 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-3 +- move INSTALL back into R main package, as it is useful without the + other -devel bits (e.g. installing noarch package from CRAN) + * Tue Dec 11 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-2 - based on changes from Martyn Plummer <martyn.plummer(a)r-project.org> - use configure options rdocdir, rincludedir, rsharedir commit c38221dbede3d92ac62a2d9867b81642dfa38ba3 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Jan 3 15:00:01 2008 +0000 commit 99% of Martyn's spec changes diff --git a/R.spec b/R.spec index 681c675..fc78243 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.6.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -135,7 +135,10 @@ export F77="gfortran" --with-lapack \ --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ - --enable-R-shlib )\ + --enable-R-shlib \ + rdocdir=%{_docdir}/R-%{version} \ + rincludedir=%{_includedir}/R \ + rsharedir=%{_datadir}/R) \ | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) @@ -144,39 +147,13 @@ make pdf make info %install -%makeinstall rhome=${RPM_BUILD_ROOT}%{_libdir}/R install-info +make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old +install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version} #Install libRmath files -(cd src/nmath/standalone; make install \ - includedir=${RPM_BUILD_ROOT}%{_includedir} \ - libdir=${RPM_BUILD_ROOT}%{_libdir}) - -#Fix location of R_HOME_DIR in shell wrapper. -# -sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \ - > ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R -sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \ - > ${RPM_BUILD_ROOT}%{_bindir}/R -chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R -chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R - -# Get rid of buildroot in script -for i in $RPM_BUILD_ROOT%{_libdir}/R/bin/Rscript $RPM_BUILD_ROOT%{_bindir}/Rscript $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libR*.pc; -do - sed -i "s|$RPM_BUILD_ROOT||g" $i; -done - -# Remove package indices. They are rebuilt by the postinstall script. -# -rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/function.html -rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/packages.html -rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/search/index.txt - -# Some doc files are also installed. We don't need them -(cd %{buildroot}%{_libdir}/R; - rm -f AUTHORS COPYING COPYING.LIB COPYRIGHTS FAQ NEWS ONEWS RESOURCES THANKS) +(cd src/nmath/standalone; make install DESTDIR=${RPM_BUILD_ROOT}) mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf @@ -192,7 +169,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib -touch -r NEWS CAPABILITIES +touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES touch -r NEWS doc/manual/*.pdf touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R @@ -201,24 +178,28 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R %{_bindir}/R %{_bindir}/Rscript %{_datadir}/R -%{_libdir}/R +%dir %{_libdir}/R +%{_libdir}/R/bin/[!I]* +%{_libdir}/R/etc +%{_libdir}/R/lib +%{_libdir}/R/library +%{_libdir}/R/modules +%{_libdir}/R/COPYING +%{_libdir}/R/NEWS +%{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* %{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* +%{_docdir}/R-%{version} +%docdir %{_docdir}/R-%{version} /etc/ld.so.conf.d/* -%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS -%doc ONEWS README doc/RESOURCES doc/THANKS VERSION -%doc doc/manual/R-admin.pdf -%doc doc/manual/R-FAQ.pdf -%doc doc/manual/R-lang.pdf -%doc doc/manual/R-data.pdf -%doc doc/manual/R-intro.pdf %files devel %defattr(-, root, root) -%doc doc/manual/R-exts.pdf %{_libdir}/pkgconfig/libR.pc +%{_includedir}/R +%{_libdir}/R/bin/INSTALL %files -n libRmath %defattr(-, root, root) @@ -246,7 +227,6 @@ done R CMD javareconf || exit 0 # Update package indices -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null %__cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt 2>/dev/null # This could fail if there are no noarch R libraries on the system. %__cat %{_datadir}/R/library/*/CONTENTS >> %{_libdir}/R/doc/html/search/index.txt 2>/dev/null || exit 0 @@ -260,10 +240,6 @@ if [ $1 = 0 ]; then /sbin/install-info --delete R-${doc} %{_infodir}/dir 2>/dev/null || : fi done - # Remove package indices - %__rm -f %{_libdir}/R/doc/html/function.html - %__rm -f %{_libdir}/R/doc/html/packages.html - %__rm -f %{_libdir}/R/doc/html/search/index.txt fi %postun @@ -276,6 +252,13 @@ fi /sbin/ldconfig %changelog +* Tue Dec 11 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-2 +- based on changes from Martyn Plummer <martyn.plummer(a)r-project.org> +- use configure options rdocdir, rincludedir, rsharedir +- use DESTDIR at installation +- remove obsolete generation of packages.html +- move header files and INSTALL R-devel package + * Mon Nov 26 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-1 - bump to 2.6.1 commit 5344861baa45549155bb5849f5eae0e66c0697c4 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Nov 26 21:10:35 2007 +0000 2.6.1 diff --git a/.cvsignore b/.cvsignore index 1df5ff4..92cdc85 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,11 +1 @@ -R-2.0.1.tar.gz -R-2.1.0.tar.gz -R-2.1.1.tar.gz -R-2.2.0.tar.gz -R-2.2.1.tar.gz -R-2.3.0.tar.gz -R-2.3.1.tar.gz -R-2.4.0.tar.gz -R-2.4.1.tar.gz -R-2.5.0.tar.gz -R-2.5.1.tar.gz +R-2.6.1.tar.gz diff --git a/R.spec b/R.spec index ba315c7..681c675 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R -Version: 2.6.0 -Release: 3%{?dist}.1 +Version: 2.6.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 @@ -34,7 +34,7 @@ Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 -Provides: R-lattice = 0.16 +Provides: R-lattice = 0.17 Provides: R-MASS = %{version} Provides: R-methods = %{version} Provides: R-mgcv = 1.3 @@ -46,7 +46,7 @@ Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.32 +Provides: R-survival = 2.34 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -276,6 +276,9 @@ fi /sbin/ldconfig %changelog +* Mon Nov 26 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.1-1 +- bump to 2.6.1 + * Tue Oct 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-3.1 - fix missing perl requires diff --git a/sources b/sources index 0025f28..3b0368d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97e5d2542349925962b7469456d45731 R-2.6.0.tar.gz +19c35a69e1afa73f5f70f91ff9939233 R-2.6.1.tar.gz commit a2830f38cbb2ad7ec9531f191df5f0380d4ed1f2 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Oct 30 13:29:02 2007 +0000 Fix missing perl requires diff --git a/R.spec b/R.spec index 923d522..ba315c7 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.6.0 -Release: 3%{?dist} +Release: 3%{?dist}.1 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 @@ -113,6 +113,15 @@ EOF %define __perl_provides %{_builddir}/R-%{version}/%{name}-prov chmod +x %{__perl_provides} +# Filter unwanted Requires: +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} \ +| grep -v 'perl(Text::DelimMatch)' +EOF +%define __perl_requires %{_builddir}/R-%{version}/%{name}-req +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 @@ -267,6 +276,9 @@ fi /sbin/ldconfig %changelog +* Tue Oct 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-3.1 +- fix missing perl requires + * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-3 - fix multilib conflicts (bz 343061) commit 22f036a766981ba30f16a9b647460e22211e7a6b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 16:50:59 2007 +0000 fix diff --git a/R.spec b/R.spec index 02f6cf7..923d522 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.6.0 -Release: 2%{?dist} +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 commit e1ff85f0e82840f1e797eeb00185349934cf9a91 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 16:48:07 2007 +0000 forgot one diff --git a/R.spec b/R.spec index 64a6e84..02f6cf7 100644 --- a/R.spec +++ b/R.spec @@ -185,6 +185,7 @@ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib touch -r NEWS CAPABILITIES touch -r NEWS doc/manual/*.pdf +touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R %files %defattr(-, root, root) commit 53c5674e2f0d20f1ecedd5642fc8829ce2d1d108 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 16:42:30 2007 +0000 forgot bugzilla 343061 diff --git a/R.spec b/R.spec index d437bd3..64a6e84 100644 --- a/R.spec +++ b/R.spec @@ -182,6 +182,10 @@ install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ +# Fix multilib +touch -r NEWS CAPABILITIES +touch -r NEWS doc/manual/*.pdf + %files %defattr(-, root, root) %{_bindir}/R @@ -262,6 +266,9 @@ fi /sbin/ldconfig %changelog +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-3 +- fix multilib conflicts (bz 343061) + * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-2 - add R CMD javareconf to post (bz 354541) - don't pickup bogus perl provides (bz 356071) commit 402fbbf44410cdda05dab37332152f49dc2dfaf7 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 15:51:14 2007 +0000 Fix outstanding R bugs diff --git a/R.spec b/R.spec index 0015ef7..d437bd3 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -18,7 +18,7 @@ BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel BuildRequires: gcc-objc -Requires: evince, cups, firefox +Requires: xdg-utils, cups # These are the submodules that R provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are @@ -104,13 +104,22 @@ and header files. %prep %setup -q +# Filter false positive provides. +cat <<EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} \ +| grep -v 'File::Copy::Recursive' | grep -v 'Text::DelimMatch' +EOF +%define __perl_provides %{_builddir}/R-%{version}/%{name}-prov +chmod +x %{__perl_provides} + %build # Add PATHS to Renviron for R_LIBS echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in -export R_PDFVIEWER="%{_bindir}/evince" +export R_PDFVIEWER="%{_bindir}/xdg-open" export R_PRINTCMD="lpr" -export R_BROWSER="%{_bindir}/firefox" +export R_BROWSER="%{_bindir}/xdg-open" export F77="gfortran" ( %configure \ --with-system-zlib --with-system-bzlib --with-system-pcre \ @@ -220,6 +229,7 @@ for doc in admin exts FAQ intro lang; do fi done /sbin/ldconfig +R CMD javareconf || exit 0 # Update package indices %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null @@ -252,6 +262,11 @@ fi /sbin/ldconfig %changelog +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-2 +- add R CMD javareconf to post (bz 354541) +- don't pickup bogus perl provides (bz 356071) +- use xdg-open, drop requires for firefox/evince (bz 351841) + * Thu Oct 4 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-1 - bump to 2.6.0 commit 387ab92fbe72fe414cfe6dc237ff58d1199c5c79 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Thu Oct 4 19:43:37 2007 +0000 R 2.6.0 diff --git a/R.spec b/R.spec index e63a1eb..0015ef7 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R -Version: 2.5.1 -Release: 3%{?dist} +Version: 2.6.0 +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 @@ -26,7 +26,7 @@ Requires: evince, cups, firefox Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = 1.11.7 +Provides: R-cluster = 1.11.9 Provides: R-codetools = 0.1 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -34,7 +34,7 @@ Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 -Provides: R-lattice = 0.15 +Provides: R-lattice = 0.16 Provides: R-MASS = %{version} Provides: R-methods = %{version} Provides: R-mgcv = 1.3 @@ -252,6 +252,9 @@ fi /sbin/ldconfig %changelog +* Thu Oct 4 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.6.0-1 +- bump to 2.6.0 + * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-3 - fix license tag - rebuild for ppc32 diff --git a/sources b/sources index 2ac86c4..0025f28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -162f6d5a1bd7c60fd652145e050f3f3c R-2.5.1.tar.gz +97e5d2542349925962b7469456d45731 R-2.6.0.tar.gz commit 13d6a0ee9007e1c73c128d0cd863aa435c43a7a1 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sun Aug 26 22:51:42 2007 +0000 Rebuild for ppc32, license tags fixed diff --git a/R.spec b/R.spec index e8eb846..e63a1eb 100644 --- a/R.spec +++ b/R.spec @@ -1,12 +1,12 @@ Name: R Version: 2.5.1 -Release: 2%{?dist} +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 -License: GPL +License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran @@ -252,6 +252,10 @@ fi /sbin/ldconfig %changelog +* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-3 +- fix license tag +- rebuild for ppc32 + * Thu Jul 5 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-2 - add rpm helper macros, script commit 25e0ecad401e183ed2ff82c7558658ad062afb8b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sun Aug 26 22:51:32 2007 +0000 Rebuild for ppc32, license tags fixed diff --git a/R.spec b/R.spec index 904d2e8..ae212ce 100644 --- a/R.spec +++ b/R.spec @@ -6,7 +6,7 @@ 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 -License: GPL +License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran commit 05ba0c124d6701def0fa7ac692c8b6aee07cfe68 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jul 6 22:07:47 2007 +0000 Add scripts and macros to make R packaging easier. diff --git a/R-make-search-index.sh b/R-make-search-index.sh new file mode 100755 index 0000000..f0a119e --- /dev/null +++ b/R-make-search-index.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# Figure out what RHOME is set to +TMP_R_HOME=`R RHOME` + +# Write out all the contents in arch and noarch library locations +cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null +cat /usr/share/R/library/*/CONTENTS >> $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null + +exit 0 + diff --git a/R.spec b/R.spec index dbf1270..e8eb846 100644 --- a/R.spec +++ b/R.spec @@ -1,9 +1,11 @@ Name: R Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?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 License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -163,13 +165,23 @@ echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library +# Install rpm helper macros +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ + +# Install rpm helper script +mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ +install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ + %files %defattr(-, root, root) %{_bindir}/R %{_bindir}/Rscript %{_datadir}/R %{_libdir}/R +/usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* +%{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* /etc/ld.so.conf.d/* %doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS @@ -212,6 +224,8 @@ done # Update package indices %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null %__cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt 2>/dev/null +# This could fail if there are no noarch R libraries on the system. +%__cat %{_datadir}/R/library/*/CONTENTS >> %{_libdir}/R/doc/html/search/index.txt 2>/dev/null || exit 0 %preun if [ $1 = 0 ]; then @@ -238,6 +252,9 @@ fi /sbin/ldconfig %changelog +* Thu Jul 5 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-2 +- add rpm helper macros, script + * Mon Jul 2 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-1 - drop patch, upstream fixed - bump to 2.5.1 diff --git a/macros.R b/macros.R new file mode 100644 index 0000000..7170799 --- /dev/null +++ b/macros.R @@ -0,0 +1,9 @@ +# +# RPM macros for R packaging +# + +# +# Make R search index.txt +# +%_R_make_search_index /usr/lib/rpm/R-make-search-index.sh + commit 251e22af0ab5280c9f72b5c4af400f5ef41816fd Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jul 6 22:07:28 2007 +0000 Add scripts and macros to make R packaging easier. diff --git a/R-make-search-index.sh b/R-make-search-index.sh new file mode 100755 index 0000000..f0a119e --- /dev/null +++ b/R-make-search-index.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# Figure out what RHOME is set to +TMP_R_HOME=`R RHOME` + +# Write out all the contents in arch and noarch library locations +cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null +cat /usr/share/R/library/*/CONTENTS >> $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null + +exit 0 + diff --git a/R.spec b/R.spec index 837e8e0..904d2e8 100644 --- a/R.spec +++ b/R.spec @@ -1,9 +1,11 @@ Name: R Version: 2.5.1 -Release: 1%{?dist}.1 +Release: 2%{?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 License: GPL Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -163,13 +165,23 @@ echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library +# Install rpm helper macros +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ + +# Install rpm helper script +mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ +install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ + %files %defattr(-, root, root) %{_bindir}/R %{_bindir}/Rscript %{_datadir}/R %{_libdir}/R +/usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* +%{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* /etc/ld.so.conf.d/* %doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS @@ -212,6 +224,8 @@ done # Update package indices %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null %__cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt 2>/dev/null +# This could fail if there are no noarch R libraries on the system. +%__cat %{_datadir}/R/library/*/CONTENTS >> %{_libdir}/R/doc/html/search/index.txt 2>/dev/null || exit 0 %preun if [ $1 = 0 ]; then @@ -238,6 +252,9 @@ fi /sbin/ldconfig %changelog +* Thu Jul 5 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-2 +- add rpm helper macros, script + * Tue Jul 3 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-1.1 - fix BR for EL-5 diff --git a/macros.R b/macros.R new file mode 100644 index 0000000..7170799 --- /dev/null +++ b/macros.R @@ -0,0 +1,9 @@ +# +# RPM macros for R packaging +# + +# +# Make R search index.txt +# +%_R_make_search_index /usr/lib/rpm/R-make-search-index.sh + commit dab0e1f93c244dc59ea77c3a4dc07265b50f2c5d Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jul 3 12:38:56 2007 +0000 Fix EPEL builds. diff --git a/R.spec b/R.spec index dbf1270..837e8e0 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.5.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 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 @@ -12,7 +12,7 @@ BuildRequires: gcc-c++, tetex-latex, texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel -BuildRequires: java-1.5.0-gcj, lapack-devel +BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel BuildRequires: gcc-objc @@ -238,6 +238,9 @@ fi /sbin/ldconfig %changelog +* Tue Jul 3 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-1.1 +- fix BR for EL-5 + * Mon Jul 2 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-1 - drop patch, upstream fixed - bump to 2.5.1 commit 5226c2c1e27dbbfa15fcd3033c48e2dda24ac21d Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jul 3 02:05:07 2007 +0000 R 2.5.1 diff --git a/.cvsignore b/.cvsignore index 572d452..1df5ff4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,4 @@ R-2.3.1.tar.gz R-2.4.0.tar.gz R-2.4.1.tar.gz R-2.5.0.tar.gz +R-2.5.1.tar.gz diff --git a/R.spec b/R.spec index 1e6bf02..dbf1270 100644 --- a/R.spec +++ b/R.spec @@ -1,12 +1,11 @@ Name: R -Version: 2.5.0 -Release: 2%{?dist} +Version: 2.5.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 License: GPL Group: Applications/Engineering -Patch0: R-2.5.0-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tetex-latex, texinfo-tex @@ -15,7 +14,7 @@ BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -# This isn't entirely true, but Martyn Plummer thinks it will be soon. +BuildRequires: bzip2-devel, libXmu-devel BuildRequires: gcc-objc Requires: evince, cups, firefox @@ -25,7 +24,7 @@ Requires: evince, cups, firefox Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = 1.11.5 +Provides: R-cluster = 1.11.7 Provides: R-codetools = 0.1 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -45,7 +44,7 @@ Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.31 +Provides: R-survival = 2.32 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -76,6 +75,7 @@ Requires: R = %{version} Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel +Requires: bzip2-devel, libXmu-devel Requires: tcl-devel, tk-devel, pkgconfig %description devel @@ -101,7 +101,6 @@ and header files. %prep %setup -q -%patch0 -p1 %build # Add PATHS to Renviron for R_LIBS @@ -125,7 +124,6 @@ make pdf make info %install - %makeinstall rhome=${RPM_BUILD_ROOT}%{_libdir}/R install-info rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old @@ -240,6 +238,10 @@ fi /sbin/ldconfig %changelog +* Mon Jul 2 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-1 +- drop patch, upstream fixed +- bump to 2.5.1 + * Mon Apr 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-2 - patch from Martyn Plummer fixes .pc files - add new BR: gcc-objc diff --git a/sources b/sources index 25045a1..2ac86c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9088663fc539c059acfaf19d6d90a69 R-2.5.0.tar.gz +162f6d5a1bd7c60fd652145e050f3f3c R-2.5.1.tar.gz commit a4dc7f76f95b89437820685c6230a807ad37e524 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Tue Jul 3 02:04:50 2007 +0000 R 2.5.1 diff --git a/R.spec b/R.spec index 9dbc3a6..dbf1270 100644 --- a/R.spec +++ b/R.spec @@ -1,19 +1,18 @@ Name: R -Version: 2.5.0 -Release: 3%{?dist} +Version: 2.5.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 License: GPL Group: Applications/Engineering -Patch0: R-2.5.0-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tetex-latex, texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel -BuildRequires: java-1.4.2-gcj-compat, lapack-devel +BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel BuildRequires: gcc-objc @@ -25,7 +24,7 @@ Requires: evince, cups, firefox Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = 1.11.5 +Provides: R-cluster = 1.11.7 Provides: R-codetools = 0.1 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 @@ -45,7 +44,7 @@ Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.31 +Provides: R-survival = 2.32 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -102,7 +101,6 @@ and header files. %prep %setup -q -%patch0 -p1 %build # Add PATHS to Renviron for R_LIBS @@ -126,7 +124,6 @@ make pdf make info %install - %makeinstall rhome=${RPM_BUILD_ROOT}%{_libdir}/R install-info rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old @@ -241,10 +238,9 @@ fi /sbin/ldconfig %changelog -* Fri May 25 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-3 -- add missing BR: bzip2-devel, libXmu-devel -- cleanup macros from changelog -- switch from termcap to ncurses +* Mon Jul 2 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.1-1 +- drop patch, upstream fixed +- bump to 2.5.1 * Mon Apr 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-2 - patch from Martyn Plummer fixes .pc files @@ -254,8 +250,16 @@ fi - bump to 2.5.0 * Tue Mar 13 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-4 +- get rid of termcap related requires, replace with ncurses +- use java-1.5.0-gcj instead of old java-1.4.2 - add /usr/share/R/library as a valid R_LIBS directory for noarch bits +* Sun Feb 25 2007 Jef Spaleta <jspaleta(a)gmail.com> 2.4.1-3 +- rebuild for reverted tcl/tk + +* Fri Feb 2 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-2 +- rebuild for new tcl/tk + * Tue Dec 19 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-1 - bump to 2.4.1 - fix install-info invocations in post/preun (bz 219407) @@ -414,8 +418,8 @@ fi avoiding warnings about UTF-8 locale not being supported * Mon Mar 15 2004 Martyn Plummer <plummer(a)iarc.fr> -- No need to export optimization flags. This is done by %%configure -- Folded info installation into %%makeinstall +- No need to export optimization flags. This is done by %configure +- Folded info installation into %makeinstall - Check that RPM_BASE_ROOT is not set to "/" before cleaning up * Thu Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> @@ -424,7 +428,7 @@ fi * Tue Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> - Changes from James Henstridge <james(a)daa.com.au> to allow building on IA64: - Added BuildRequires for tcl-devel tk-devel tetex-latex -- Use the %%configure macro to call the configure script +- Use the %configure macro to call the configure script - Pass --with-tcl-config and --with-tk-config arguments to configure - Set rhome to point to the build root during "make install" diff --git a/sources b/sources index 25045a1..2ac86c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9088663fc539c059acfaf19d6d90a69 R-2.5.0.tar.gz +162f6d5a1bd7c60fd652145e050f3f3c R-2.5.1.tar.gz commit 0a9c0de78aff93cd7ebca075240a987cbd4f575b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Jul 2 19:40:15 2007 +0000 Initialize branch EL-5 for R diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 commit b814f2a7d7c189dcbfcc98ff21301473a80c4c26 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri May 25 15:56:28 2007 +0000 Resolve bugzilla 241374. diff --git a/R.spec b/R.spec index e832911..9dbc3a6 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.5.0 -Release: 2%{?dist} +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 @@ -10,12 +10,12 @@ Patch0: R-2.5.0-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tetex-latex, texinfo-tex -BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel -BuildRequires: tcl-devel, tk-devel +BuildRequires: libpng-devel, libjpeg-devel, readline-devel +BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -# This isn't entirely true, but Martyn Plummer thinks it will be soon. +BuildRequires: bzip2-devel, libXmu-devel BuildRequires: gcc-objc Requires: evince, cups, firefox @@ -74,8 +74,9 @@ Group: Applications/Engineering Requires: R = %{version} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo -Requires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel +Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel +Requires: bzip2-devel, libXmu-devel Requires: tcl-devel, tk-devel, pkgconfig %description devel @@ -240,6 +241,11 @@ fi /sbin/ldconfig %changelog +* Fri May 25 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-3 +- add missing BR: bzip2-devel, libXmu-devel +- cleanup macros from changelog +- switch from termcap to ncurses + * Mon Apr 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-2 - patch from Martyn Plummer fixes .pc files - add new BR: gcc-objc @@ -408,8 +414,8 @@ fi avoiding warnings about UTF-8 locale not being supported * Mon Mar 15 2004 Martyn Plummer <plummer(a)iarc.fr> -- No need to export optimization flags. This is done by %configure -- Folded info installation into %makeinstall +- No need to export optimization flags. This is done by %%configure +- Folded info installation into %%makeinstall - Check that RPM_BASE_ROOT is not set to "/" before cleaning up * Thu Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> @@ -418,7 +424,7 @@ fi * Tue Feb 03 2004 Martyn Plummer <plummer(a)iarc.fr> - Changes from James Henstridge <james(a)daa.com.au> to allow building on IA64: - Added BuildRequires for tcl-devel tk-devel tetex-latex -- Use the %configure macro to call the configure script +- Use the %%configure macro to call the configure script - Pass --with-tcl-config and --with-tk-config arguments to configure - Set rhome to point to the build root during "make install" commit 181b8745795dc21a39a1949def25bce2c183c794 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Apr 30 12:48:57 2007 +0000 Fixes from Martyn Plummer diff --git a/R-2.5.0-pkgconfig.patch b/R-2.5.0-pkgconfig.patch new file mode 100644 index 0000000..bcf7b3c --- /dev/null +++ b/R-2.5.0-pkgconfig.patch @@ -0,0 +1,149 @@ +diff -uNr R-2.5.0/src/nmath/standalone/Makefile.in R-2.5.0-patched/src/nmath/standalone/Makefile.in +--- R-2.5.0/src/nmath/standalone/Makefile.in 2007-03-26 18:42:08.000000000 +0200 ++++ R-2.5.0-patched/src/nmath/standalone/Makefile.in 2007-04-29 14:50:55.000000000 +0200 +@@ -67,7 +67,7 @@ + libRmath_la_LDFLAGS = + + CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES) +-DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES) ++DISTCLEANFILES = Makefile libRmath.pc $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES) + + DEFS = -DHAVE_CONFIG_H -DMATHLIB_STANDALONE + ALL_CPPFLAGS = $(R_XTRA_CPPFLAGS) -I$(srcdir)/.. $(CPPFLAGS) $(DEFS) +@@ -78,7 +78,7 @@ + @r_cc_lo_rules_frag@ + + +-all: Makefile inc static shared ++all: Makefile inc static shared build-pc + + inc: + (cd ../../include; $(MAKE) Rmath.h) +@@ -100,6 +100,11 @@ + shared: Makefile ../../include/Rconfig.h Copy Makedeps + @$(MAKE) $(Rexeclibdir_LTLIBRARIES) + ++build-pc: ++ @$(SED) -e "s:@libdir:$(libdir):" -e "s:@includedir:$(includedir):" \ ++ -e 's/@VERSION/$(VERSION)/' -e 's/@libm/$(LIBM)/' $(srcdir)/libRmath.pc.in \ ++ > "libRmath.pc" ++ + ../../include/Rconfig.h: + (cd $(@D); $(MAKE) $(@F)) + +@@ -163,9 +168,7 @@ + + install-pc: + @$(MKINSTALLDIRS) "$(libdir)/pkgconfig" +- @$(SED) -e "s:@libdir:$(libdir):" -e "s:@includedir:$(includedir):" \ +- -e 's/@VERSION/$(VERSION)/' -e 's/@libm/$(LIBM)/' $(srcdir)/libRmath.pc.in \ +- > "$(libdir)/pkgconfig/libRmath.pc" ++ @$(INSTALL_DATA) libRmath.pc "$(libdir)/pkgconfig/libRmath.pc" + + uninstall: + @rm -f $(includedir)/Rmath.h $(libdir)/$(libRmath_la) $(libdir)/libRmath.a "$(libdir)/pkgconfig/libRmath.pc" +diff -uNr R-2.5.0/src/scripts/Makefile.in R-2.5.0-patched/src/scripts/Makefile.in +--- R-2.5.0/src/scripts/Makefile.in 2007-03-26 18:42:09.000000000 +0200 ++++ R-2.5.0-patched/src/scripts/Makefile.in 2007-04-29 14:50:14.000000000 +0200 +@@ -23,17 +23,22 @@ + DISTFILES = Makefile.in Makefile.win $(SCRIPTS_S) $(SCRIPTS_B_IN) R.sh.in + + CLEANFILES = +-DISTCLEANFILES = Makefile R.fe R.sh $(SCRIPTS_B) ++DISTCLEANFILES = Makefile R.fe R.fe2 R.sh $(SCRIPTS_B) + + all: Makefile R + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +-R: $(SCRIPTS_B) R.fe ++R: $(SCRIPTS_B) R.fe R.fe2 + @$(MAKE) rhome=$(top_builddir) install-cmds + @$(INSTALL_SCRIPT) R.fe $(top_builddir)/bin/R + ++R.fe2: ++ @(d=`echo '$(rhome)' | sed 's,/,\\\/,g';`; \ ++ sed -e "s/\$R_HOME_DIR=\$.*/\\1$${d}/;" -e "s+\$R_SHARE_DIR=\$.*+\\1$(rsharedir)+;" -e "s+\$R_INCLUDE_DIR=\$.*+\\1$(rincludedir)+;" -e "s+\$R_DOC_DIR=\$.*+\\1$(rdocdir)+;"\ ++ < R.fe > $@) ++ + ## <NOTE> + ## Seems we need target rules for creating FOO from FOO.in: pattern + ## rules ('%:%.in') are not portable, and some versions of Make do not +@@ -95,10 +100,8 @@ + + install: installdirs install-cmds + @rm -f $(bindir)/R +- @(d=`echo '$(rhome)' | sed 's,/,\\\/,g';`; \ +- sed -e "s/\$R_HOME_DIR=\$.*/\\1$${d}/;" -e "s+\$R_SHARE_DIR=\$.*+\\1$(rsharedir)+;" -e "s+\$R_INCLUDE_DIR=\$.*+\\1$(rincludedir)+;" -e "s+\$R_DOC_DIR=\$.*+\\1$(rdocdir)+;"\ +- < R.fe > "$(Rexecbindir)/R") +- @$(INSTALL_SCRIPT) "$(Rexecbindir)/R" "$(bindir)/R" ++ @$(INSTALL_SCRIPT) R.fe2 "$(Rexecbindir)/R" ++ @$(INSTALL_SCRIPT) R.fe2 "$(bindir)/R" + @chmod 755 "$(bindir)/R" "$(Rexecbindir)/R" + ## why of all the scriots does this alone chmod just one copy? + installdirs: +diff -uNr R-2.5.0/src/unix/Makefile.in R-2.5.0-patched/src/unix/Makefile.in +--- R-2.5.0/src/unix/Makefile.in 2007-03-26 18:41:33.000000000 +0200 ++++ R-2.5.0-patched/src/unix/Makefile.in 2007-04-29 14:51:55.000000000 +0200 +@@ -26,7 +26,7 @@ + + @WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO) + +-all: Makefile Makedeps R ++all: Makefile Makedeps R + + Makefile: $(srcdir)/Makefile.in \ + $(top_builddir)/config.status \ +@@ -38,11 +38,23 @@ + @cat $(DEPENDS) >> Makefile + @touch $@ + +-R: Makefile ++R: Makefile + @$(MAKE) Makedeps + @WANT_R_SHLIB_FALSE@ @$(MAKE) libunix.a + @WANT_R_SHLIB_TRUE@ @$(MAKE) stamp-lo ++ @$(MAKE) rhome=$(abs_top_builddir) build-Rscript + @$(MAKE) rhome=$(abs_top_builddir) install-Rscript ++ @$(MAKE) build-Rscript ++ @$(MAKE) build-pc ++ ++build-pc: ++ @$(SED) -e "s:@rhome:$(rhome):" -e "s:@rincludedir:$(rincludedir):" \ ++ -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \ ++ > "libR.pc" ++ ++build-Rscript: ++ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \ ++ $(srcdir)/Rscript.c + + ## is this portable? + ../include/Rversion.h: +@@ -60,22 +72,19 @@ + clean: + @-rm -rf .libs _libs + @-rm -f Makedeps *.d *.o *.a *.lo *.la stamp-lo ++ @-rm -f Rscript libR.pc + distclean: clean + @-rm -f Makefile + maintainer-clean: distclean + +-## we need to build at install time to capture the correct 'rhome' ++## install previously built Rscript + install-Rscript: +- $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \ +- $(srcdir)/Rscript.c + @$(MKINSTALLDIRS) "$(Rexecbindir)" + @$(INSTALL_PROGRAM) Rscript "$(Rexecbindir)/Rscript" +-## substitute at install time to allow 'prefix' to be overridden ++## install previously built libR.pc + install-pc: + @$(MKINSTALLDIRS) "$(libdir)/pkgconfig" +- @$(SED) -e "s:@rhome:$(rhome):" -e "s:@rincludedir:$(rincludedir):" \ +- -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \ +- > "$(libdir)/pkgconfig/libR.pc" ++ @$(INSTALL_DATA) libR.pc "$(libdir)/pkgconfig/libR.pc" + install: install-Rscript @WANT_R_SHLIB_TRUE@ install-pc + @$(MKINSTALLDIRS) "$(bindir)" + @$(INSTALL_PROGRAM) Rscript "$(bindir)/Rscript" diff --git a/R.spec b/R.spec index c3503fc..1e6bf02 100644 --- a/R.spec +++ b/R.spec @@ -1,11 +1,12 @@ Name: R Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?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 License: GPL Group: Applications/Engineering +Patch0: R-2.5.0-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tetex-latex, texinfo-tex @@ -14,6 +15,8 @@ BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel +# This isn't entirely true, but Martyn Plummer thinks it will be soon. +BuildRequires: gcc-objc Requires: evince, cups, firefox # These are the submodules that R provides. Sometimes R modules say they @@ -98,6 +101,7 @@ and header files. %prep %setup -q +%patch0 -p1 %build # Add PATHS to Renviron for R_LIBS @@ -236,6 +240,10 @@ fi /sbin/ldconfig %changelog +* Mon Apr 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-2 +- patch from Martyn Plummer fixes .pc files +- add new BR: gcc-objc + * Wed Apr 25 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-1 - bump to 2.5.0 commit ebd23fce889ffc3aeffd11ea670e2d5133783e99 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Apr 30 12:48:52 2007 +0000 Fixes from Martyn Plummer diff --git a/R-2.5.0-pkgconfig.patch b/R-2.5.0-pkgconfig.patch new file mode 100644 index 0000000..bcf7b3c --- /dev/null +++ b/R-2.5.0-pkgconfig.patch @@ -0,0 +1,149 @@ +diff -uNr R-2.5.0/src/nmath/standalone/Makefile.in R-2.5.0-patched/src/nmath/standalone/Makefile.in +--- R-2.5.0/src/nmath/standalone/Makefile.in 2007-03-26 18:42:08.000000000 +0200 ++++ R-2.5.0-patched/src/nmath/standalone/Makefile.in 2007-04-29 14:50:55.000000000 +0200 +@@ -67,7 +67,7 @@ + libRmath_la_LDFLAGS = + + CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES) +-DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES) ++DISTCLEANFILES = Makefile libRmath.pc $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES) + + DEFS = -DHAVE_CONFIG_H -DMATHLIB_STANDALONE + ALL_CPPFLAGS = $(R_XTRA_CPPFLAGS) -I$(srcdir)/.. $(CPPFLAGS) $(DEFS) +@@ -78,7 +78,7 @@ + @r_cc_lo_rules_frag@ + + +-all: Makefile inc static shared ++all: Makefile inc static shared build-pc + + inc: + (cd ../../include; $(MAKE) Rmath.h) +@@ -100,6 +100,11 @@ + shared: Makefile ../../include/Rconfig.h Copy Makedeps + @$(MAKE) $(Rexeclibdir_LTLIBRARIES) + ++build-pc: ++ @$(SED) -e "s:@libdir:$(libdir):" -e "s:@includedir:$(includedir):" \ ++ -e 's/@VERSION/$(VERSION)/' -e 's/@libm/$(LIBM)/' $(srcdir)/libRmath.pc.in \ ++ > "libRmath.pc" ++ + ../../include/Rconfig.h: + (cd $(@D); $(MAKE) $(@F)) + +@@ -163,9 +168,7 @@ + + install-pc: + @$(MKINSTALLDIRS) "$(libdir)/pkgconfig" +- @$(SED) -e "s:@libdir:$(libdir):" -e "s:@includedir:$(includedir):" \ +- -e 's/@VERSION/$(VERSION)/' -e 's/@libm/$(LIBM)/' $(srcdir)/libRmath.pc.in \ +- > "$(libdir)/pkgconfig/libRmath.pc" ++ @$(INSTALL_DATA) libRmath.pc "$(libdir)/pkgconfig/libRmath.pc" + + uninstall: + @rm -f $(includedir)/Rmath.h $(libdir)/$(libRmath_la) $(libdir)/libRmath.a "$(libdir)/pkgconfig/libRmath.pc" +diff -uNr R-2.5.0/src/scripts/Makefile.in R-2.5.0-patched/src/scripts/Makefile.in +--- R-2.5.0/src/scripts/Makefile.in 2007-03-26 18:42:09.000000000 +0200 ++++ R-2.5.0-patched/src/scripts/Makefile.in 2007-04-29 14:50:14.000000000 +0200 +@@ -23,17 +23,22 @@ + DISTFILES = Makefile.in Makefile.win $(SCRIPTS_S) $(SCRIPTS_B_IN) R.sh.in + + CLEANFILES = +-DISTCLEANFILES = Makefile R.fe R.sh $(SCRIPTS_B) ++DISTCLEANFILES = Makefile R.fe R.fe2 R.sh $(SCRIPTS_B) + + all: Makefile R + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +-R: $(SCRIPTS_B) R.fe ++R: $(SCRIPTS_B) R.fe R.fe2 + @$(MAKE) rhome=$(top_builddir) install-cmds + @$(INSTALL_SCRIPT) R.fe $(top_builddir)/bin/R + ++R.fe2: ++ @(d=`echo '$(rhome)' | sed 's,/,\\\/,g';`; \ ++ sed -e "s/\$R_HOME_DIR=\$.*/\\1$${d}/;" -e "s+\$R_SHARE_DIR=\$.*+\\1$(rsharedir)+;" -e "s+\$R_INCLUDE_DIR=\$.*+\\1$(rincludedir)+;" -e "s+\$R_DOC_DIR=\$.*+\\1$(rdocdir)+;"\ ++ < R.fe > $@) ++ + ## <NOTE> + ## Seems we need target rules for creating FOO from FOO.in: pattern + ## rules ('%:%.in') are not portable, and some versions of Make do not +@@ -95,10 +100,8 @@ + + install: installdirs install-cmds + @rm -f $(bindir)/R +- @(d=`echo '$(rhome)' | sed 's,/,\\\/,g';`; \ +- sed -e "s/\$R_HOME_DIR=\$.*/\\1$${d}/;" -e "s+\$R_SHARE_DIR=\$.*+\\1$(rsharedir)+;" -e "s+\$R_INCLUDE_DIR=\$.*+\\1$(rincludedir)+;" -e "s+\$R_DOC_DIR=\$.*+\\1$(rdocdir)+;"\ +- < R.fe > "$(Rexecbindir)/R") +- @$(INSTALL_SCRIPT) "$(Rexecbindir)/R" "$(bindir)/R" ++ @$(INSTALL_SCRIPT) R.fe2 "$(Rexecbindir)/R" ++ @$(INSTALL_SCRIPT) R.fe2 "$(bindir)/R" + @chmod 755 "$(bindir)/R" "$(Rexecbindir)/R" + ## why of all the scriots does this alone chmod just one copy? + installdirs: +diff -uNr R-2.5.0/src/unix/Makefile.in R-2.5.0-patched/src/unix/Makefile.in +--- R-2.5.0/src/unix/Makefile.in 2007-03-26 18:41:33.000000000 +0200 ++++ R-2.5.0-patched/src/unix/Makefile.in 2007-04-29 14:51:55.000000000 +0200 +@@ -26,7 +26,7 @@ + + @WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO) + +-all: Makefile Makedeps R ++all: Makefile Makedeps R + + Makefile: $(srcdir)/Makefile.in \ + $(top_builddir)/config.status \ +@@ -38,11 +38,23 @@ + @cat $(DEPENDS) >> Makefile + @touch $@ + +-R: Makefile ++R: Makefile + @$(MAKE) Makedeps + @WANT_R_SHLIB_FALSE@ @$(MAKE) libunix.a + @WANT_R_SHLIB_TRUE@ @$(MAKE) stamp-lo ++ @$(MAKE) rhome=$(abs_top_builddir) build-Rscript + @$(MAKE) rhome=$(abs_top_builddir) install-Rscript ++ @$(MAKE) build-Rscript ++ @$(MAKE) build-pc ++ ++build-pc: ++ @$(SED) -e "s:@rhome:$(rhome):" -e "s:@rincludedir:$(rincludedir):" \ ++ -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \ ++ > "libR.pc" ++ ++build-Rscript: ++ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \ ++ $(srcdir)/Rscript.c + + ## is this portable? + ../include/Rversion.h: +@@ -60,22 +72,19 @@ + clean: + @-rm -rf .libs _libs + @-rm -f Makedeps *.d *.o *.a *.lo *.la stamp-lo ++ @-rm -f Rscript libR.pc + distclean: clean + @-rm -f Makefile + maintainer-clean: distclean + +-## we need to build at install time to capture the correct 'rhome' ++## install previously built Rscript + install-Rscript: +- $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \ +- $(srcdir)/Rscript.c + @$(MKINSTALLDIRS) "$(Rexecbindir)" + @$(INSTALL_PROGRAM) Rscript "$(Rexecbindir)/Rscript" +-## substitute at install time to allow 'prefix' to be overridden ++## install previously built libR.pc + install-pc: + @$(MKINSTALLDIRS) "$(libdir)/pkgconfig" +- @$(SED) -e "s:@rhome:$(rhome):" -e "s:@rincludedir:$(rincludedir):" \ +- -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \ +- > "$(libdir)/pkgconfig/libR.pc" ++ @$(INSTALL_DATA) libR.pc "$(libdir)/pkgconfig/libR.pc" + install: install-Rscript @WANT_R_SHLIB_TRUE@ install-pc + @$(MKINSTALLDIRS) "$(bindir)" + @$(INSTALL_PROGRAM) Rscript "$(bindir)/Rscript" diff --git a/R.spec b/R.spec index 2dbb21b..e832911 100644 --- a/R.spec +++ b/R.spec @@ -1,11 +1,12 @@ Name: R Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?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 License: GPL Group: Applications/Engineering +Patch0: R-2.5.0-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tetex-latex, texinfo-tex @@ -14,6 +15,8 @@ BuildRequires: tcl-devel, tk-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel BuildRequires: java-1.4.2-gcj-compat, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel +# This isn't entirely true, but Martyn Plummer thinks it will be soon. +BuildRequires: gcc-objc Requires: evince, cups, firefox # These are the submodules that R provides. Sometimes R modules say they @@ -98,6 +101,7 @@ and header files. %prep %setup -q +%patch0 -p1 %build # Add PATHS to Renviron for R_LIBS @@ -236,6 +240,10 @@ fi /sbin/ldconfig %changelog +* Mon Apr 30 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-2 +- patch from Martyn Plummer fixes .pc files +- add new BR: gcc-objc + * Wed Apr 25 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-1 - bump to 2.5.0 commit 188fbfbd5ebe521f1781cbc4c60c871ce4699145 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Apr 25 21:32:24 2007 +0000 2.5.0 diff --git a/.cvsignore b/.cvsignore index a71c9d1..572d452 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,3 +7,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 +R-2.5.0.tar.gz diff --git a/R.spec b/R.spec index 747a5df..c3503fc 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R -Version: 2.4.1 -Release: 4%{?dist} +Version: 2.5.0 +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 @@ -22,25 +22,27 @@ Requires: evince, cups, firefox Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = 1.11.4 +Provides: R-cluster = 1.11.5 +Provides: R-codetools = 0.1 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 -Provides: R-lattice = 0.14 +Provides: R-lattice = 0.15 Provides: R-MASS = %{version} Provides: R-methods = %{version} Provides: R-mgcv = 1.3 Provides: R-nlme = 3.1 Provides: R-nnet = %{version} +Provides: R-rcompgen = 0.1 Provides: R-rpart = 3.1 Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.30 +Provides: R-survival = 2.31 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -71,7 +73,7 @@ Requires: R = %{version} Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -Requires: tcl-devel, tk-devel +Requires: tcl-devel, tk-devel, pkgconfig %description devel Install R-devel if you are going to develop or compile R packages. @@ -87,7 +89,7 @@ from the R project. This packages provides the shared libRmath library. %package -n libRmath-devel Summary: standalone math library from the R project Group: Development/Libraries -Requires: libRmath = %{version} +Requires: libRmath = %{version}, pkgconfig %description -n libRmath-devel A standalone library of mathematical and statistical functions derived @@ -138,6 +140,12 @@ sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \ chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R +# Get rid of buildroot in script +for i in $RPM_BUILD_ROOT%{_libdir}/R/bin/Rscript $RPM_BUILD_ROOT%{_bindir}/Rscript $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libR*.pc; +do + sed -i "s|$RPM_BUILD_ROOT||g" $i; +done + # Remove package indices. They are rebuilt by the postinstall script. # rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/function.html @@ -156,6 +164,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library %files %defattr(-, root, root) %{_bindir}/R +%{_bindir}/Rscript %{_datadir}/R %{_libdir}/R %{_infodir}/R-*.info* @@ -172,6 +181,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library %files devel %defattr(-, root, root) %doc doc/manual/R-exts.pdf +%{_libdir}/pkgconfig/libR.pc %files -n libRmath %defattr(-, root, root) @@ -181,6 +191,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library %defattr(-, root, root) %{_libdir}/libRmath.a %{_includedir}/Rmath.h +%{_libdir}/pkgconfig/libRmath.pc %clean rm -rf ${RPM_BUILD_ROOT}; @@ -225,6 +236,9 @@ fi /sbin/ldconfig %changelog +* Wed Apr 25 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-1 +- bump to 2.5.0 + * Tue Mar 13 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-4 - get rid of termcap related requires, replace with ncurses - use java-1.5.0-gcj instead of old java-1.4.2 diff --git a/sources b/sources index 50a7e03..25045a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92b33fd2c3e770d595c1a472889230d5 R-2.4.1.tar.gz +b9088663fc539c059acfaf19d6d90a69 R-2.5.0.tar.gz commit 259a3520cb93e7f67a9045ac50581283e86b0adf Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Apr 25 21:32:19 2007 +0000 2.5.0 diff --git a/R.spec b/R.spec index 8e6e706..2dbb21b 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R -Version: 2.4.1 -Release: 4%{?dist} +Version: 2.5.0 +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 @@ -22,25 +22,27 @@ Requires: evince, cups, firefox Provides: R-base = %{version} Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = 1.11.4 +Provides: R-cluster = 1.11.5 +Provides: R-codetools = 0.1 Provides: R-datasets = %{version} Provides: R-foreign = 0.8 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.22 -Provides: R-lattice = 0.14 +Provides: R-lattice = 0.15 Provides: R-MASS = %{version} Provides: R-methods = %{version} Provides: R-mgcv = 1.3 Provides: R-nlme = 3.1 Provides: R-nnet = %{version} +Provides: R-rcompgen = 0.1 Provides: R-rpart = 3.1 Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.30 +Provides: R-survival = 2.31 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -71,7 +73,7 @@ Requires: R = %{version} Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo Requires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel -Requires: tcl-devel, tk-devel +Requires: tcl-devel, tk-devel, pkgconfig %description devel Install R-devel if you are going to develop or compile R packages. @@ -87,7 +89,7 @@ from the R project. This packages provides the shared libRmath library. %package -n libRmath-devel Summary: standalone math library from the R project Group: Development/Libraries -Requires: libRmath = %{version} +Requires: libRmath = %{version}, pkgconfig %description -n libRmath-devel A standalone library of mathematical and statistical functions derived @@ -138,6 +140,12 @@ sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \ chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R +# Get rid of buildroot in script +for i in $RPM_BUILD_ROOT%{_libdir}/R/bin/Rscript $RPM_BUILD_ROOT%{_bindir}/Rscript $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libR*.pc; +do + sed -i "s|$RPM_BUILD_ROOT||g" $i; +done + # Remove package indices. They are rebuilt by the postinstall script. # rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/function.html @@ -151,9 +159,13 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/search/index.txt mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf +mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library + %files %defattr(-, root, root) %{_bindir}/R +%{_bindir}/Rscript +%{_datadir}/R %{_libdir}/R %{_infodir}/R-*.info* %{_mandir}/man1/* @@ -169,6 +181,7 @@ echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf %files devel %defattr(-, root, root) %doc doc/manual/R-exts.pdf +%{_libdir}/pkgconfig/libR.pc %files -n libRmath %defattr(-, root, root) @@ -178,6 +191,7 @@ echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf %defattr(-, root, root) %{_libdir}/libRmath.a %{_includedir}/Rmath.h +%{_libdir}/pkgconfig/libRmath.pc %clean rm -rf ${RPM_BUILD_ROOT}; @@ -222,6 +236,9 @@ fi /sbin/ldconfig %changelog +* Wed Apr 25 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.5.0-1 +- bump to 2.5.0 + * Tue Mar 13 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-4 - add /usr/share/R/library as a valid R_LIBS directory for noarch bits diff --git a/sources b/sources index 50a7e03..25045a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92b33fd2c3e770d595c1a472889230d5 R-2.4.1.tar.gz +b9088663fc539c059acfaf19d6d90a69 R-2.5.0.tar.gz commit a807881f4bb0beb0b2959259453ff461e704e773 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Mar 17 15:54:35 2007 +0000 - (FC7+) get rid of termcap related requires, replace with ncurses - (FC7+) use java-1.5.0-gcj instead of old java-1.4.2 - add /usr/share/R/library as a valid R_LIBS directory for noarch bits diff --git a/R.spec b/R.spec index 481bdcc..747a5df 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.4.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -9,10 +9,10 @@ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tetex-latex, texinfo-tex -BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel -BuildRequires: tcl-devel, tk-devel +BuildRequires: libpng-devel, libjpeg-devel, readline-devel +BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel -BuildRequires: java-1.4.2-gcj-compat, lapack-devel +BuildRequires: java-1.5.0-gcj, lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel Requires: evince, cups, firefox @@ -69,7 +69,7 @@ Group: Applications/Engineering Requires: R = %{version} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo -Requires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel +Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel Requires: tcl-devel, tk-devel @@ -98,6 +98,9 @@ and header files. %setup -q %build +# Add PATHS to Renviron for R_LIBS +echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in + export R_PDFVIEWER="%{_bindir}/evince" export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/firefox" @@ -148,9 +151,12 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/search/index.txt mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf +mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library + %files %defattr(-, root, root) %{_bindir}/R +%{_datadir}/R %{_libdir}/R %{_infodir}/R-*.info* %{_mandir}/man1/* @@ -219,6 +225,11 @@ fi /sbin/ldconfig %changelog +* Tue Mar 13 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-4 +- get rid of termcap related requires, replace with ncurses +- use java-1.5.0-gcj instead of old java-1.4.2 +- add /usr/share/R/library as a valid R_LIBS directory for noarch bits + * Sun Feb 25 2007 Jef Spaleta <jspaleta(a)gmail.com> 2.4.1-3 - rebuild for reverted tcl/tk commit c84c10c82bf970ae32f0f6eb4924f34b86432491 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Mar 17 15:54:32 2007 +0000 - (FC7+) get rid of termcap related requires, replace with ncurses - (FC7+) use java-1.5.0-gcj instead of old java-1.4.2 - add /usr/share/R/library as a valid R_LIBS directory for noarch bits diff --git a/R.spec b/R.spec index 624ddd5..8e6e706 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.4.1 -Release: 1%{?dist} +Release: 4%{?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 @@ -98,6 +98,9 @@ and header files. %setup -q %build +# Add PATHS to Renviron for R_LIBS +echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in + export R_PDFVIEWER="%{_bindir}/evince" export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/firefox" @@ -219,6 +222,9 @@ fi /sbin/ldconfig %changelog +* Tue Mar 13 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-4 +- add /usr/share/R/library as a valid R_LIBS directory for noarch bits + * Tue Dec 19 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-1 - bump to 2.4.1 - fix install-info invocations in post/preun (bz 219407) commit e7a7eaa4bf500c0dc54f291675293f63cdbd0998 Author: Jef Spaleta <jspaleta(a)fedoraproject.org> Date: Sun Feb 25 20:00:07 2007 +0000 - rebuild for reverted tcl/tk diff --git a/R.spec b/R.spec index c87086b..481bdcc 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.4.1 -Release: 2%{?dist} +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 @@ -219,6 +219,9 @@ fi /sbin/ldconfig %changelog +* Sun Feb 25 2007 Jef Spaleta <jspaleta(a)gmail.com> 2.4.1-3 +- rebuild for reverted tcl/tk + * Fri Feb 2 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-2 - rebuild for new tcl/tk commit b49a5a25ba2a3abae309a0c1a5c5b2fd495f0e70 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Feb 2 18:27:29 2007 +0000 Rebuild in devel for new tcl/tk. diff --git a/R.spec b/R.spec index 624ddd5..c87086b 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -219,6 +219,9 @@ fi /sbin/ldconfig %changelog +* Fri Feb 2 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-2 +- rebuild for new tcl/tk + * Tue Dec 19 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.1-1 - bump to 2.4.1 - fix install-info invocations in post/preun (bz 219407) commit a2a1845707c69f7283f6ded5029b1cf97e985467 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Dec 20 00:47:34 2006 +0000 Bump to 2.4.1 diff --git a/R.spec b/R.spec index ff7c87d..624ddd5 100644 --- a/R.spec +++ b/R.spec @@ -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: java-1.4.2-gcj-compat, lapack-devel 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-spatial = %{version} 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 @@ and header files. %prep %setup -q -%patch0 -p1 %build export R_PDFVIEWER="%{_bindir}/evince" @@ -189,7 +185,7 @@ rm -rf ${RPM_BUILD_ROOT}; 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 @@ if [ $1 = 0 ]; then 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 @@ fi /sbin/ldconfig %changelog +* Tue Dec 19 2006 Tom "spot" Callaway <tcallawa(a)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(a)redhat.com> 2.4.0-2 - sync with patched 2006-11-03 level to fix PR#9339 diff --git a/sources b/sources index 9ce5e32..50a7e03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f32379469d8712e9f5dd6435d30127d3 R-2.4.0.tar.gz +92b33fd2c3e770d595c1a472889230d5 R-2.4.1.tar.gz commit ac2dd2b6ae389bdf00cce0ee32d8c07b6e564f42 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Dec 20 00:47:34 2006 +0000 Bump to 2.4.1 diff --git a/.cvsignore b/.cvsignore index bc276e4..a71c9d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,4 @@ R-2.2.1.tar.gz R-2.3.0.tar.gz R-2.3.1.tar.gz R-2.4.0.tar.gz +R-2.4.1.tar.gz diff --git a/R.spec b/R.spec index ff7c87d..624ddd5 100644 --- a/R.spec +++ b/R.spec @@ -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: java-1.4.2-gcj-compat, lapack-devel 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-spatial = %{version} 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 @@ and header files. %prep %setup -q -%patch0 -p1 %build export R_PDFVIEWER="%{_bindir}/evince" @@ -189,7 +185,7 @@ rm -rf ${RPM_BUILD_ROOT}; 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 @@ if [ $1 = 0 ]; then 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 @@ fi /sbin/ldconfig %changelog +* Tue Dec 19 2006 Tom "spot" Callaway <tcallawa(a)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(a)redhat.com> 2.4.0-2 - sync with patched 2006-11-03 level to fix PR#9339 diff --git a/sources b/sources index 9ce5e32..50a7e03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f32379469d8712e9f5dd6435d30127d3 R-2.4.0.tar.gz +92b33fd2c3e770d595c1a472889230d5 R-2.4.1.tar.gz commit c2d0d7e77bd2570ce39c1ec510e5197557487405 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Nov 4 06:19:59 2006 +0000 Patch from upstream diff --git a/R-2.4.0-patched-2006-11-03.patch b/R-2.4.0-patched-2006-11-03.patch new file mode 100644 index 0000000..4c82dd7 --- /dev/null +++ b/R-2.4.0-patched-2006-11-03.patch @@ -0,0 +1,10076 @@ +diff -urp R-2.4.0.old/config.site R-2.4.0/config.site +--- R-2.4.0.old/config.site 2006-09-04 09:41:48.000000000 -0500 ++++ R-2.4.0/config.site 2006-10-28 14:36:13.000000000 -0500 +@@ -43,12 +43,16 @@ + ## If unspecified, a search is made for gcc and cc (in that order). + ## To override this choice, specify the name of the command which runs + ## the compiler here, for example 'c89'. ++## It is also convenient to set the architecture here, e.g. 'gcc -m32'. ++## NB, as from R 2.5.0 configure will append flags for C99 compliance, ++## e.g. CC=gcc -std=gnu99 ++## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS. + ## CC= + + ## Debugging and optimization options for the C compiler. + ## Use this to specify CFLAGS for the version of the C compiler + ## specified above. +-## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, ++## If unspecified, defaults to '-g -O2' for gcc, + ## and '-g' in all other cases except icc (for which see R-admin.html). + ## CFLAGS= + +diff -urp R-2.4.0.old/configure R-2.4.0/configure +--- R-2.4.0.old/configure 2006-10-03 05:01:50.000000000 -0500 ++++ R-2.4.0/configure 2006-11-03 19:41:47.000000000 -0600 +@@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++## next is a macro borrowed from autoconf 2.60 ++ echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6 ++if test "${ac_cv_prog_cc_c99+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_c99=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdarg.h> ++#include <stdbool.h> ++#include <stdlib.h> ++#include <wchar.h> ++#include <stdio.h> ++ ++struct incomplete_array ++{ ++ int datasize; ++ double data[]; ++}; ++ ++struct named_init { ++ int number; ++ const wchar_t *name; ++ double average; ++}; ++ ++typedef const char *ccp; ++ ++static inline int ++test_restrict(ccp restrict text) ++{ ++ // See if C++-style comments work. ++ // Iterate through items via the restricted pointer. ++ // Also check for declarations in for loops. ++ for (unsigned int i = 0; *(text+i) != '\0'; ++i) ++ continue; ++ return 0; ++} ++ ++// Check varargs and va_copy work. ++static void ++test_varargs(const char *format, ...) ++{ ++ va_list args; ++ va_start(args, format); ++ va_list args_copy; ++ va_copy(args_copy, args); ++ ++ const char *str; ++ int number; ++ float fnumber; ++ ++ while (*format) ++ { ++ switch (*format++) ++ { ++ case 's': // string ++ str = va_arg(args_copy, const char *); ++ break; ++ case 'd': // int ++ number = va_arg(args_copy, int); ++ break; ++ case 'f': // float ++ fnumber = (float) va_arg(args_copy, double); ++ break; ++ default: ++ break; ++ } ++ } ++ va_end(args_copy); ++ va_end(args); ++} ++ ++int ++main () ++{ ++ ++ // Check bool and long long datatypes. ++ _Bool success = false; ++ long long int bignum = -1234567890LL; ++ unsigned long long int ubignum = 1234567890uLL; ++ ++ // Check restrict. ++ if (test_restrict("String literal") != 0) ++ success = true; ++ char *restrict newvar = "Another string"; ++ ++ // Check varargs. ++ test_varargs("s, d' f .", "string", 65, 34.234); ++ ++ // Check incomplete arrays work. ++ struct incomplete_array *ia = ++ malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10)); ++ ia->datasize = 10; ++ for (int i = 0; i < ia->datasize; ++i) ++ ia->data[i] = (double) i * 1.234; ++ ++ // Check named initialisers. ++ struct named_init ni = { ++ .number = 34, ++ .name = L"Test wide string", ++ .average = 543.34343, ++ }; ++ ++ ni.number = 58; ++ ++ int dynamic_array[ni.number]; ++ dynamic_array[43] = 543; ++ ++ // work around unused variable warnings ++ return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; ++ ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99 ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_c99=$ac_arg ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c99" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c99" in ++ x) ++ echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6 ;; ++ xno) ++ echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6 ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c99" ++ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6 ;; ++esac ++ ++ ++ + + + ac_ext=c +@@ -5352,7 +5528,7 @@ fi + + + # Provide some information about the compiler. +-echo "$as_me:5355:" \ ++echo "$as_me:5531:" \ + "checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 +@@ -6181,8 +6357,8 @@ if test "${r_cv_prog_cc_vis}" = yes; the + fi + fi + case "${CC}" in +- ## Intel compiler +- *icc) ++ ## Intel compiler: note that -c99 may have been appended ++ *icc*) + C_VISIBILITY= + ;; + esac +@@ -6794,7 +6970,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6797 "configure"' > conftest.$ac_ext ++ echo '#line 6973 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8235,11 +8411,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8238: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8414: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8242: \$? = $ac_status" >&5 ++ echo "$as_me:8418: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -8468,11 +8644,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8471: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8647: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8475: \$? = $ac_status" >&5 ++ echo "$as_me:8651: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -8528,11 +8704,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8531: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8707: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8535: \$? = $ac_status" >&5 ++ echo "$as_me:8711: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10712,7 +10888,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10715 "configure" ++#line 10891 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10810,7 +10986,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10813 "configure" ++#line 10989 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12990,11 +13166,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12993: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13169: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12997: \$? = $ac_status" >&5 ++ echo "$as_me:13173: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -13050,11 +13226,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13053: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13229: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13057: \$? = $ac_status" >&5 ++ echo "$as_me:13233: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14411,7 +14587,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 14414 "configure" ++#line 14590 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14509,7 +14685,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 14512 "configure" ++#line 14688 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15336,11 +15512,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15339: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15515: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15343: \$? = $ac_status" >&5 ++ echo "$as_me:15519: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -15396,11 +15572,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15399: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15575: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15403: \$? = $ac_status" >&5 ++ echo "$as_me:15579: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17430,11 +17606,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17433: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17609: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17437: \$? = $ac_status" >&5 ++ echo "$as_me:17613: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -17663,11 +17839,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17666: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17842: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17670: \$? = $ac_status" >&5 ++ echo "$as_me:17846: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -17723,11 +17899,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17726: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17902: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17730: \$? = $ac_status" >&5 ++ echo "$as_me:17906: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -19907,7 +20083,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 19910 "configure" ++#line 20086 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -20005,7 +20181,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 20008 "configure" ++#line 20184 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -26291,96 +26467,6 @@ _ACEOF + + + +-if test "$ac_test_CFLAGS" != set; then +- if test "$GCC" = yes; then +- ac_safe=_std_gnu99 +-echo "$as_me:$LINENO: checking whether ${CC} accepts -std=gnu99" >&5 +-echo $ECHO_N "checking whether ${CC} accepts -std=gnu99... $ECHO_C" >&6 +-if eval "test \"\${r_cv_prog_cc_flag_${ac_safe}+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-r_save_CFLAGS="${CFLAGS}" +-CFLAGS="${CFLAGS} -std=gnu99" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "r_cv_prog_cc_flag_${ac_safe}=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-eval "r_cv_prog_cc_flag_${ac_safe}=no" +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-CFLAGS="${r_save_CFLAGS}" +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-fi +- +-if eval "test \"`echo '$r_cv_prog_cc_flag_'$ac_safe`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- separator="" +-test -z "${separator}" && separator=" " +-if test -z "${CFLAGS}"; then +- CFLAGS="-std=gnu99" +-else +- CFLAGS="${CFLAGS}${separator}-std=gnu99" +-fi +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +-fi +- + + echo "$as_me:$LINENO: checking whether we can compute C Make dependencies" >&5 + echo $ECHO_N "checking whether we can compute C Make dependencies... $ECHO_C" >&6 +@@ -26535,7 +26621,7 @@ _ACEOF + # flags. + ac_save_FFLAGS=$FFLAGS + FFLAGS="$FFLAGS $ac_verb" +-(eval echo $as_me:26538: \"$ac_link\") >&5 ++(eval echo $as_me:26624: \"$ac_link\") >&5 + ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$ac_f77_v_output" >&5 + FFLAGS=$ac_save_FFLAGS +@@ -26613,7 +26699,7 @@ _ACEOF + # flags. + ac_save_FFLAGS=$FFLAGS + FFLAGS="$FFLAGS $ac_cv_prog_f77_v" +-(eval echo $as_me:26616: \"$ac_link\") >&5 ++(eval echo $as_me:26702: \"$ac_link\") >&5 + ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$ac_f77_v_output" >&5 + FFLAGS=$ac_save_FFLAGS +@@ -26859,7 +26945,7 @@ _ACEOF + # flags. + r_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $r_verb" +-(eval echo $as_me:26862: \"$ac_link\") >&5 ++(eval echo $as_me:26948: \"$ac_link\") >&5 + r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$r_c_v_output" >&5 + CFLAGS=$r_save_CFLAGS +@@ -26941,7 +27027,7 @@ _ACEOF + # flags. + r_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $r_cv_prog_c_v" +-(eval echo $as_me:26944: \"$ac_link\") >&5 ++(eval echo $as_me:27030: \"$ac_link\") >&5 + r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$r_c_v_output" >&5 + CFLAGS=$r_save_CFLAGS +@@ -29188,7 +29274,7 @@ fi + linux*) + case "${CC}" in + ## Intel compiler +- *icc) ++ *icc*) + ## icc declares __GNUC__, so it picks up CFLAGS intended for gcc. + if test "$ac_test_CFLAGS" != set; then + if test $ac_cv_prog_cc_g = yes; then +@@ -29922,12 +30008,12 @@ echo "$as_me: WARNING: Use of flat names + ;; + linux*) # GNU Linux/ELF + case "${CC}" in +- ## Intel compiler +- *icc) ++ ## Intel compiler: note that -c99 may have been appended ++ *icc*) + cpicflags="-fpic" + ;; + ## Portland Group +- *pgcc) ++ *pgcc*) + cpicflags="-fpic" + ;; + esac +@@ -37985,7 +38071,7 @@ ac_x_header_dirs=' + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -37993,7 +38079,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <X11/Intrinsic.h> ++#include <X11/Xlib.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -38020,7 +38106,7 @@ else + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -38041,7 +38127,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <X11/Intrinsic.h> ++#include <X11/Xlib.h> + #ifdef F77_DUMMY_MAIN + + # ifdef __cplusplus +@@ -38053,7 +38139,7 @@ cat >>conftest.$ac_ext <<_ACEOF + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -43510,6 +43596,7 @@ echo "${ECHO_T}in ${JAVA_HOME}" >&6 + case "${host_os}" in + darwin*) + JAVA_LIBS="-framework JavaVM" ++ JAVA_LIBS0="-framework JavaVM" + JAVA_LD_LIBRARY_PATH= + ;; + *) +@@ -43659,7 +43746,7 @@ fi + + + # Provide some information about the compiler. +-echo "$as_me:43662:" \ ++echo "$as_me:43748:" \ + "checking for Fortran compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 +diff -urp R-2.4.0.old/configure.ac R-2.4.0/configure.ac +--- R-2.4.0.old/configure.ac 2006-09-22 21:05:11.000000000 -0500 ++++ R-2.4.0/configure.ac 2006-10-28 14:36:13.000000000 -0500 +@@ -534,6 +534,8 @@ R_PROG_BROWSER + R_PROG_PDFVIEWER + + AC_PROG_CC ++## next is a macro borrowed from autoconf 2.60 ++AC_PROG_CC_C99 + + AC_PROG_GCC_TRADITIONAL + AC_PROG_CPP +@@ -752,12 +754,6 @@ AC_CHECK_SIZEOF(long, 4) + AC_CHECK_SIZEOF(long long, 0) + AC_CHECK_SIZEOF(long double, 0) + +-if test "$ac_test_CFLAGS" != set; then +- if test "$GCC" = yes; then +- R_PROG_CC_FLAG([-std=gnu99], R_SH_VAR_ADD(CFLAGS, [-std=gnu99])) +- fi +-fi +- + R_PROG_CC_MAKEFRAG + R_PROG_CC_LO_MAKEFRAG + +@@ -890,7 +886,7 @@ case "${host_os}" in + linux*) + case "${CC}" in + ## Intel compiler +- *icc) ++ *icc*) + ## icc declares __GNUC__, so it picks up CFLAGS intended for gcc. + if test "$ac_test_CFLAGS" != set; then + if test $ac_cv_prog_cc_g = yes; then +@@ -1289,12 +1285,12 @@ rm -f libconftest${DYLIB_EXT} conftest.c + ;; + linux*) # GNU Linux/ELF + case "${CC}" in +- ## Intel compiler +- *icc) ++ ## Intel compiler: note that -c99 may have been appended ++ *icc*) + cpicflags="-fpic" + ;; + ## Portland Group +- *pgcc) ++ *pgcc*) + cpicflags="-fpic" + ;; + esac +diff -urp R-2.4.0.old/doc/CRAN_mirrors.csv R-2.4.0/doc/CRAN_mirrors.csv +--- R-2.4.0.old/doc/CRAN_mirrors.csv 2006-09-16 21:05:15.000000000 -0500 ++++ R-2.4.0/doc/CRAN_mirrors.csv 2006-10-28 14:36:02.000000000 -0500 +@@ -32,7 +32,7 @@ Israel,Israel,Tel-Aviv,http://cran.activ + "Japan (Aizu)",Japan,Aizu,ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN,"University of Aizu", + "Japan (Tokyo)",Japan,Tokyo,ftp://ftp.ecc.u-tokyo.ac.jp/CRAN/,"University of Tokyo","Teru KAMOGASHIRA <teru(a)sodan.ecc.u-tokyo.ac.jp>" + "Japan (Tsukuba)",Japan,Tsukuba,http://cran.md.tsukuba.ac.jp/,"University of Tsukuba", +-Korea,Korea,Seoul,http://bibscvs.snu.ac.kr/R/,"Seoul National University","SungGON Yi <skon(a)kr.FreeBSD.org>" ++Korea,Korea,Seoul,http://bibs.snu.ac.kr/R/,"Seoul National University","SungGON Yi <skonmeme(a)gmail.com>" + Netherlands,Netherlands,Amsterdam,http://cran.nedmirror.nl/,"Nedmirror, Amsterdam",mirror(a)nedmirror.nl + Norway,Norway,Bergen,http://cran.ii.uib.no/,"University of Bergen",webmaster(a)ii.uib.no + "Poland (Lublin)",Poland,Lublin,http://novum.am.lublin.pl/CRAN/,"Skubiszewski Medical University, Lublin","Lukasz Komsta <luke(a)novum.am.lublin.pl>" +diff -urp R-2.4.0.old/doc/FAQ R-2.4.0/doc/FAQ +--- R-2.4.0.old/doc/FAQ 2006-10-03 05:02:46.000000000 -0500 ++++ R-2.4.0/doc/FAQ 2006-11-02 10:45:59.000000000 -0600 +@@ -1,6 +1,6 @@ + R FAQ + Frequently Asked Questions on R +-Version 2.4.2006-10-02 ++Version 2.4.2006-10-31 + ISBN 3-900051-08-9 + Kurt Hornik + +@@ -95,6 +95,7 @@ R FAQ + 7.34 How can I save the result of each iteration in a loop into a separate file? + 7.35 Why are p-values not displayed when using lmer()? + 7.36 Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader? ++ 7.37 Why does backslash behave strangely inside strings? + 8 R Programming + 8.1 How should I write summary methods? + 8.2 How can I debug dynamically loaded code? +@@ -388,20 +389,21 @@ port of R for Macintosh is no longer sup + + The `bin/linux' directory of a CRAN site contains the following packages. + +- CPU Versions Provider +- ------------------------------------------------------------------- +- Debian et al. i386 stable/oldstable Christian Steigies +- Mandrake i386 10.0 Michele Alzetta +- Red Hat i386 FC3/FC4/FC5 Martyn Plummer +- x86_64 FC3 Brian Ripley +- x86_64 FC4/FC5 Martyn Plummer +- i386 Enterprise Linux Matthew P. Cox +- x86_64 Enterprise Linux Matthew P. Cox +- SuSE i386 7.3/8.0/8.1/8.2 Detlef Steuer +- i586 9.0/9.1/9.2/9.3/10.0/10.1Detlef Steuer +- x86_64 9.2/9.3/10.0/10.1 Detlef Steuer +- Ubuntu i386 dapper Dirk Eddelbuettel +- VineLinux i386 3.2 Susunu Tanimura ++ CPU Versions Provider ++ ------------------------------------------------------------------------ ++ Debian et al. i386 stable/oldstable Christian Steigies ++ Mandrake i386 10.0 Michele Alzetta ++ Red Hat i386 FC3/FC4/FC5/FC6 Martyn Plummer ++ x86_64 FC3 Brian Ripley ++ x86_64 FC4/FC5 Martyn Plummer ++ i386 Enterprise Linux Matthew P. Cox ++ x86_64 Enterprise Linux Matthew P. Cox ++ SuSE i386 7.3/8.0/8.1/8.2 Detlef Steuer ++ i586 9.0/9.1/9.2/9.3/10.0/10.1 Detlef Steuer ++ x86_64 9.2/9.3/10.0/10.1 Detlef Steuer ++ Ubuntu i386 dapper Christian Steigies ++ amd64 dapper Christian Steigies ++ VineLinux i386 3.2 Susunu Tanimura + + Debian packages, maintained by Dirk Eddelbuettel and Doug Bates, have + long been part of the Debian distribution, and can be accessed through APT, +@@ -1211,8 +1213,8 @@ Computational and Graphical Statistics_, + + For a very long time, there was no such thing. + +- XL Solutions (http://www.xlsolutions-corp.com/) is currently beta +-testing a commercially supported version of R named R+ (read R plus). ++ XLSolutions Corporation (http://www.xlsolutions-corp.com/) is currently ++beta testing a commercially supported version of R named R+ (read R plus). + + In addition, REvolution Computing (http://www.revolution-computing.com/) + has released RPro (http://www.revolution-computing.com/rpro.html), an +@@ -1462,6 +1464,9 @@ distributions of R.) + *CompetingRiskFrailty* + Competing risk model with frailties for right censored survival data. + ++*CreditMetrics* ++ Functions for calculating the CreditMetrics risk model. ++ + *DAAG* + Various data sets used in examples and exercises in "Data Analysis and + Graphics Using R" by John H. Maindonald and W. John Brown, 2003. +@@ -1605,6 +1610,9 @@ distributions of R.) + MCMC inference from individual genetic data based on a spatial + statistical model. + ++*GeoXP* ++ Interactive exploratory spatial data analysis. ++ + *GroupSeq* + Computations related to group-seqential boundaries. + +@@ -1651,6 +1659,10 @@ distributions of R.) + Utilities from the Institute of Data Analyses and Process Design, + IDP/ZHW. + ++*IPSUR* ++ Accompanies "Introduction to Probability and Statistics Using R" by G. ++ Andy Chang and G. Jay Kerns(in progress). ++ + *ISwR* + Data sets for "Introductory Statistics with R" by Peter Dalgaard, + 2002, Springer. +@@ -1987,10 +1999,6 @@ distributions of R.) + Transforms with an Implementation in S" by Rene Carmona, Wen L. Hwang + and Bruno Torresani, 1998, Academic Press. + +-*SAGx* +- Retrieval, preparation and analysis of data from the Affymetrix +- GeneChip. +- + *SASmixed* + Data sets and sample linear mixed effects analyses corresponding to the + examples in "SAS System for Mixed Models" by R. C. Littell, G. A. +@@ -2041,6 +2049,9 @@ distributions of R.) + *SparseM* + Basic linear algebra for sparse matrices. + ++*SpherWave* ++ Spherical Wavelets and SW-based spatially adaptive methods. ++ + *StatDataML* + Read and write StatDataML. + +@@ -2086,6 +2097,9 @@ distributions of R.) + Utilities supporting VDC, an open source digital library system for + quantitative data. + ++*VGAM* ++ Vector Generalized Linear and Additive Models. ++ + *VLMC* + Functions, classes & methods for estimation, prediction, and simulation + (bootstrap) of VLMC (Variable Length Markov Chain) models. +@@ -2093,12 +2107,18 @@ distributions of R.) + *VaR* + Methods for calculation of Value at Risk (VaR). + ++*WeedMap* ++ Map of weed intensity. ++ + *WhatIf* + Software for evaluating counterfactuals. + + *XML* + Tools for reading XML documents and DTDs. + ++*ZIGP* ++ Zero Inflated Generalized Poisson (ZIGP) regression models. ++ + *Zelig* + Everyone's statistical software: an easy-to-use program that can + estimate, and help interpret the results of, an enormous range of +@@ -2140,6 +2160,9 @@ distributions of R.) + *adehabitat* + A collection of tools for the analysis of habitat selection by animals. + ++*adimpro* ++ Adaptive smoothing of digital images. ++ + *adlift* + Adaptive Wavelet transforms for signal denoising. + +@@ -2327,6 +2350,10 @@ distributions of R.) + *cfa* + Analysis of configuration frequencies. + ++*cgh* ++ Analysis of microarray comparative genome hybridisation data using the ++ Smith-Waterman algorithm. ++ + *chplot* + Augmented convex hull plots: informative and nice plots for grouped + bivariate data. +@@ -2359,6 +2386,9 @@ distributions of R.) + *classPP* + Projection Pursuit for supervised classification. + ++*classifly* ++ Explore classification models in high dimensions. ++ + *clim.pact* + Climate analysis and downscaling for monthly and daily data. + +@@ -2695,6 +2725,9 @@ distributions of R.) + *fCalendar* + The Rmetrics module for "Date, Time and Calendars". + ++*fEcofin* ++ The Rmetrics module with "Selected economic and financial data sets". ++ + *fExtremes* + The Rmetrics module for "Beyond the Sample, Dealing with Extreme + Values". +@@ -2843,6 +2876,9 @@ distributions of R.) + Functions to fit Generalized Additive Models for Location Scale and + Shape. + ++*gamlss.dist* ++ Extra distributions for GAMLSS modeling. ++ + *gamlss.nl* + A GAMLSS add on package for fitting non linear parametric models. + +@@ -3057,6 +3093,9 @@ distributions of R.) + *homals* + Homogeneity Analysis (HOMALS) package with optional Tcl/Tk interface. + ++*homtest* ++ Homogeneity tests for regional frequency analysis. ++ + *hopach* + Hierarchical Ordered Partitioning and Collapsing Hybrid (HOPACH). + +@@ -3389,9 +3428,6 @@ distributions of R.) + Routines for GAMs and other genralized ridge regression problems with + multiple smoothing parameter selection by GCV or UBRE. _Recommended_. + +-*micEcdat* +- Data sets for micro-econometrics. +- + *micEcon* + Tools for microeconomic analysis and microeconomic modelling. + +@@ -3421,6 +3457,12 @@ distributions of R.) + *mixreg* + Functions to fit mixtures of regressions. + ++*mixtools* ++ Tools for mixture models. ++ ++*mlCopulaSelection* ++ Copula selection and fitting using maximum likelihood. ++ + *mlbench* + A collection of artificial and real-world machine learning benchmark + problems, including the Boston housing data. +@@ -3462,6 +3504,9 @@ distributions of R.) + *mratios* + Inferences for ratios of coefficients in the general linear model. + ++*msgcop* ++ Semiparametric Bayesian Gaussian copula estimation. ++ + *msm* + Functions for fitting continuous-time Markov multi-state models to + categorical processes observed at arbitrary times, optionally with +@@ -3621,6 +3666,10 @@ distributions of R.) + *oz* + Functions for plotting Australia's coastline and state boundaries. + ++*pARtial* ++ (Partial) attributable risk estimates, corresponding variance estimates ++ and confidence intervals. ++ + *paleoTS* + Modeling evolution in paleontological time-series. + +@@ -3743,6 +3792,9 @@ distributions of R.) + *portfolio* + Classes for analyzing and implementing portfolios. + ++*portfolioSim* ++ Framework for simulating equity portfolio strategies. ++ + *powell* + Optimizes a function using Powell's UObyQA algorithm. + +@@ -3880,9 +3932,15 @@ distributions of R.) + C Double Description for R, an interface to the CDD computational + geometry library. + ++*rcdk* ++ Interface to the CDK libraries, a Java framework for cheminformatics. ++ + *rcom* + R COM Client Interface and internal COM Server. + ++*rcompletion* ++ TAB completion for R using Readline. ++ + *rda* + Shrunken Centroids Regularized Discriminant Analysis. + +@@ -3932,6 +3990,9 @@ distributions of R.) + *rgenoud* + R version of GENetic Optimization Using Derivatives. + ++*rggm* ++ Robustified methods for Gaussian Graphical Models. ++ + *rggobi* + Interface between R and GGobi. + +@@ -4312,6 +4373,9 @@ distributions of R.) + Computes the distribution of a linear combination of independent + Student's t variables. + ++*tdm* ++ A tool for Therapeutic Drug Monitoring. ++ + *tdthap* + Transmission/disequilibrium tests for extended marker haplotypes. + +@@ -4328,6 +4392,9 @@ distributions of R.) + *time* + Time tracking for developers. + ++*titan* ++ Titration analysis for mass spectrometry data. ++ + *titecrm* + TIme-To-Event Continual Reassessment Method and calibration tools. + +@@ -4638,6 +4705,9 @@ available via `http://www.omegahat.org/R + Interface to Snowball implementation of Porter's word stemming + algorithm. + ++*Ryacas* ++ R interface to yacas. ++ + *SASXML* + Example for reading XML files in SAS 8.2 manner. + +@@ -6266,6 +6336,53 @@ The unwanted effect can be removed by tu + use the `Edit | Preferences | Page Display | Smooth line art' menu in Adobe + Reader 7.0. + ++7.37 Why does backslash behave strangely inside strings? ++======================================================== ++ ++This question most often comes up in relation to file names (see *Note How ++do file names work in Windows?::) but it also happens that people complain ++that they cannot seem to put a single `\' character into a text string ++unless it happens to be followed by certain other characters. ++ ++ To understand this, you have to distinguish between character strings ++and _representations_ of character strings. Mostly, the representation in ++R is just the string with a single or double quote at either end, but there ++are strings that cannot be represented that way, e.g., strings that ++themselves contains the quote character. So ++ ++ > str <- "This \"text\" is quoted" ++ > str ++ [1] "This \"text\" is quoted" ++ > cat(str, "\n") ++ This "text" is quoted ++ ++The _escape sequences_ `\"' and `\n' represent a double quote and the ++newline character respectively. Printing text strings, using `print()' or ++by typing the name at the prompt will use the escape sequences too, but the ++`cat()' function will display the string as-is. Notice that `"\n"' is a ++one-character string, not two; the backslash is not actually in the string, ++it is just generated in the printed representation. ++ ++ > nchar("\n") ++ [1] 1 ++ > substring("\n", 1, 1) ++ [1] "\n" ++ ++ So how do you put a backslash in a string? For this, you have to escape ++the escape character. I.e., you have to double the backslash. as in ++ ++ > cat("\\n", "\n") ++ \n ++ ++ Some functions, particularly those involving regular expression ++matching, themselves use metacharacters, which may need to be escaped by ++the backslash mechanism. In those cases you may need a _quadruple_ ++backslash to represent a single literal one. ++ ++ In current versions of R (up to 2.4.0) an unknown escape sequence like ++`\p' is quietly interpreted as just `p'. The development version now emits ++a warning. ++ + 8 R Programming + *************** + +diff -urp R-2.4.0.old/doc/html/R-admin.html R-2.4.0/doc/html/R-admin.html +--- R-2.4.0.old/doc/html/R-admin.html 2006-10-03 05:14:24.000000000 -0500 ++++ R-2.4.0/doc/html/R-admin.html 2006-11-03 20:01:31.000000000 -0600 +@@ -27,7 +27,7 @@ + + This is a guide to installation and administration for R. + +- The current version of this document is 2.4.0 (2006-10-03). ++ The current version of this document is 2.4.0 (2006-11-03). + + ISBN 3-900051-09-7 + +@@ -101,13 +101,16 @@ Subversion repository. If you have a Su + <a href="http://subversion.tigris.org/"><code>subversion.tigris.org</code></a>), you + can check out and update the current r-devel from + <a href="https://svn.r-project.org/R/trunk/">https://svn.r-project.org/R/trunk/</a> and the current r-patched from +-`<samp>https://svn.r-project.org/R/branches/R-<var>x</var>-<var>y</var>-patches/</samp>' ++`<samp>https://svn.r-project.org/R/branches/R-<var>x</var>-<var>y</var>-branch/</samp>' + (where <var>x</var> and <var>y</var> are the major and minor number of the current + released version of R). E.g., use + + <pre class="example"> svn checkout https://svn.r-project.org/R/trunk/ <var>path</var> + </pre> +- to check out r-devel into directory <var>path</var>. ++ to check out `<samp>r-devel</samp>' into directory <var>path</var>. The alpha, beta ++and RC versions of an upcoming <var>x.y.0</var> release are available from ++`<samp>https://svn.r-project.org/R/branches/R-<var>x</var>-<var>y</var>-branch/</samp>' in ++the four-week period prior to the release. + + Note that `<samp>https:</samp>' is required, and that the SSL certificate for + the Subversion server of the R project is +@@ -510,7 +513,7 @@ Windows 64). + Your file system must allow long file names (as is likely except + perhaps for some network-mounted systems). + +- Installation is via the installer <samp>R-2.4.0.exe</samp>. ++ Installation is via the installer <samp>R-2.4.0pat.exe</samp>. + Just double-click on the icon and follow the instructions. You can + uninstall R from the Control Panel. (Note that you will probably + (depending on the Windows language settings) be asked to choose a +@@ -775,12 +778,12 @@ customizations to that installation. Th + </pre> + where <samp>rootdir</samp> is the path to the root of the customized + installation (forward slashes and no spaces, please). This creates an +-executable with the standard name, <samp>R-2.4.0.exe</samp>, so ++executable with the standard name, <samp>R-2.4.0pat.exe</samp>, so + please rename it to indicate that it is customized. + + The defaults for the startup parameters may also be customized. For example + +-<pre class="example"> make rinstaller MDISDI=1 ++<pre class="example"> make myR IMAGEDIR=rootdir MDISDI=1 + </pre> + will create an installer that defaults to installing R to run in SDI + mode. See <samp>src/gnuwin32/installer/Makefile</samp> for the names and +@@ -1128,7 +1131,7 @@ originals. + <li><code>zipdata-foo</code> to compress the data files. This is recommended if + you have either many small data files (as in package Devore5) or a + few large data files. +-<li><code>pkgcheck-foo</code> to check the package (like <code>R CMD CHECK foo</code>). ++<li><code>pkgcheck-foo</code> to check the package (like <code>R CMD check foo</code>). + </ul> + + Using this approach allows variables to be set during the build, e.g. +@@ -1501,10 +1504,11 @@ installed. + You need a means of compiling C and FORTRAN 77 (see <a href="#Using-FORTRAN">Using FORTRAN</a>). Some add-on packages also need a C++ compiler. Your C + compiler should be <acronym>IEC</acronym> 60059<a rel="footnote" href="#fn-6" name="fnd-6">6</a>, POSIX 1003.1 and C99-compliant if at all + possible. R tries to choose suitable flags for the C compilers it +-knows about, but you may have to set <code>CFLAGS</code> suitably. For recent +-versions of <samp>gcc</samp> with <code>glibc</code> this means including +-<samp>-std=gnu99</samp> in <code>CFLAGS</code> (<samp>-std=c99</samp> excludes POSIX +-functionality). ++knows about, but you may have to set <code>CC</code> or <code>CFLAGS</code> suitably. ++For recent versions of <samp>gcc</samp> with <code>glibc</code> this means including ++<samp>-std=gnu99</samp> (<samp>-std=c99</samp> excludes POSIX functionality). ++If the compiler is detected as <samp>gcc</samp>, <code>-std=gnu99</code> will be ++appended to <code>CC</code> unless it conflicts with a setting of <code>CFLAGS</code>. + + Unless you do not want to view graphs on-screen you need `<samp>X11</samp>' + installed, including its headers and client libraries. (On Fedora Core +@@ -2078,8 +2082,8 @@ On most platforms using <samp>CFLAGS</code> and <code>FFLAGS</code> produces worthwhile performance gains. + On systems using the GNU linker (especially those using R as a shared + library), it is likely that including `<samp>-Wl,-O1</samp>' in <code>LDFLAGS</code> +-is worthwhile, and on upcoming systems<a rel="footnote" href="#fn-15" name="fnd-15">15</a> +-`<samp>'-Wl,-O1,-Bdirect,--hash-style=both'</samp>' is recommended at ++is worthwhile, and on recent systems<a rel="footnote" href="#fn-15" name="fnd-15">15</a> ++`<samp>'-Bdirect,--hash-style=both,-Wl,-O1'</samp>' is recommended at + <a href="http://lwn.net/Articles/192624/">http://lwn.net/Articles/192624/</a> + + <a name="Making-manuals"></a> +@@ -2392,10 +2396,11 @@ libraries. + libraries in <samp>/usr/local/lib64</samp>. To build a 32-bit version of R + on `<samp>x86_64</samp>' with Fedora Core 5 we used + +-<pre class="example"> CFLAGS="-m32 -O2 -g -Wall -pedantic -std=gnu99" ++<pre class="example"> CC="gcc -m32" + CXXFLAGS="-m32 -O2 -g" + FFLAGS="-m32 -O2 -g" +- LDFLAGS="-m32 -L/usr/local/lib" ++ FCFLAGS="-m32 -O2 -g" ++ LDFLAGS="-L/usr/local/lib" + LIBnn=lib + </pre> + Fedora Core 3 also needed +@@ -2452,9 +2457,10 @@ optimization. For `<samp><span class="s + CXX=icc + ICC_LIBS=/opt/compilers/intel/cce/9.0/lib + IFC_LIBS=/opt/compilers/intel/fce/9.0/lib +- LDFLAGS="-L$ICC_LIBS -L$IFC_LIBS -L/usr/local/lib" ++ LDFLAGS="-L$ICC_LIBS -L$IFC_LIBS -L/usr/local/lib64" + </pre> +- R will add `<samp>-mp</samp>' in <code>R_XTRA_{C,F,CXX}FLAGS</code> to maintain ++ <samp>configure</samp> will add `<samp>-c99</samp>' to <code>CC</code> for C99-compliance. ++R will add `<samp>-mp</samp>' in <code>R_XTRA_{C,F,CXX}FLAGS</code> to maintain + correct <acronym>IEC</acronym> 60559 arithmetic. The flag <samp>-wd188</samp> + suppresses a large number of warnings about the enumeration type + `<samp>Rboolean</samp>'. Because the Intel C compiler sets `<samp>__GNUC__</samp>' +@@ -2564,7 +2570,7 @@ yourself. + this disables <acronym>IEEE</acronym> arithmetic and <samp>make check</samp> will + fail. The maximal set of optimization options known to work on Sparc is + +-<pre class="example"> -xlibmil -xO5 -dalign -xc99 ++<pre class="example"> -xlibmil -xO5 -dalign + </pre> + (`<samp>x86</samp>' versions do not need `<samp>-dalign</samp>', and some do not + support it.) +@@ -2578,10 +2584,10 @@ the compiler correctly. + + To compile for a 64-bit target on Sparc Solaris (which needs an + UltraSparc chip and for support to be enabled in the OS) with the Forte +-7 compilers we used <samp>--without-blas</samp> and ++7 compilers we used + +-<pre class="example"> CC="cc -xarch=v9" +- CFLAGS="-xO5 -xlibmil -dalign -xc99" ++<pre class="example"> CC="cc -xarch=v9 -xc99" ++ CFLAGS="-xO5 -xlibmil -dalign" + F77="f95 -xarch=v9" + FFLAGS="-xO5 -xlibmil -dalign" + CXX="CC -xarch=v9" +@@ -2599,9 +2605,10 @@ UltraSparc chip and for support to be en + FC="gfortran -m64" + LDFLAGS="-L/usr/local/lib/sparcv9 -L/usr/local/lib" + </pre> +- replacing `<samp>g77</samp>' with `<samp>gfortran</samp>' for <samp>gcc</samp> 4.0.x. Note ++ replacing `<samp>g77</samp>' with `<samp>gfortran</samp>' for <samp>gcc</samp> 4.x.y. Note + that <samp>/usr/local/lib/sparcv9</samp> may need to be in the +-<samp>LD_LIBRARY_PATH</samp> during configuration. ++<samp>LD_LIBRARY_PATH</samp> during configuration. (<samp>configure</samp> will ++append <code>-std=gnu99</code> to <code>CC</code>.) + + Solaris on Sparc CPUs need `<samp>PIC</samp>' and not `<samp>pic</samp>' versions of + <samp>CPICFLAGS</samp> and <samp>FPICFLAGS</samp> since the `<samp>pic</samp>' version only +@@ -3080,7 +3087,7 @@ but no compiled code, only the first two + + A complete build of R including compiled <acronym>HTML</acronym> help files and + PDF manuals, and producing the standalone installer +-<samp>R-2.4.0.exe</samp> will also need the following: ++<samp>R-2.4.0pat.exe</samp> will also need the following: + <ul> + <li>The Microsoft <acronym>HTML</acronym> Help Workshop + <li>LaTeX +@@ -3208,8 +3215,8 @@ suitably; ensure you have the required f + + <h3 class="section">E.6 The Inno Setup installer</h3> + +-To make the installer package (<samp>R-2.4.0.exe</samp>) we require +-Inno Setup 5.1.5 or later from <a href="http://jrsoftware.org"><code>jrsoftware.org</code></a>. ++To make the installer package (<samp>R-2.4.0pat.exe</samp>) we require ++Inno Setup 5.1.7 or later from <a href="http://jrsoftware.org"><code>jrsoftware.org</code></a>. + + Edit file <samp>src/gnuwin32/MkRules</samp> and change <code>ISDIR</code> to the + location where Inno Setup was installed. +diff -urp R-2.4.0.old/doc/manual/Makefile.in R-2.4.0/doc/manual/Makefile.in +--- R-2.4.0.old/doc/manual/Makefile.in 2006-09-04 21:05:05.000000000 -0500 ++++ R-2.4.0/doc/manual/Makefile.in 2006-10-28 14:36:02.000000000 -0500 +@@ -211,6 +211,7 @@ $(OBJECTS_DVI): $(srcdir)/texinfo.tex + R-admin.dvi: $(texiincludes) + R-data.dvi: $(texiincludes) + R-exts.dvi: $(texiincludes) ++R-ints.dvi: $(texiincludes) + version.texi: Makefile $(top_srcdir)/VERSION $(top_builddir)/SVN-REVISION + @echo "creating $(subdir)/$@" + @(v=`sed 's/$[^ ]*$.*/\1/' $(top_srcdir)/VERSION`; \ +@@ -238,6 +239,7 @@ R-admin.html: $(texiincludes) + R-data.html: $(texiincludes) + R-exts.html: $(texiincludes) + R-intro.html: $(texiincludes) ++R-ints.html: $(texiincludes) + R-lang.html: $(texiincludes) + + info: $(OBJECTS_INFO) +@@ -245,6 +247,7 @@ R-admin.info: $(texiincludes) + R-data.info: $(texiincludes) + R-exts.info: $(texiincludes) + R-intro.info: $(texiincludes) ++R-ints.info: $(texiincludes) + R-lang.info: $(texiincludes) + + pdf: refman.pdf $(OBJECTS_PDF) +@@ -325,6 +328,7 @@ R-admin.pdf: $(texiincludes) + R-data.pdf: $(texiincludes) + R-exts.pdf: $(texiincludes) + R-intro.pdf: stamp-images-pdf $(texiincludes) ++R-ints.pdf: $(texiincludes) + stamp-images-pdf: + @if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \ + $(MAKE) rdocdir=$(top_builddir)/doc install-images-pdf; \ +diff -urp R-2.4.0.old/doc/manual/R-admin.texi R-2.4.0/doc/manual/R-admin.texi +--- R-2.4.0.old/doc/manual/R-admin.texi 2006-09-27 21:05:07.000000000 -0500 ++++ R-2.4.0/doc/manual/R-admin.texi 2006-11-01 19:41:42.000000000 -0600 +@@ -166,7 +166,7 @@ Subversion repository. If you have a Su + @url{http://subversion.tigris.org/, @code{subversion.tigris.org}}), you + can check out and update the current r-devel from + @url{https://svn.r-project.org/R/trunk/} and the current r-patched from +-@samp{https://svn.r-project.org/R/branches/R-@var{x}-@var{y}-patches/} ++@samp{https://svn.r-project.org/R/branches/R-@var{x}-@var{y}-branch/} + (where @var{x} and @var{y} are the major and minor number of the current + released version of R). E.g., use + +@@ -175,7 +175,10 @@ svn checkout https://svn.r-project.org/R + @end example + + @noindent +-to check out r-devel into directory @var{path}. ++to check out @samp{r-devel} into directory @var{path}. The alpha, beta ++and RC versions of an upcoming @var{x.y.0} release are available from ++@samp{https://svn.r-project.org/R/branches/R-@var{x}-@var{y}-branch/} in ++the four-week period prior to the release. + + Note that @samp{https:} is required, and that the SSL certificate for + the Subversion server of the R project is +@@ -1005,7 +1008,7 @@ please rename it to indicate that it is + The defaults for the startup parameters may also be customized. For example + + @example +-make rinstaller MDISDI=1 ++make myR IMAGEDIR=rootdir MDISDI=1 + @end example + + @noindent +@@ -1410,7 +1413,7 @@ originals. + you have either many small data files (as in package @pkg{Devore5}) or a + few large data files. + @item +-@code{pkgcheck-foo} to check the package (like @code{R CMD CHECK foo}). ++@code{pkgcheck-foo} to check the package (like @code{R CMD check foo}). + @end itemize + + Using this approach allows variables to be set during the build, e.g. +@@ -1840,10 +1843,11 @@ FORTRAN}). Some add-on packages also ne + compiler should be @acronym{IEC}@tie{}60059@footnote{also known as + @acronym{IEEE}@tie{}754}, POSIX 1003.1 and C99-compliant if at all + possible. @R{} tries to choose suitable flags for the C compilers it +-knows about, but you may have to set @code{CFLAGS} suitably. For recent +-versions of @command{gcc} with @code{glibc} this means including +-@option{-std=gnu99} in @code{CFLAGS} (@option{-std=c99} excludes POSIX +-functionality). ++knows about, but you may have to set @code{CC} or @code{CFLAGS} suitably. ++For recent versions of @command{gcc} with @code{glibc} this means including ++@option{-std=gnu99} (@option{-std=c99} excludes POSIX functionality). ++If the compiler is detected as @command{gcc}, @code{-std=gnu99} will be ++appended to @code{CC} unless it conflicts with a setting of @code{CFLAGS}. + + Unless you do not want to view graphs on-screen you need @samp{X11} + installed, including its headers and client libraries. (On Fedora Core +@@ -2521,8 +2525,8 @@ On most platforms using @command{gcc}, h + @code{CFLAGS} and @code{FFLAGS} produces worthwhile performance gains. + On systems using the GNU linker (especially those using @R{} as a shared + library), it is likely that including @samp{-Wl,-O1} in @code{LDFLAGS} +-is worthwhile, and on upcoming systems(a)footnote{e.g. Fedora Core 6} +-@samp{'-Wl,-O1,-Bdirect,--hash-style=both'} is recommended at ++is worthwhile, and on recent systems(a)footnote{e.g. Fedora Core 6} ++@samp{'-Bdirect,--hash-style=both,-Wl,-O1'} is recommended at + @url{http://lwn.net/Articles/192624/} + + @node Making manuals, , Compilation flags, Configuration variables +@@ -2888,10 +2892,11 @@ libraries in @file{/usr/local/lib64}. T + on @cputype{x86_64} with Fedora Core 5 we used + + @example +-CFLAGS="-m32 -O2 -g -Wall -pedantic -std=gnu99" ++CC="gcc -m32" + CXXFLAGS="-m32 -O2 -g" + FFLAGS="-m32 -O2 -g" +-LDFLAGS="-m32 -L/usr/local/lib" ++FCFLAGS="-m32 -O2 -g" ++LDFLAGS="-L/usr/local/lib" + LIBnn=lib + @end example + +@@ -2957,10 +2962,11 @@ F77=ifort + CXX=icc + ICC_LIBS=/opt/compilers/intel/cce/9.0/lib + IFC_LIBS=/opt/compilers/intel/fce/9.0/lib +-LDFLAGS="-L$ICC_LIBS -L$IFC_LIBS -L/usr/local/lib" ++LDFLAGS="-L$ICC_LIBS -L$IFC_LIBS -L/usr/local/lib64" + @end example + + @noindent ++@command{configure} will add @samp{-c99} to @code{CC} for C99-compliance. + @R{} will add @samp{-mp} in @code{R_XTRA_@{C,F,CXX@}FLAGS} to maintain + correct @acronym{IEC}@tie{}60559 arithmetic. The flag @option{-wd188} + suppresses a large number of warnings about the enumeration type +@@ -3086,7 +3092,7 @@ this disables @acronym{IEEE} arithmetic + fail. The maximal set of optimization options known to work on Sparc is + + @example +--xlibmil -xO5 -dalign -xc99 ++-xlibmil -xO5 -dalign + @end example + + @noindent +@@ -3102,11 +3108,11 @@ the compiler correctly. + + To compile for a 64-bit target on Sparc Solaris (which needs an + UltraSparc chip and for support to be enabled in the OS) with the Forte +-7 compilers we used @option{--without-blas} and ++7 compilers we used + + @example +-CC="cc -xarch=v9" +-CFLAGS="-xO5 -xlibmil -dalign -xc99" ++CC="cc -xarch=v9 -xc99" ++CFLAGS="-xO5 -xlibmil -dalign" + F77="f95 -xarch=v9" + FFLAGS="-xO5 -xlibmil -dalign" + CXX="CC -xarch=v9" +@@ -3130,9 +3136,10 @@ LDFLAGS="-L/usr/local/lib/sparcv9 -L/usr + @end example + + @noindent +-replacing @samp{g77} with @samp{gfortran} for @command{gcc} 4.0.x. Note ++replacing @samp{g77} with @samp{gfortran} for @command{gcc} 4.x.y. Note + that @file{/usr/local/lib/sparcv9} may need to be in the +-@env{LD_LIBRARY_PATH} during configuration. ++@env{LD_LIBRARY_PATH} during configuration. (@command{configure} will ++append @code{-std=gnu99} to @code{CC}.) + + Solaris on Sparc CPUs need @samp{PIC} and not @samp{pic} versions of + @env{CPICFLAGS} and @env{FPICFLAGS} since the @samp{pic} version only +@@ -3814,7 +3821,7 @@ suitably; ensure you have the required f + @section The Inno Setup installer + + To make the installer package (@file{@value{RWVERSION}.exe}) we require +-Inno Setup 5.1.5 or later from @url{http://jrsoftware.org, ++Inno Setup 5.1.7 or later from @url{http://jrsoftware.org, + @code{jrsoftware.org}}. + + Edit file @file{src/gnuwin32/MkRules} and change @code{ISDIR} to the +diff -urp R-2.4.0.old/doc/manual/R-exts.texi R-2.4.0/doc/manual/R-exts.texi +--- R-2.4.0.old/doc/manual/R-exts.texi 2006-09-18 21:05:16.000000000 -0500 ++++ R-2.4.0/doc/manual/R-exts.texi 2006-10-30 10:45:48.000000000 -0600 +@@ -8119,7 +8119,7 @@ this is defined. + @node Internationalization, Allowing interrupts, Utility functions, The R API + @section Internationalization + +-@R{} has its own C-level interface to the the encoding conversion ++@R{} has its own C-level interface to the encoding conversion + capabilities provided by @code{iconv}, for the following reasons + + @itemize @bullet +diff -urp R-2.4.0.old/doc/manual/R-FAQ.texi R-2.4.0/doc/manual/R-FAQ.texi +--- R-2.4.0.old/doc/manual/R-FAQ.texi 2006-10-03 05:00:11.000000000 -0500 ++++ R-2.4.0/doc/manual/R-FAQ.texi 2006-11-02 10:45:47.000000000 -0600 +@@ -4,7 +4,7 @@ + @settitle R FAQ + @setchapternewpage on + @set FAQ_YEAR 2006 +-@set FAQ_DATE @value{FAQ_YEAR}-10-02 ++@set FAQ_DATE @value{FAQ_YEAR}-10-31 + @set REL_YEAR 2006 + @set REL_MAJOR 2 + @set REL_MINOR 4 +@@ -500,24 +500,25 @@ to Mac OS 9.2.2. This port of R for Mac + @node Are there Unix binaries for R?, What documentation exists for R?, How can R be installed?, R Basics + @section Are there Unix binaries for R? + +-@c Linux binaries as of 2006-09-13: ++@c Linux binaries as of 2006-10-31: + @c + @c debian +-@c stable i386 2.3.1 Christian T. Steigies <cts(a)debian.org> ++@c stable i386 2.4.0 Christian T. Steigies <cts(a)debian.org> + @c oldstable + @c i386 2.1.1 Christian T. Steigies <cts(a)debian.org> + @c mandrake + @c 10.0 i386 2.0.0 Michele Alzetta <mikalzet(a)libero.it> + @c redhat + @c el3 i386 2.3.1 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> +-@c el4 i386 2.3.1 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> +-@c x86_64 2.3.1 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> +-@c fc3 i386 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> +-@c x86_64 2.3.1 Brian Ripley +-@c fc4 i386 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> +-@c x86_64 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> +-@c fc5 i386 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> +-@c x86_64 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c el4 i386 2.4.0 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> ++@c x86_64 2.4.0 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> ++@c fc3 i386 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c x86_64 2.4.0 Brian Ripley ++@c fc4 i386 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c x86_64 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c fc5 i386 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c x86_64 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c fc6 i386 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> + @c suse + @c 7.3 i386 1.8.0 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> + @c 8.0 i386 1.8.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> +@@ -531,10 +532,11 @@ to Mac OS 9.2.2. This port of R for Mac + @c x86_64 2.2.0 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> + @c 10.0 i586 2.3.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> + @c x86_64 2.3.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> +-@c 10.1 i586 2.3.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> +-@c x86_64 2.3.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> ++@c 10.1 i586 2.4.0 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> ++@c x86_64 2.4.0 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> + @c ubuntu +-@c dapper i386 2.3.1 Dirk Eddelbuettel <edd(a)debian.org> ++@c dapper i386 2.4.0 Christian T. Steigies <cts(a)debian.org> ++@c amd64 2.4.0 Christian T. Steigies <cts(a)debian.org> + @c vinelinux + @c 3.2 i386 2.3.1 Susunu Tanimura <stanimura-ngs(a)umin.ac.jp> + +@@ -542,11 +544,11 @@ The @file{bin/linux} directory of a @CRA + packages. + + @quotation +-@multitable {Debian et al.} {x86_64} {9.0/9.1/9.2/9.3/10.0} {James Henstridge} ++@multitable {Debian et al.} {x86_64} {9.0/9.1/9.2/9.3/10.0/10.1} {James Henstridge} + @headitem @tab CPU @tab Versions @tab Provider + @item Debian et al. @tab i386 @tab stable/oldstable @tab Christian Steigies + @item Mandrake @tab i386 @tab 10.0 @tab Michele Alzetta +-@item Red Hat @tab i386 @tab FC3/FC4/FC5 @tab Martyn Plummer ++@item Red Hat @tab i386 @tab FC3/FC4/FC5/FC6 @tab Martyn Plummer + @item @tab x86_64 @tab FC3 @tab Brian Ripley + @item @tab x86_64 @tab FC4/FC5 @tab Martyn Plummer + @item @tab i386 @tab Enterprise Linux @tab Matthew P. Cox +@@ -554,7 +556,8 @@ packages. + @item SuSE @tab i386 @tab 7.3/8.0/8.1/8.2 @tab Detlef Steuer + @item @tab i586 @tab 9.0/9.1/9.2/9.3/10.0/10.1 @tab Detlef Steuer + @item @tab x86_64 @tab 9.2/9.3/10.0/10.1 @tab Detlef Steuer +-@item Ubuntu @tab i386 @tab dapper @tab Dirk Eddelbuettel ++@item Ubuntu @tab i386 @tab dapper @tab Christian Steigies ++@item @tab amd64 @tab dapper @tab Christian Steigies + @item VineLinux @tab i386 @tab 3.2 @tab Susunu Tanimura + @end multitable + @end quotation +@@ -1615,8 +1618,9 @@ Annotation in Plots'', @url{http://www.a + + For a very long time, there was no such thing. + +-@url{http://www.xlsolutions-corp.com/, XL Solutions} is currently beta +-testing a commercially supported version of R named R+ (read R plus). ++@url{http://www.xlsolutions-corp.com/, XLSolutions Corporation} is ++currently beta testing a commercially supported version of R named R+ ++(read R plus). + + In addition, @url{http://www.revolution-computing.com/, REvolution + Computing} has released +@@ -1867,6 +1871,8 @@ Graphical modeling for contingency table + @c </COMMENT> + @item CompetingRiskFrailty + Competing risk model with frailties for right censored survival data. ++@item CreditMetrics ++Functions for calculating the CreditMetrics risk model. + @item DAAG + Various data sets used in examples and exercises in ``Data Analysis and + Graphics Using R'' by John H. Maindonald and W. John Brown, 2003. +@@ -1973,6 +1979,8 @@ large sparse graphical Gaussian models. + @item Geneland + MCMC inference from individual genetic data based on a spatial + statistical model. ++@item GeoXP ++Interactive exploratory spatial data analysis. + @item GroupSeq + Computations related to group-seqential boundaries. + @item HH +@@ -2009,6 +2017,9 @@ interval-censored data. + @item IDPmisc + Utilities from the Institute of Data Analyses and Process Design, + IDP/ZHW. ++@item IPSUR ++Accompanies ``Introduction to Probability and Statistics Using R'' by ++G. Andy Chang and G. Jay Kerns(in progress). + @item ISwR + Data sets for ``Introductory Statistics with R'' by Peter Dalgaard, + 2002, Springer. +@@ -2268,9 +2279,12 @@ especially for the wavelet and Gabor tra + on the book ``Practical Time-Frequency Analysis: Gabor and Wavelet + Transforms with an Implementation in S'' by Rene Carmona, Wen L. Hwang + and Bruno Torresani, 1998, Academic Press. +-@item SAGx +-Retrieval, preparation and analysis of data from the Affymetrix +-GeneChip. ++@c <COMMENT> ++@c Removed on 2006-10-06 as requested by the maintainer (now @BioC). ++@c @item SAGx ++@c Retrieval, preparation and analysis of data from the Affymetrix ++@c GeneChip. ++@c </COMMENT> + @item SASmixed + Data sets and sample linear mixed effects analyses corresponding to the + examples in ``SAS System for Mixed Models'' by R. C. Littell, +@@ -2309,6 +2323,8 @@ soil. + Sparse logistic regression. + @item SparseM + Basic linear algebra for sparse matrices. ++@item SpherWave ++Spherical Wavelets and SW-based spatially adaptive methods. + @item StatDataML + Read and write StatDataML. + @item StoppingRules +@@ -2342,15 +2358,21 @@ Statistics'' by J. Verzani, 2005, Chapma + @item VDCutil + Utilities supporting VDC, an open source digital library system for + quantitative data. ++@item VGAM ++Vector Generalized Linear and Additive Models. + @item VLMC + Functions, classes & methods for estimation, prediction, and simulation + (bootstrap) of VLMC (Variable Length Markov Chain) models. + @item VaR + Methods for calculation of Value at Risk (VaR). ++@item WeedMap ++Map of weed intensity. + @item WhatIf + Software for evaluating counterfactuals. + @item XML + Tools for reading @XML{} documents and DTDs. ++@item ZIGP ++Zero Inflated Generalized Poisson (ZIGP) regression models. + @item Zelig + Everyone's statistical software: an easy-to-use program that can + estimate, and help interpret the results of, an enormous range of +@@ -2380,6 +2402,8 @@ Multivariate data analysis and graphical + Tcl/Tk Graphical User Interface for @strong{ade4}. + @item adehabitat + A collection of tools for the analysis of habitat selection by animals. ++@item adimpro ++Adaptive smoothing of digital images. + @item adlift + Adaptive Wavelet transforms for signal denoising. + @item agce +@@ -2524,6 +2548,9 @@ update algorithm (Hard Competitive Learn + finding the number of clusters in a data set. + @item cfa + Analysis of configuration frequencies. ++@item cgh ++Analysis of microarray comparative genome hybridisation data using the ++Smith-Waterman algorithm. + @item chplot + Augmented convex hull plots: informative and nice plots for grouped + bivariate data. +@@ -2547,6 +2574,8 @@ Choose univariate class intervals for ma + purposes. + @item classPP + Projection Pursuit for supervised classification. ++@item classifly ++Explore classification models in high dimensions. + @item clim.pact + Climate analysis and downscaling for monthly and daily data. + @item climatol +@@ -2798,6 +2827,8 @@ teaching financial engineering and compu + (@url{http://www.Rmetrics.org/}). + @item fCalendar + The Rmetrics module for ``Date, Time and Calendars''. ++@item fEcofin ++The Rmetrics module with ``Selected economic and financial data sets''. + @item fExtremes + The Rmetrics module for ``Beyond the Sample, Dealing with Extreme + Values''. +@@ -2907,6 +2938,8 @@ Introduction with R'' by S. Wood (2006). + @item gamlss + Functions to fit Generalized Additive Models for Location Scale and + Shape. ++@item gamlss.dist ++Extra distributions for GAMLSS modeling. + @item gamlss.nl + A GAMLSS add on package for fitting non linear parametric models. + @item gamlss.tr +@@ -3071,6 +3104,8 @@ marginal inference for regression-scale + higher order inference for nonlinear heteroscedastic models. + @item homals + Homogeneity Analysis (HOMALS) package with optional Tcl/Tk interface. ++@item homtest ++Homogeneity tests for regional frequency analysis. + @item hopach + Hierarchical Ordered Partitioning and Collapsing Hybrid (HOPACH). + @item hot +@@ -3325,8 +3360,11 @@ Multiple Fractional Polynomials. + Routines for GAMs and other genralized ridge regression problems with + multiple smoothing parameter selection by GCV or UBRE. + @emph{Recommended}. +-@item micEcdat +-Data sets for micro-econometrics. ++@c <COMMENT> ++@c Removed on 2006-10-11 as requested by the maintainer. ++@c @item micEcdat ++@c Data sets for micro-econometrics. ++@c </COMMENT> + @item micEcon + Tools for microeconomic analysis and microeconomic modelling. + @item mice +@@ -3347,6 +3385,10 @@ Estimation/multiple imputation programs + continuous data. + @item mixreg + Functions to fit mixtures of regressions. ++@item mixtools ++Tools for mixture models. ++@item mlCopulaSelection ++Copula selection and fitting using maximum likelihood. + @item mlbench + A collection of artificial and real-world machine learning benchmark + problems, including the Boston housing data. +@@ -3382,6 +3424,8 @@ Inferences for ratios of coefficients in + @c @item mscalib + @c Calibration and filtering of MALDI-TOF Peptide Mass Fingerprint data. + @c </COMMENT> ++@item msgcop ++Semiparametric Bayesian Gaussian copula estimation. + @item msm + Functions for fitting continuous-time Markov multi-state models to + categorical processes observed at arbitrary times, optionally with +@@ -3531,6 +3575,9 @@ Ornstein-Uhlenbeck models for phylogenet + A collection of some tests commonly used for identifying outliers. + @item oz + Functions for plotting Australia's coastline and state boundaries. ++@item pARtial ++(Partial) attributable risk estimates, corresponding variance estimates ++and confidence intervals. + @item paleoTS + Modeling evolution in paleontological time-series. + @item pamr +@@ -3635,6 +3682,8 @@ manipulations. + Statistical and POPulation GENetics. + @item portfolio + Classes for analyzing and implementing portfolios. ++@item portfolioSim ++Framework for simulating equity portfolio strategies. + @item powell + Optimizes a function using Powell's UObyQA algorithm. + @item powerpkg +@@ -3736,8 +3785,12 @@ running BUGS from R. Support for Linux + @item rcdd + C Double Description for R, an interface to the CDD computational + geometry library. ++@item rcdk ++Interface to the CDK libraries, a Java framework for cheminformatics. + @item rcom + R COM Client Interface and internal COM Server. ++@item rcompletion ++TAB completion for R using Readline. + @item rda + Shrunken Centroids Regularized Discriminant Analysis. + @item ref +@@ -3774,6 +3827,8 @@ Provides bindings to Frank Warmerdam's G + Library (GDAL). + @item rgenoud + R version of GENetic Optimization Using Derivatives. ++@item rggm ++Robustified methods for Gaussian Graphical Models. + @item rggobi + Interface between R and GGobi. + @item rgl +@@ -4096,6 +4151,8 @@ A series of widgets and functions to sup + @item tdist + Computes the distribution of a linear combination of independent + Student's @math{t} variables. ++@item tdm ++A tool for Therapeutic Drug Monitoring. + @item tdthap + Transmission/disequilibrium tests for extended marker haplotypes. + @item tensor +@@ -4107,6 +4164,8 @@ Bayesian regression and adaptive samplin + models. + @item time + Time tracking for developers. ++@item titan ++Titration analysis for mass spectrometry data. + @item titecrm + TIme-To-Event Continual Reassessment Method and calibration tools. + @item tkrplot +@@ -4416,6 +4475,8 @@ An interface to call XLisp-Stat function + @item Rstem + Interface to Snowball implementation of Porter's word stemming + algorithm. ++@item Ryacas ++R interface to yacas. + @item SASXML + Example for reading @XML{} files in SAS 8.2 manner. + @item SJava +@@ -5289,6 +5350,7 @@ dir /opt/R/src/unix + * How can I save the result of each iteration in a loop into a separate file?:: + * Why are p-values not displayed when using lmer()?:: + * Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader?:: ++* Why does backslash behave strangely inside strings?:: + @end menu + + @c @node Why does R run out of memory?, Why does sourcing a correct file fail?, R Miscellanea, R Miscellanea +@@ -6165,7 +6227,7 @@ Doug Bates has kindly provided an extens + r-help list, which can be reviewed at + @uref{https://stat.ethz.ch/pipermail/r-help/2006-May/094765.html}. + +-@node Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader?, , Why are p-values not displayed when using lmer()?, R Miscellanea ++@node Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader?, Why does backslash behave strangely inside strings?, Why are p-values not displayed when using lmer()?, R Miscellanea + @section Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader? + + Output from @code{polygon()} (and other functions calling +@@ -6185,6 +6247,64 @@ The unwanted effect can be removed by tu + art: use the `Edit | Preferences | Page Display | Smooth line art' menu + in Adobe Reader 7.0. + ++@node Why does backslash behave strangely inside strings?, , Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader?, R Miscellanea ++@section Why does backslash behave strangely inside strings? ++ ++This question most often comes up in relation to file names (see ++@ref{How do file names work in Windows?}) but it also happens that ++people complain that they cannot seem to put a single @samp{\} character ++into a text string unless it happens to be followed by certain other ++characters. ++ ++To understand this, you have to distinguish between character strings ++and @emph{representations} of character strings. Mostly, the ++representation in R is just the string with a single or double quote at ++either end, but there are strings that cannot be represented that way, ++e.g., strings that themselves contains the quote character. So ++ ++@example ++> str <- "This \"text\" is quoted" ++> str ++[1] "This \"text\" is quoted" ++> cat(str, "\n") ++This "text" is quoted ++@end example ++ ++@noindent ++The @emph{escape sequences} @samp{\"} and @samp{\n} represent a double ++quote and the newline character respectively. Printing text strings, ++using @code{print()} or by typing the name at the prompt will use the ++escape sequences too, but the @code{cat()} function will display the ++string as-is. Notice that @samp{"\n"} is a one-character string, not ++two; the backslash is not actually in the string, it is just generated ++in the printed representation. ++ ++@example ++> nchar("\n") ++[1] 1 ++> substring("\n", 1, 1) ++[1] "\n" ++@end example ++ ++So how do you put a backslash in a string? For this, you have to ++escape the escape character. I.e., you have to double the backslash. ++as in ++ ++@example ++> cat("\\n", "\n") ++\n ++@end example ++ ++Some functions, particularly those involving regular expression ++matching, themselves use metacharacters, which may need to be escaped ++by the backslash mechanism. In those cases you may need a ++@emph{quadruple} backslash to represent a single literal one. ++ ++@c <FIXME 2.5.0> ++In current versions of R (up to 2.4.0) an unknown escape sequence like ++@samp{\p} is quietly interpreted as just @samp{p}. ++The development version now emits a warning. ++@c </FIXME> + + @node R Programming, R Bugs, R Miscellanea, Top + @chapter R Programming +diff -urp R-2.4.0.old/doc/manual/R-intro.texi R-2.4.0/doc/manual/R-intro.texi +--- R-2.4.0.old/doc/manual/R-intro.texi 2006-09-26 21:05:13.000000000 -0500 ++++ R-2.4.0/doc/manual/R-intro.texi 2006-10-29 10:45:45.000000000 -0600 +@@ -6882,9 +6882,13 @@ directory where @R{} was started, but ca + variable @env{R_HISTFILE}) should be restored at startup or not. The + default is to restore. + ++@item --no-Rconsole ++(Windows only) Prevent loading the @file{Rconsole} file at startup. ++ + @item --vanilla + Combine @option{--no-save}, @option{--no-environ} + @option{--no-site-file}, @option{--no-init-file} and @option{--no-restore}. ++In Windows, this also includes @option{--no-Rconsole}. + + @item --no-readline + (UNIX only) Turn off command-line editing via @strong{readline}. This is useful +diff -urp R-2.4.0.old/doc/manual/R-ints.texi R-2.4.0/doc/manual/R-ints.texi +--- R-2.4.0.old/doc/manual/R-ints.texi 2006-09-26 21:05:13.000000000 -0500 ++++ R-2.4.0/doc/manual/R-ints.texi 2006-10-28 14:36:02.000000000 -0500 +@@ -1161,7 +1161,7 @@ libraries. + saving on-screen graphs to those formats. This is technically optional, + and needs source code not in the tarball. + +-@item @file{Rchmtl.dll} ++@item @file{Rchtml.dll} + (Windows only.) A link to an ActiveX control that displays Compiled + @HTML{} help. This is optional, and only compiled if CHTML is specified. + +Only in R-2.4.0/m4: c99.m4 +diff -urp R-2.4.0.old/m4/java.m4 R-2.4.0/m4/java.m4 +--- R-2.4.0.old/m4/java.m4 2006-09-10 21:05:02.000000000 -0500 ++++ R-2.4.0/m4/java.m4 2006-11-03 19:41:45.000000000 -0600 +@@ -103,6 +103,7 @@ if test ${acx_java_works} = yes; then + case "${host_os}" in + darwin*) + JAVA_LIBS="-framework JavaVM" ++ JAVA_LIBS0="-framework JavaVM" + JAVA_LD_LIBRARY_PATH= + ;; + *) +diff -urp R-2.4.0.old/m4/Makefile.in R-2.4.0/m4/Makefile.in +--- R-2.4.0.old/m4/Makefile.in 2006-04-09 17:18:56.000000000 -0500 ++++ R-2.4.0/m4/Makefile.in 2006-10-28 14:35:49.000000000 -0500 +@@ -13,7 +13,7 @@ include $(top_builddir)/Makeconf + distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + DISTFILES = Makefile.in README \ + R.m4 \ +- clibs.m4 \ ++ clibs.m4 c99.m4 \ + codeset.m4 \ + gettext.m4 gettext-lib.m4 \ + java.m4 \ +diff -urp R-2.4.0.old/m4/R.m4 R-2.4.0/m4/R.m4 +--- R-2.4.0.old/m4/R.m4 2006-09-04 09:40:57.000000000 -0500 ++++ R-2.4.0/m4/R.m4 2006-10-28 14:35:49.000000000 -0500 +@@ -3107,8 +3107,8 @@ fi + ## The flag is documented, and is effective but also hides + ## unsatisfied references. We cannot test for GCC, as icc passes that test. + case "${CC}" in +- ## Intel compiler +- *icc) ++ ## Intel compiler: note that -c99 may have been appended ++ *icc*) + C_VISIBILITY= + ;; + esac +diff -urp R-2.4.0.old/Makefile.in R-2.4.0/Makefile.in +--- R-2.4.0.old/Makefile.in 2006-09-04 09:41:48.000000000 -0500 ++++ R-2.4.0/Makefile.in 2006-10-28 14:36:13.000000000 -0500 +@@ -30,7 +30,7 @@ Makeconf: $(srcdir)/Makeconf.in $(top_bu + ACLOCAL_M4 = aclocal.m4 + ACINCLUDE_DEPENDENCIES = \ + m4/R.m4 \ +- m4/clibs.m4 \ ++ m4/clibs.m4 m4/c99.m4 \ + m4/codeset.m4 \ + m4/gettext.m4 m4/gettext-lib.m4 \ + m4/java.m4 \ +@@ -104,15 +104,7 @@ svnonly: + touch non-tarball ; \ + (cd $(srcdir); LC_ALL=C TZ=GMT svn info || echo "Revision: unknown") 2> /dev/null \ + | sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \ +- | cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \ +- if grep unknown SVN-REVISION-tmp > /dev/null ; then \ +- echo "Last Changed Date: Today" >> SVN-REVISION-tmp ; \ +- if test -f "$(srcdir)/.svn/entries" ; then \ +- rev=`grep committed-rev "$(srcdir)/.svn/entries" | head -1 | sed -e 's/^ *committed-rev=\"//' -e 's/\"//'`; \ +- cdate=`grep committed-date "$(srcdir)/.svn/entries" | head -1 | sed -e 's/^ *committed-date=\"//' -e 's/T.*//'`; \ +- sed -e "s/unknown/$${rev}/" -e "s/Today/$${cdate}/" SVN-REVISION-tmp > SVN-REVISION-tmp2; mv SVN-REVISION-tmp2 SVN-REVISION-tmp ; \ +- fi ; \ +- fi ; \ ++ | cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \ + $(top_srcdir)/tools/move-if-change SVN-REVISION-tmp SVN-REVISION ; \ + rm -f SVN-REVISION-tmp ; \ + else \ +diff -urp R-2.4.0.old/NEWS R-2.4.0/NEWS +--- R-2.4.0.old/NEWS 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/NEWS 2006-11-03 19:41:47.000000000 -0600 +@@ -6,6 +6,100 @@ + ************************************************** + + ++ CHANGES IN R VERSION 2.4.0 patched ++ ++INSTALLATION ++ ++ o The extraction of info from Subversion for an SVN checkout now ++ also works for svn >= 1.4.0. However, on Windows the 'Last ++ Changed Date' will be in the local timezone, and not in GMT as ++ previously. ++ ++ o configure uses code borrowed from autoconf 2.60 to try harder to ++ ensure that a C99-compliant compiler is used. (It does so by ++ appending to CC.) This avoids problems with systems such as FC5 ++ which override CFLAGS and thereby lose flags such as -std=gnu99. ++ ++ ++NEW FEATURES ++ ++ o rainbow(), heat.colors(), terrain.colors(), topo.colors() and ++ cm.colors() all gain an 'alpha' argument to be passed to hsv(). ++ ++ ++BUG FIXES ++ ++ o Fixed warning() to use .dfltWarn intead of .dfltStop for default ++ handling (PR#9274). ++ ++ o R would slow down when the product of the length of a vector and ++ the length of a character vector used to subset it exceeded 2^31. ++ (PR#9280) ++ ++ o merge() now allows zero-row data frames. ++ ++ o add1.lm() had been broken by other changes for weighted fits. ++ ++ o axis.POSIXct() would sometimes give the wrong labels. ++ ++ o Help for a method call would fail. (PR#9291) ++ ++ o gzfile() returned an object of class "file" not "gzfile". (PR#9271) ++ ++ o load()ing from a connection had a logic bug in when it closed ++ the connection. (PR#9271) ++ ++ o The lowess() algorithm is unstable if the MAD of the residuals ++ becomes (effectively) zero: R now terminates the iterations at ++ that point. (This may result in quite different answers.) ++ ++ The 'delta' argument was incorrectly documented. (PR#9264) ++ ++ o abbreviate() would only work for strings of up to 8191 bytes, ++ but this was not checked. Now longer strings are errors. ++ ++ o Drawing X11 rotated text was buggy for VERY small (negative) ++ angle of rotation. Reported by Ben Bolker. ++ ++ o The X11 data editor would crash in an MBCS locale if R was ++ compiled with FC's CFLAGS that add buffer overflow and ++ stack-smashing detection. ++ ++ o rect() was not accepting border=NA in some cases involving ++ cross-hatching. ++ ++ o Fixes to S4 group generics to ensure that the correct number of ++ active arguments are in the signature of the group and all ++ members. Also a fix to keep the 'groupMembers' slot up to date. ++ ++ o removeClass() now takes care to remove any subclass references ++ to the deleted class. ++ ++ o mle() (in stats4) might not have worked as intended when the ++ order of parameters in 'start' differed from that in the ++ log-likelihood. (PR#9313) ++ ++ o dotchart() now properly restores par() settings behind itself. ++ ++ o system() on Mac OS X was blocking arbitrary signals during the ++ call although only SIGPROF was meant to be blocked. ++ ++ o methods cached via callNextMethod() and (sometimes) as() were ++ being cached as directly specified although in fact they were ++ inherited. Caused problems in later search for inherited methods. ++ ++ o str() works properly for method definitions and other S4-classed ++ function objects. ++ ++ o JAVA_LIBS are now correctly set on MacOS X ++ ++ o Fix null-termination issue suspected of causing crash with Fedora ++ Extra RPMS (PR#9339, Justin Harrington, analysis and fix from Bill ++ Dunlap). ++ ++ ++ ++ + CHANGES IN R VERSION 2.4.0 + + +Binary files R-2.4.0.old/po/de.gmo and R-2.4.0/po/de.gmo differ +diff -urp R-2.4.0.old/po/de.po R-2.4.0/po/de.po +--- R-2.4.0.old/po/de.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/de.po 2006-10-28 14:36:11.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R-2.2.1\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-09-21 10:41+0200\n" + "Last-Translator: Detlef Steuer <steuer(a)hsu-hh.de>\n" + "Language-Team: R-core <R-core(a)r-project.org>\n" +@@ -82,7 +82,7 @@ msgstr "ungltige 'names' in 'R_unlink' + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -127,7 +127,7 @@ msgstr "ungltige 'names' in 'R_unlink' + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -473,7 +473,7 @@ msgid "second argument must be a list" + msgstr "zweites Argument muss eine Liste sein" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "Indizierung auerhalb der Grenzen" + +@@ -1151,7 +1151,7 @@ msgstr "angegebene Vektorgre ist zu + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "Verwendung der NULL Umgebung ist nicht mehr mglich" + +@@ -1284,114 +1284,114 @@ msgstr "ungltiges Teilungsmuster '%s'" + msgid "the first argument must be a character vector" + msgstr "erstes Argument muss ein Charaktervektor sein" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviate mit nicht-ASCII Zeichen genutzt" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "Nicht-Charakter Namen" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "ungltiger Wert von 'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "ungltige multibyte Zeichenkette %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "regular expression ist in dieser Lokalisierung ungltig" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "ungltige regular expression '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "Eingabezeichenkette %d ungltig in dieser locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "ungltige Rckreferenz %d in regular expression" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' ist ungltig in dieser locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' ist ungltig in dieser locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "Muster mit Lnge 0" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "Nicht-Charakter Argument fr tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "abnehmende Bereichsspezifikation ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "abnehmende Bereichsspezifikation ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "ungltige (NA) Argumente." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "ungltige multibyte Zeichenkette 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "ungltige multibyte Zeichenkette 'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' ist lnger als 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "ungltige multibyte Eingabezeichenkette %d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "Benutzung von agrep() in einer UTF-8 Lokalisierung arbeitet wahrscheinlich " + "nur fr ASCII Zeichenketten" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "konnte keinen Speicher fr approximate matching zuteilen" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "konnte case insensitive matching nicht durchfhren" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "Argument muss ein Charakter-Vektor der Lnge 1 sein" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1399,45 +1399,45 @@ msgstr "" + "Argument sollte ein Charakter-Vektor der Lnge 1 sein\n" + "alle Argumente bis auf das erste werden ignoriert" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "Argument 'x' muss ein raw Vektor sein" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "Argument 'multiple' muss TRUE oder FALSE sein" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "Argument 'shift' muss eine kleine ganze Zahl sein" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "Argument 'x' muss ein Vektor ganzer Zahlen sein" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "Argument 'x' muss entweder raw, ganzzahlig oder logisch sein" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "Argument 'type' muss eine Zeichenkette sein" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "Lnge des Argumentes 'x' muss ein Vielfaches von %d sein" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "Argument 'x' darf keine NAs enthalten" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "Argument 'x' muss ein Vektor ganzer Zahlen sein" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() bentigt Charakter-Vektor" + +@@ -5496,7 +5496,7 @@ msgstr "Schreibfehler in Verbindung" + msgid "no input is available" + msgstr "keine Eingabe verfgbar" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6126,7 +6126,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] Index (%d) auerhalb des Bereichs" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "ungltiger Indextyp" + +@@ -6162,19 +6162,19 @@ msgstr "(subscript) boolescher Index zu + msgid "only 0's may be mixed with negative subscripts" + msgstr "nur Nullen drfen mit negativen Indizes gemischt werden" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "Element eines Charaktervektors ist nicht vom Typ CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "kein 'dimnames' Attribut fr Arrays" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "ungltiger Index" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "Indizierung bei einem Nicht-Vektor" + +Binary files R-2.4.0.old/po/en_GB.gmo and R-2.4.0/po/en_GB.gmo differ +diff -urp R-2.4.0.old/po/en_GB.po R-2.4.0/po/en_GB.po +--- R-2.4.0.old/po/en_GB.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/en_GB.po 2006-10-28 14:36:08.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2005-02-22 16:55+0000\n" + "Last-Translator: Prof Brian Ripley <ripley(a)stats.ox.ac.uk>\n" + "Language-Team: English\n" +@@ -82,7 +82,7 @@ msgstr "" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -127,7 +127,7 @@ msgstr "" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -471,7 +471,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1133,7 +1133,7 @@ msgstr "" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1266,156 +1266,156 @@ msgstr "" + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr "" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "" + +@@ -5406,7 +5406,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6016,7 +6016,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6052,19 +6052,19 @@ msgstr "" + msgid "only 0's may be mixed with negative subscripts" + msgstr "" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/en.gmo and R-2.4.0/po/en.gmo differ +diff -urp R-2.4.0.old/po/en.po R-2.4.0/po/en.po +--- R-2.4.0.old/po/en.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/en.po 2006-10-28 14:36:10.000000000 -0500 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2005-01-25 12:01+0000\n" + "Last-Translator: Brian Ripley <Brian.Ripley(a)R-project.org>\n" + "Language-Team: R-core <R-core(a)R-project.org>\n" +@@ -80,7 +80,7 @@ msgstr "" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -125,7 +125,7 @@ msgstr "" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -469,7 +469,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1131,7 +1131,7 @@ msgstr "" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1264,156 +1264,156 @@ msgstr "" + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr "" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "" + +@@ -5404,7 +5404,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6014,7 +6014,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6050,19 +6050,19 @@ msgstr "" + msgid "only 0's may be mixed with negative subscripts" + msgstr "" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/en(a)quot.gmo and R-2.4.0/po/en(a)quot.gmo differ +diff -urp R-2.4.0.old/po/en(a)quot.po R-2.4.0/po/en(a)quot.po +--- R-2.4.0.old/po/en(a)quot.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/en(a)quot.po 2006-10-28 14:36:10.000000000 -0500 +@@ -29,8 +29,8 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.4.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" +-"PO-Revision-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" ++"PO-Revision-Date: 2006-10-24 15:53+0100\n" + "Last-Translator: Automatically generated\n" + "Language-Team: none\n" + "MIME-Version: 1.0\n" +@@ -104,7 +104,7 @@ msgstr "invalid names in R_unli + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -149,7 +149,7 @@ msgstr "invalid names in R_unli + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -494,7 +494,7 @@ msgid "second argument must be a list" + msgstr "second argument must be a list" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "subscript out of bounds" + +@@ -1166,7 +1166,7 @@ msgstr "vector size specified is too lar + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "use of NULL environment is defunct" + +@@ -1299,112 +1299,112 @@ msgstr "invalid split pattern %s" + msgid "the first argument must be a character vector" + msgstr "the first argument must be a character vector" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviate used with non-ASCII chars" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "non-character names" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "invalid value of allow_" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "invalid multibyte string %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "regular expression is invalid in this locale" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "invalid regular expression %s" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "input string %d is invalid in this locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "invalid backreference %d in regular expression" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "pattern is invalid in this locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "replacement is invalid in this locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "zero-length pattern" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "non-character argument to tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "decreasing range specification ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "decreasing range specification ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "invalid (NA) arguments." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "invalid multibyte string old" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "invalid multibyte string new" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "old is longer than new" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "invalid input multibyte string %d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "use of agrep() in a UTF-8 locale may only work for ASCII strings" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "could not allocate memory for approximate matching" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "could not perform case insensitive matching" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "argument must be a character vector of length 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1412,45 +1412,45 @@ msgstr "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "argument x must be a raw vector" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "argument multiple must be TRUE or FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "argument shift must be a small integer" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "argument x must be a integer vector" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "argument x must be raw, integer or logical" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "argument type must be a character string" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "argument x must be a multiple of %d long" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "argument x must not contain NAs" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "argument x must be an integer vector" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() requires a character vector" + +@@ -5479,7 +5479,7 @@ msgstr "error writing to connection" + msgid "no input is available" + msgstr "no input is available" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6103,7 +6103,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] subscript (%d) out of bounds" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "invalid subscript type" + +@@ -6139,19 +6139,19 @@ msgstr "(subscript) logical subscript to + msgid "only 0's may be mixed with negative subscripts" + msgstr "only 0's may be mixed with negative subscripts" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "character vector element does not have type CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "no dimnames attribute for array" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "invalid subscript" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "subscripting on non-vector" + +Binary files R-2.4.0.old/po/es.gmo and R-2.4.0/po/es.gmo differ +diff -urp R-2.4.0.old/po/es.po R-2.4.0/po/es.po +--- R-2.4.0.old/po/es.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/es.po 2006-10-28 14:36:08.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.3.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-04-17 00:24+0100\n" + "Last-Translator: Pablo E. Verde <pabloemilio.verde(a)uni-duesseldorf.de>\n" + "Language-Team: Spanish <RenEspanol(a)googlegroups.com>\n" +@@ -84,7 +84,7 @@ msgstr "'names' invlidos en R_unlink" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -129,7 +129,7 @@ msgstr "'names' invlidos en R_unlink" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -481,7 +481,7 @@ msgid "second argument must be a list" + msgstr "el segundo argumento debe ser una lista" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "subndice fuera de los lmites" + +@@ -1162,7 +1162,7 @@ msgstr "tamao del vector especificado e + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1299,114 +1299,114 @@ msgstr "patrn de separacin invlido '% + msgid "the first argument must be a character vector" + msgstr "el primer argumento debe ser un vector de caracteres" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abreviatura utilizada con caracteres no ASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "nombres de tipo no caracter" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "valor de 'allow_' invlido" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "string multibyte invlida %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "la expresin regular es invlida es este locale" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "expresin regular invlida '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "string de entrada %d es invlida en este locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "auto-referencia %d invlida en una expresin regular" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' es invlido en este locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' es invlido en este locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "patrn de longitud 0" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "argumento que no es caracter para tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "especificacin de rango decreciente ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "especificacin de rango decreciente ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "argumentos (NA) invlidos" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "string multibyte invlida 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "string multibyte invlida 'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' es ms largo que 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "string multibyte %d de entrada invlida" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "el uso de agrep() en un locale UTF-8 puede funcionar slo para strings ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "no fue posible asignar memoria para una concordancia aproximado" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + "no fue posible realizar una concordancia no sensible a maysculas/minsculas" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "el argumento debe ser un vector de caracteres de longitud 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1414,45 +1414,45 @@ msgstr "" + "el argumento debe ser un vector de caracteres de longitud 1\n" + "todos los elementos sern ignorados, salvo el primero" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "el argumento 'x' debe ser un vector de tipo crudo" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "el argumento 'multiple' debe ser TRUE o FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "el argumento 'shift' debe ser un entero pequeo" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "el argumento 'x' debe ser un vector entero" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "el argumento 'x' debe ser crudo, entero o lgico" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "el argumento 'type' debe ser una cadena de caracteres" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "el argumento 'x' debe ser un mltiplo de la longitud de %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "el argumento 'x' no puede contener NAs" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "el argumento 'x' debe ser un vector entero" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() requiere un vector de caracteres" + +@@ -5545,7 +5545,7 @@ msgstr "error al escribir una conexin" + msgid "no input is available" + msgstr "no hay disponible mecanismos de historia" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6185,7 +6185,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "subscrito (%d) en [[ ]] fuera de limites" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "tipo de subscrito invalido" + +@@ -6221,19 +6221,19 @@ msgstr "(subscript) subscrito logico muy + msgid "only 0's may be mixed with negative subscripts" + msgstr "solamente 0's pueden ser mezclados con subscritos negativos" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "elemento del vector de caracteres no tiene tipo CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "arreglo (array) sin atributo 'dimnames'" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "subscrito invalido" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "intento de usar un subscrito e un objeto distinto a un vector" + +Binary files R-2.4.0.old/po/fr.gmo and R-2.4.0/po/fr.gmo differ +diff -urp R-2.4.0.old/po/fr.po R-2.4.0/po/fr.po +--- R-2.4.0.old/po/fr.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/fr.po 2006-10-28 14:36:10.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R-2.2.1\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-04-18 08:23+0100\n" + "Last-Translator: Philippe Grosjean <phgrosjean(a)sciviews.org>\n" + "Language-Team: French <R-core(a)r-project.org>\n" +@@ -84,7 +84,7 @@ msgstr "'names' incorrect dans 'R_unlink + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -129,7 +129,7 @@ msgstr "'names' incorrect dans 'R_unlink + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -480,7 +480,7 @@ msgid "second argument must be a list" + msgstr "le second argument doit tre une liste" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "indice hors limites" + +@@ -1176,7 +1176,7 @@ msgstr "la longueur choisie pour le vect + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "l'utilisation de l'environnement NULL n'est plus autorise" + +@@ -1311,38 +1311,38 @@ msgstr "motif de dcoupage '%s' incorrec + msgid "the first argument must be a character vector" + msgstr "le premier argument doit tre un vecteur de caractres" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviate utilis avec des caractres non ASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "les noms ne sont pas des chanes de caractres" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "valeur incorrecte pour 'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "chane de charactres multioctets incorrecte %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "expression rgulire incorrecte dans cet environnement linguistique" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "expression rgulire incorrecte '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" +@@ -1350,78 +1350,78 @@ msgstr "" + "la chane de caractres entre %d est incorrecte dans cet environnement " + "linguistique" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "rfrence arrire %d incorrecte dans l'expression rgulire" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' est incorrect dans cet environnement linguistique" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' est incorrect dans cet environnement linguistique" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "motif de longueur nulle" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "l'argument de tolower() n'est pas une chane de caractres" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "spcification de plage dcroissante ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "spcification de plage dcroissante ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "arguments (NA) incorrects." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "chane de charactres multioctets 'old' incorrecte" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "chane de charactres multioctets 'new' incorrecte" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' est plus long que 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "chane de caractres multioctets %d incorrecte en entre" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "l'utilisation de agrep() dans un environnement UTF-8 ne peut fonctionner que " + "pour des chanes ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + "impossible d'allouer de la mmoire pour une correspondance approximative" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "une correspondance indpendante de la casse ne peut tre effectue" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "l'argument doit tre un vecteur de caractres de longueur 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1429,45 +1429,45 @@ msgstr "" + "l'argument doit tre un vecteur de caractres de longueur 1\n" + "tous les lments sauf le premier sont ignors" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "l'argument 'x' doit tre un vecteur de type raw" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "l'argument 'multiple' doit tre TRUE ou FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "l'argument 'shift' doit tre un petit entier" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "l'argument 'x' doit tre un vecteur d'entiers" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "l'argument 'x' doit tre de type raw, entier ou logique" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "l'argument 'type' doit tre une chane de caractres" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "l'argument 'x' doit tre un multiple de la longueur %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "l'argument 'x' ne doit pas contenir de valeurs manquantes (NA)" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "l'argument 'x' doit tre un vecteur d'entiers" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() exige un vecteur de caractres comme argument" + +@@ -5607,7 +5607,7 @@ msgstr "erreur d'criture vers la connex + msgid "no input is available" + msgstr "pas d'entre disponible" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6254,7 +6254,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] indice (%d) en dehors des bornes" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "type d'indice incorrect" + +@@ -6290,19 +6290,19 @@ msgstr "(subscript) indice logique trop + msgid "only 0's may be mixed with negative subscripts" + msgstr "les indices ngatifs ne peuvent tre mlangs qu' des 0" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "un lment d'un vecteur de caractres n'a pas le type CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "aucun attribut 'dimnames' pour le tableau" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "indice incorrect" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "indiage d'un lment non vectoriel" + +Binary files R-2.4.0.old/po/it.gmo and R-2.4.0/po/it.gmo differ +diff -urp R-2.4.0.old/po/it.po R-2.4.0/po/it.po +--- R-2.4.0.old/po/it.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/it.po 2006-10-28 14:36:11.000000000 -0500 +@@ -14,7 +14,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-01-16 09:11+0100\n" + "Last-Translator: Daniele Medri <daniele.medri2(a)unibo.it>\n" + "Language-Team: Italian <tp(a)lists.linux.it>\n" +@@ -90,7 +90,7 @@ msgstr "'names' non valido in R_unlink" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -135,7 +135,7 @@ msgstr "'names' non valido in R_unlink" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -490,7 +490,7 @@ msgid "second argument must be a list" + msgstr "il secondo argomento deve essere di tipo list" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "indice fuori limite" + +@@ -1176,7 +1176,7 @@ msgstr "dimensione troppo grande per il + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1312,114 +1312,114 @@ msgstr "pattern di split '%s' non valido + msgid "the first argument must be a character vector" + msgstr "il primo argomento deve essere una vettore character" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviazione usata con caratteri non ASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "nomi non di tipo character" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "valore non valido per 'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "stringa mulibyte %d non valida" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "l'espressione regolare non valida in questo locale" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "espressione regolare '%s' non valida" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "stringa di input %d non valida in questo locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "riferimento all'indietro %d non valido in questa espressione regolare" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' non valido per questo locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacemente' non valido in questo locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "'pattern' di lunghezza zero" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "argomento non character in tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "specificazione range decrescente ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "specificazione range decrescente ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "argomenti non validi (NA)." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "stringa multibyte non valido in 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "stringa multibyte 'new' non valida" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' pi lungo di 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "stringa input multibyte %d non valida" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "l'uso di agrep() in un locale UTF-8 pu funzionare solo per stringhe ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "non possibile allocare memoria per match approssimato" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + "non posso eseguire accoppiamenti senza tener conto delle maiuscole/minuscole" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "l'argomento deve essere un vettore character di lunghezza 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1427,45 +1427,45 @@ msgstr "" + "l'argomento deve essere un vettore di caratteri di lunghezza 1\n" + "verranno ignorati tutti tranne il primo elemento" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "l'argomento 'x' deve essere un vettore semplice" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "l'argomento 'mutiple' deve essere TRUE o FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "l'argomento 'shift' deve essere un intero piccolo" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "l'argomento 'x' deve essere un vettore di interi" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "l'argomento 'x' deve essere semplice, intero o booleano" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "l'argomento 'type' deve essere una stringa character" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "l'argomento 'x' deve essere lungo un multiplo di %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "l'argomento 'x' non deve contenere NA" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "l'argomento 'x' deve essere un vettore di interi" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strstrim() necessita di un vettore di caratteri" + +@@ -1524,7 +1524,7 @@ msgstr "environment non valido" + + #: src/main/coerce.c:1408 + msgid "argument must have length at least 1" +-msgstr "l'argometno deve avere almeno lunghezza 1" ++msgstr "l'argomento deve avere almeno lunghezza 1" + + #: src/main/coerce.c:1433 + msgid "invalid body for function" +@@ -3774,7 +3774,7 @@ msgstr "l'argumento formale \"%s\" as + #: src/main/match.c:234 src/main/match.c:273 + #, c-format + msgid "argument %d matches multiple formal arguments" +-msgstr "l'argomento %d si associa a pi argometni formali" ++msgstr "l'argomento %d si associa a pi argomenti formali" + + #: src/main/match.c:386 + #, fuzzy, c-format +@@ -5549,7 +5549,7 @@ msgstr "errore di scrittura sulla connes + msgid "no input is available" + msgstr "non esiste un meccanismo di gestione history" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6190,7 +6190,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] indice (%d) fuori limiti" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "tipo di indice non valido" + +@@ -6226,19 +6226,19 @@ msgstr "(subscript) indice logicol tropp + msgid "only 0's may be mixed with negative subscripts" + msgstr "solo gli 0 si possono usare contemporaneamente con indici negativi" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "il vettore carattere non ha un tipo CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "attributo 'dimnames' mancante per l'array" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "indici non valido" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "indicizzazione su un non vettore" + +Binary files R-2.4.0.old/po/ja.gmo and R-2.4.0/po/ja.gmo differ +diff -urp R-2.4.0.old/po/ja.po R-2.4.0/po/ja.po +--- R-2.4.0.old/po/ja.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/ja.po 2006-10-28 14:36:12.000000000 -0500 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.4.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-09-22 19:00+0900\n" + "Last-Translator: Shigeru Mase <maseshigeru(a)gmail.com>\n" + "Language-Team: R-core <R-core(a)R-project.org>\n" +@@ -85,7 +85,7 @@ msgstr "R_unlink 'names' + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -130,7 +130,7 @@ msgstr "R_unlink 'names' + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -474,7 +474,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1157,7 +1157,7 @@ msgstr " + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "NULL" + +@@ -1290,113 +1290,113 @@ msgstr " '%s' + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "ASCII " + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "'allow_' " + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "%d " + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "'%s' " + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr " %d " + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr " %d " + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' " + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' " + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "tolower " + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr " ('%lc-%lc') " + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr " ('%c-%c') " + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "(NA)" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "'old' " + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "'new' " + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' 'new' " + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr " %d " + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "UTF-8 agrep ASCII " + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1404,45 +1404,45 @@ msgstr "" + "1\n" + "" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr " 'x' raw " + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr " 'multiple' TRUE FALSE " + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr " 'shift' " + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "'x'raw, " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr " 'type' " + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr " 'x' %d " + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr " 'x' NA " + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim " + +@@ -5493,7 +5493,7 @@ msgstr " + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6124,7 +6124,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] %d" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6160,19 +6160,19 @@ msgstr " (subscript) + msgid "only 0's may be mixed with negative subscripts" + msgstr " 0 " + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr " CHARSXP " + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr " 'dimnames' " + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/ko.gmo and R-2.4.0/po/ko.gmo differ +diff -urp R-2.4.0.old/po/ko.po R-2.4.0/po/ko.po +--- R-2.4.0.old/po/ko.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/ko.po 2006-10-28 14:36:08.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2005-05-31 10:36+0900\n" + "Last-Translator: park ui-il <uiami(a)hanmail.com> \n" + "Language-Team: South Korea\n" +@@ -85,7 +85,7 @@ msgstr "R_unlink 'names' + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -130,7 +130,7 @@ msgstr "R_unlink 'names' + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -482,7 +482,7 @@ msgid "second argument must be a list" + msgstr " " + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr " " + +@@ -1161,7 +1161,7 @@ msgstr " + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1297,114 +1297,114 @@ msgstr " '%s' + msgid "the first argument must be a character vector" + msgstr " " + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "ASCII " + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr " " + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "'allow_' " + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "%d " + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr " licale " + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "'%s' " + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr " %d locale " + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr " %d " + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' locale " + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' locale " + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "zero-length " + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "tolower() " + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr " ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr " ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr " (NA)." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "'old' " + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "'new' " + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' 'new' " + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr " %d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + " UTF-8 locale agrep() ASCII " + " " + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr " matching " + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr " matching " + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr " 1 " + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1412,46 +1412,46 @@ msgstr "" + " 1 \\n\n" + " " + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr " 'x' raw " + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr " 'multiple' TRUE FALSE " + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr " 'shift' " + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr " 'x' raw, , " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr " 'type' " + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr " 'x' %d " + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr " 'x' NA " + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + #, fuzzy + msgid "argument 'x' must be an integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim " + +@@ -5545,7 +5545,7 @@ msgstr "connection + msgid "no input is available" + msgstr " machanism " + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6178,7 +6178,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] (%d) " + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr " " + +@@ -6214,19 +6214,19 @@ msgstr "(subscript) + msgid "only 0's may be mixed with negative subscripts" + msgstr " 0 " + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr " CHARSXP " + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr " 'dimnames' " + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr " " + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr " " + +Binary files R-2.4.0.old/po/pt_BR.gmo and R-2.4.0/po/pt_BR.gmo differ +diff -urp R-2.4.0.old/po/pt_BR.po R-2.4.0/po/pt_BR.po +--- R-2.4.0.old/po/pt_BR.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/pt_BR.po 2006-10-28 14:36:08.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-04-16 19:17-0300\n" + "Last-Translator: Fernando Henrique Ferraz P. da Rosa <feferraz(a)ime.usp.br>\n" + "Language-Team: Portuguese <ldp-br(a)bazar.conectiva.com.br>\n" +@@ -83,7 +83,7 @@ msgstr "'names' invlidos em 'R_unlink'" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -128,7 +128,7 @@ msgstr "'names' invlidos em 'R_unlink'" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -476,7 +476,7 @@ msgid "second argument must be a list" + msgstr "segundo argumento deve ser uma lista" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "ndice fora de limites" + +@@ -1156,7 +1156,7 @@ msgstr "tamanho de vetor especificado + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "uso do ambiente NULL no mais permitido " + +@@ -1292,114 +1292,114 @@ msgstr "padro split invlido '%s'" + msgid "the first argument must be a character vector" + msgstr "primeiro argumento deve ser um vetor de caracteres" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreaviate usado com caracteres no-ASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "nomes de modo no caractere" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "valor de 'allow_' invlido" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "string multibyte invlida %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "expresso regular invlida nesse locale" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "expresso regular invlida '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "string de entrada %d invlida nesse locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "auto-referncia %d invlida na expresso regular" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' invlido nesse locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' invlido nesse locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "padro de comprimento 0" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "argumento diferente de caractere para tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "especificao de intervalo decrescente ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "especificao de intervalo decrescente ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "argumentos invlidos (NA)" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "string multibyte invlida 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "string multibyte invlida 'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' maior que 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "string de entrada multibyte %d invlida" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "uso de agrep() em um locale UTF-8 pode funcionar somente para strings ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "no foi possvel alocar memria para comparao aproximada" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + "no foi possvel fazer comparao desconsiderando mausculas/minsculas" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "argumento deve ser um vetor de caracteres de comprimento 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1407,45 +1407,45 @@ msgstr "" + "argumento deve ser um vetor de caracteres de comprimento 1\n" + "todos menos o primeiro argumento sero ignorados" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "argumento 'x' deve ser um vetor do tipo raw" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "argumento 'multiple' deve ser TRUE ou FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "argumento 'shift' deve ser um inteiro pequeno" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "argumento 'x' deve ser um vetor inteiro" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "argumento 'x' deve ser raw, inteiro ou lgico" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "argumento 'type' deve ser uma string de caracteres" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "argumento 'x' deve ter comprimento mltiplo de %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "argumento 'x' no pode conter NAs" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "argumento 'x' deve ser um vetor inteiro" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() requer um vetor de caracteres" + +@@ -5523,7 +5523,7 @@ msgstr "erro ao escrever na conexo" + msgid "no input is available" + msgstr "nenhuma entrada disponvel" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6163,7 +6163,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "subscrito (%d) em [[ ]] fora de limites" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "tipo de subscrito invlido" + +@@ -6199,19 +6199,19 @@ msgstr "(subscript) subscrito lgico mui + msgid "only 0's may be mixed with negative subscripts" + msgstr "somente 0's podem ser usados junto com subscritos negativos" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "elemento do vetor de caracteres no tem tipo CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "array sem atributo 'dimnames'" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "subscrito invlido" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "tentativa de usar um subscrito em um objeto diferente de vetor" + +Binary files R-2.4.0.old/po/RGui-zh_CN.gmo and R-2.4.0/po/RGui-zh_CN.gmo differ +diff -urp R-2.4.0.old/po/RGui-zh_CN.po R-2.4.0/po/RGui-zh_CN.po +--- R-2.4.0.old/po/RGui-zh_CN.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/RGui-zh_CN.po 2006-10-28 14:36:10.000000000 -0500 +@@ -1,8 +1,8 @@ +-# Chinese translations for R package +-# Copyright (C) 2005 The R Foundation +-# This file is distributed under the same license as the PACKAGE package. +-# <feic(a)avaya.com>, 2006. +-# ++# Chinese translations for R package ++# Copyright (C) 2005 The R Foundation ++# This file is distributed under the same license as the PACKAGE package. ++# <feic(a)avaya.com>, 2006. ++# + msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" +@@ -18,19 +18,19 @@ msgstr "" + + #: console.c:879 console.c:919 + msgid "Not enough memory" +-msgstr "" ++msgstr "" + + #: console.c:975 console.c:979 + msgid "Insufficient memory: text not copied to the clipboard" +-msgstr ": " ++msgstr ": " + + #: console.c:1018 graphapp/clipboard.c:54 graphapp/clipboard.c:80 + msgid "Unable to open the clipboard" +-msgstr "" ++msgstr "" + + #: console.c:1620 + msgid "Insufficient memory. Please close the console" +-msgstr " " ++msgstr " " + + #: console.c:1674 console.c:1727 preferences.c:274 + #, c-format +@@ -38,121 +38,121 @@ msgid "" + "Font %s-%d-%d not found.\n" + "Using system fixed font" + msgstr "" +-"%s-%d-%d\n" +-"" ++"%s-%d-%d\n" ++"" + + #: console.c:1829 + msgid "Save selection to" +-msgstr "" ++msgstr "" + + #: console.c:1831 + msgid "Save console contents to" +-msgstr "" ++msgstr "" + + #: console.c:1929 + msgid "Scrolling.\n" +-msgstr "\n" ++msgstr "\n" + + #: console.c:1930 + msgid " Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n" +-msgstr " : PgUp, PgDown, Ctrl+, Ctrl+Home, Ctrl+End,\n" ++msgstr " : PgUp, PgDown, Ctrl+, Ctrl+Home, Ctrl+End,\n" + + #: console.c:1931 + msgid "" + " Mouse: use the scrollbar(s).\n" + "\n" + msgstr "" +-" : \n" ++" : \n" + "\n" + + #: console.c:1932 + msgid "Editing.\n" +-msgstr "\n" ++msgstr "\n" + + #: console.c:1933 + msgid " Moving the cursor: \n" +-msgstr " : \n" ++msgstr " : \n" + + #: console.c:1934 + msgid " Left arrow or Ctrl+B: move backward one character;\n" +-msgstr " Ctrl+B: ;\n" ++msgstr " Ctrl+B: ;\n" + + #: console.c:1935 + msgid " Right arrow or Ctrl+F: move forward one character;\n" +-msgstr " Ctrl+F: ;\n" ++msgstr " Ctrl+F: ;\n" + + #: console.c:1936 + msgid " Home or Ctrl+A: go to beginning of line;\n" +-msgstr " HomeCtrl+A: ;\n" ++msgstr " HomeCtrl+A: ;\n" + + #: console.c:1937 + msgid " End or Ctrl+E: go to end of line;\n" +-msgstr " EndCtrl+E: ;\n" ++msgstr " EndCtrl+E: ;\n" + + #: console.c:1938 + msgid " History: Up and Down Arrows, Ctrl+P, Ctrl+N\n" +-msgstr " : , Ctrl+P, Ctrl+N\n" ++msgstr " : , Ctrl+P, Ctrl+N\n" + + #: console.c:1939 + msgid " Deleting:\n" +-msgstr " :\n" ++msgstr " :\n" + + #: console.c:1940 + msgid " Del or Ctrl+D: delete current character;\n" +-msgstr " DelCtrl+D: ;\n" ++msgstr " DelCtrl+D: ;\n" + + #: console.c:1941 + msgid " Backspace: delete preceding character;\n" +-msgstr " Backspace: ;\n" ++msgstr " Backspace: ;\n" + + #: console.c:1942 + msgid "" + " Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n" +-msgstr " Ctrl+DelCtrl+K: \n" ++msgstr " Ctrl+DelCtrl+K: \n" + + #: console.c:1943 + msgid " Ctrl+U: delete all text from current line.\n" +-msgstr " Ctrl+U: \n" ++msgstr " Ctrl+U: \n" + + #: console.c:1944 + msgid " Copy and paste.\n" +-msgstr " .\n" ++msgstr " .\n" + + #: console.c:1945 + msgid "" + " Use the mouse (with the left button held down) to mark (select) text.\n" +-msgstr " () \n" ++msgstr " () \n" + + #: console.c:1946 + msgid "" + " Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n" +-msgstr " Shift+Del(Ctrl+C) \n" ++msgstr " Shift+Del(Ctrl+C) \n" + + #: console.c:1947 + msgid "" + " Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard " + "(if any) \n" +-msgstr " Shift+Ins(Ctrl+VCtrl+Y)() \n" ++msgstr " Shift+Ins(Ctrl+VCtrl+Y)() \n" + + #: console.c:1948 + msgid " to the console, Ctrl+X first copy then paste\n" +-msgstr " , Ctrl+X\n" ++msgstr " , Ctrl+X\n" + + #: console.c:1949 + msgid " Misc:\n" +-msgstr " :\n" ++msgstr " :\n" + + #: console.c:1950 + msgid " Ctrl+L: Clear the console.\n" +-msgstr " Ctrl+L: .\n" ++msgstr " Ctrl+L: .\n" + + #: console.c:1951 + msgid " Ctrl+O: Toggle overwrite mode: initially off.\n" +-msgstr " Ctrl+O: : \n" ++msgstr " Ctrl+O: : \n" + + #: console.c:1952 + msgid " Ctrl+T: Interchange current char with one to the left.\n" +-msgstr " Ctrl+T: \n" ++msgstr " Ctrl+T: \n" + + #: console.c:1953 + msgid "" +@@ -160,14 +160,14 @@ msgid "" + "Note: Console is updated only when some input is required.\n" + msgstr "" + "\n" +-": \n" ++": \n" + + #: console.c:1954 + msgid "" + " Use Ctrl+W to toggle this feature off/on.\n" + "\n" + msgstr "" +-" Ctrl+W\n" ++" Ctrl+W\n" + "\n" + + #: console.c:1955 +@@ -175,72 +175,72 @@ msgid "" + "Use ESC to stop the interpreter.\n" + "\n" + msgstr "" +-"ESC\n" ++"ESC\n" + "\n" + + #: console.c:1956 + msgid "Standard Windows hotkeys can be used to switch to the\n" +-msgstr "Windows\n" ++msgstr "Windows\n" + + #: console.c:1957 + msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)" +-msgstr " (MDICtrl+TabCtrl+F6, SDIAlt+Tab)" ++msgstr " (MDICtrl+TabCtrl+F6, SDIAlt+Tab)" + + #: dataentry.c:220 + msgid "invalid argument" +-msgstr "" ++msgstr "" + + #: dataentry.c:267 + msgid "invalid type for value" +-msgstr "" ++msgstr "" + + #: dataentry.c:281 + msgid "invalid device" +-msgstr "" ++msgstr "" + + #: dataentry.c:329 + msgid "dataentry: internal memory problem" +-msgstr "dataentry: " ++msgstr "dataentry: " + + #: dataentry.c:623 dataentry.c:1117 + msgid "dataentry: internal memory error" +-msgstr "dataentry: " ++msgstr "dataentry: " + + #: dataentry.c:742 dataentry.c:755 + msgid "internal type error in dataentry" +-msgstr "dataentry" ++msgstr "dataentry" + + #: dataentry.c:922 + msgid "dataentry: expression too long" +-msgstr "dataentry: " ++msgstr "dataentry: " + + #: dataentry.c:1351 + msgid "column names cannot be blank" +-msgstr "" ++msgstr "" + + #: dataentry.c:1395 + msgid "Variable editor" +-msgstr "" ++msgstr "" + + #: dataentry.c:1400 + msgid "variable name" +-msgstr "" ++msgstr "" + + #: dataentry.c:1402 + msgid "type" +-msgstr "" ++msgstr "" + + #: dataentry.c:1506 + msgid "Cell width(s)" +-msgstr "" ++msgstr "" + + #: dataentry.c:1511 + msgid "Cell width" +-msgstr "" ++msgstr "" + + #: dataentry.c:1514 + msgid "variable" +-msgstr "" ++msgstr "" + + #: dataentry.c:1553 + msgid "" +@@ -264,282 +264,282 @@ msgid "" + " Right-click menu for copy, paste, autosize currently selected column\n" + "\n" + msgstr "" +-"\n" +-" : \n" +-"\tTab, Shift+Tab\n" +-"\tPgDnCtrl+F: \n" +-"\tPgUpCtrl+B: \n" +-"\tHome: (1,1)\n" +-"\tEnd: \n" +-" : , \n" ++"\n" ++" : \n" ++"\tTab, Shift+Tab\n" ++"\tPgDnCtrl+F: \n" ++"\tPgUpCtrl+B: \n" ++"\tHome: (1,1)\n" ++"\tEnd: \n" ++" : , \n" + "\n" +-"\n" +-" \n" +-" \n" ++"\n" ++" \n" ++" \n" + "\n" +-".\n" +-" Ctrl-L\n" +-" Ctrl-C\n" +-" Ctrl-V\n" +-" , , \n" ++".\n" ++" Ctrl-L\n" ++" Ctrl-C\n" ++" Ctrl-V\n" ++" , , \n" + "\n" + + #: dataentry.c:1559 dataentry.c:1653 editor.c:730 rui.c:1065 + msgid "Help" +-msgstr "" ++msgstr "" + + #: dataentry.c:1561 + msgid "Copy selected cell" +-msgstr "" ++msgstr "" + + #: dataentry.c:1562 + msgid "Paste to selected cell" +-msgstr "" ++msgstr "" + + #: dataentry.c:1563 + msgid "Autosize column" +-msgstr "" ++msgstr "" + + #: dataentry.c:1565 pager.c:295 rui.c:785 + #: ../library/grDevices/src/devWindows.c:1595 + msgid "Stay on top" +-msgstr "" ++msgstr "" + + #: dataentry.c:1567 dataentry.c:1645 pager.c:297 pager.c:460 + msgid "Close" +-msgstr "" ++msgstr "" + + #: dataentry.c:1617 + msgid "Data Editor" +-msgstr "" ++msgstr "" + + #: dataentry.c:1643 editor.c:676 pager.c:452 rui.c:1013 + #: ../library/grDevices/src/devWindows.c:1540 + msgid "File" +-msgstr "" ++msgstr "" + + #: dataentry.c:1647 editor.c:694 pager.c:462 rui.c:1034 + msgid "Edit" +-msgstr "" ++msgstr "" + + #: dataentry.c:1648 + msgid "Copy \tCTRL+C" +-msgstr " \tCTRL+C" ++msgstr " \tCTRL+C" + + #: dataentry.c:1649 + msgid "Paste \tCTRL+V" +-msgstr " \tCTRL+V" ++msgstr " \tCTRL+V" + + #: dataentry.c:1650 + msgid "Delete\tDEL" +-msgstr "\tDEL" ++msgstr "\tDEL" + + #: dataentry.c:1652 + msgid "Cell widths ..." +-msgstr "..." ++msgstr "..." + + #: dataentry.c:1654 + msgid "Data editor" +-msgstr "" ++msgstr "" + + #: editor.c:449 pager.c:172 pager.c:192 + msgid "No RGui console to paste to" +-msgstr "RGui" ++msgstr "RGui" + + #: editor.c:551 + msgid "R EDITOR\n" +-msgstr "R\n" ++msgstr "R\n" + + #: editor.c:553 + msgid "A standard text editor for editing and running R code.\n" +-msgstr "R\n" ++msgstr "R\n" + + #: editor.c:555 + msgid "RUNNING COMMANDS\n" +-msgstr "\n" ++msgstr "\n" + + #: editor.c:556 + msgid "To run a line or section of R code, select the code and either\n" +-msgstr "R, \n" ++msgstr "R, \n" + + #: editor.c:557 + msgid " Press Ctrl-R\n" +-msgstr " Ctrl-R\n" ++msgstr " Ctrl-R\n" + + #: editor.c:558 + msgid " Select \"Run line or selection\" from the \"Edit\" menu\n" +-msgstr " \"Edit\"\"Run line or selection\"\n" ++msgstr " \"Edit\"\"Run line or selection\"\n" + + #: editor.c:559 + msgid " Press the \"Run line or selection\" icon on the toolbar\n" +-msgstr " \"Run line or selection\"\n" ++msgstr " \"Run line or selection\"\n" + + #: editor.c:560 + msgid "" + "This will copy the selected commands to the console and evaluate them.\n" +-msgstr "\n" ++msgstr "\n" + + #: editor.c:561 + msgid "" + "If there is no selection, this will just run the current line and advance\n" +-msgstr "\n" ++msgstr "\n" + + #: editor.c:562 + msgid "the cursor by one line.\n" +-msgstr "\n" ++msgstr "\n" + + #: editor.c:574 editor.c:649 editor.c:710 + msgid "Run line or selection" +-msgstr "" ++msgstr "" + + #: editor.c:576 editor.c:695 + msgid "Undo" +-msgstr "" ++msgstr "" + + #: editor.c:578 editor.c:698 + msgid "Cut" +-msgstr "" ++msgstr "" + + #: editor.c:579 editor.c:700 pager.c:290 pager.c:463 rui.c:775 rui.c:978 + #: rui.c:1035 + msgid "Copy" +-msgstr "" ++msgstr "" + + #: editor.c:580 editor.c:702 rui.c:776 rui.c:982 rui.c:1036 + msgid "Paste" +-msgstr "" ++msgstr "" + + #: editor.c:581 editor.c:704 + msgid "Delete" +-msgstr "" ++msgstr "" + + #: editor.c:583 editor.c:706 pager.c:293 pager.c:469 rui.c:782 rui.c:1040 + msgid "Select all" +-msgstr "" ++msgstr "" + + #: editor.c:641 pager.c:416 rui.c:966 + msgid "Open script" +-msgstr "" ++msgstr "" + + #: editor.c:645 + msgid "Save script" +-msgstr "" ++msgstr "" + + #: editor.c:653 pager.c:436 ../library/grDevices/src/devWindows.c:1508 + msgid "Return focus to Console" +-msgstr "" ++msgstr "" + + #: editor.c:656 + msgid "Print script" +-msgstr "" ++msgstr "" + + #: editor.c:658 pager.c:431 rui.c:994 + #: ../library/grDevices/src/devWindows.c:1502 + msgid "Print" +-msgstr "" ++msgstr "" + + #: editor.c:677 pager.c:453 rui.c:1015 + msgid "New script" +-msgstr "" ++msgstr "" + + #: editor.c:679 pager.c:454 rui.c:1016 + msgid "Open script..." +-msgstr "..." ++msgstr "..." + + #: editor.c:681 preferences.c:788 + msgid "Save" +-msgstr "" ++msgstr "" + + #: editor.c:683 + msgid "Save as..." +-msgstr "..." ++msgstr "..." + + #: editor.c:686 pager.c:455 rui.c:1029 + #: ../library/grDevices/src/devWindows.c:1598 + msgid "Print..." +-msgstr "..." ++msgstr "..." + + #: editor.c:689 + msgid "Close script" +-msgstr "" ++msgstr "" + + #: editor.c:708 rui.c:1041 + msgid "Clear console" +-msgstr "" ++msgstr "" + + #: editor.c:712 + msgid "Run all" +-msgstr "" ++msgstr "" + + #: editor.c:715 + msgid "Find..." +-msgstr "..." ++msgstr "..." + + #: editor.c:717 + msgid "Replace..." +-msgstr "..." ++msgstr "..." + + #: editor.c:720 rui.c:1045 + msgid "GUI preferences..." +-msgstr "GUI..." ++msgstr "GUI..." + + #: editor.c:731 + msgid "Editor" +-msgstr "" ++msgstr "" + + #: editor.c:788 + msgid "Maximum number of editors reached" +-msgstr "" ++msgstr "" + + #: editor.c:793 + msgid "Unable to create editor window" +-msgstr "" ++msgstr "" + + #: editor.c:802 + msgid "Untitled" +-msgstr "" ++msgstr "" + + #: extra.c:804 preferences.c:790 graphapp/dialogs.c:505 graphapp/dialogs.c:600 + msgid "OK" +-msgstr "" ++msgstr "" + + #: extra.c:805 preferences.c:791 graphapp/dialogs.c:479 graphapp/dialogs.c:503 + #: graphapp/dialogs.c:509 graphapp/dialogs.c:584 graphapp/dialogs.c:598 + #: graphapp/dialogs.c:604 + msgid "Cancel" +-msgstr "" ++msgstr "" + + #: pager.c:78 + msgid "Error opening file" +-msgstr "" ++msgstr "" + + #: pager.c:85 + msgid "Insufficient memory to display file in internal pager" +-msgstr "" ++msgstr "" + + #: pager.c:164 pager.c:176 pager.c:196 rui.c:225 rui.c:252 + msgid "No selection" +-msgstr "" ++msgstr "" + + #: pager.c:291 pager.c:421 pager.c:465 + msgid "Paste to console" +-msgstr "" ++msgstr "" + + #: pager.c:292 pager.c:426 pager.c:467 + msgid "Paste commands to console" +-msgstr "" ++msgstr "" + + #: pager.c:457 rui.c:1030 + msgid "Save to File..." +-msgstr "..." ++msgstr "..." + + #: pager.c:472 + msgid "View" +-msgstr "" ++msgstr "" + + #: pager.c:501 + msgid "Unable to create pager window" +-msgstr "" ++msgstr "" + + #: preferences.c:243 + msgid "" +@@ -548,9 +548,9 @@ msgid "" + "\n" + "Save the preferences and restart Rgui to apply them.\n" + msgstr "" +-"\n" ++"\n" + "\n" +-"Rgui\n" ++"Rgui\n" + + #: preferences.c:247 + msgid "" +@@ -559,418 +559,417 @@ msgid "" + "\n" + "Save the preferences and restart Rgui to apply to menus.\n" + msgstr "" +-"\n" ++"\n" + "\n" +-"Rgui\n" ++"Rgui\n" + + #: preferences.c:316 + msgid "Changes in pager size will not apply to any open pagers" +-msgstr "" ++msgstr "" + + #: preferences.c:322 + msgid "" + "Do not change pager type if any pager is open\n" + "Proceed?" +-msgstr "" +-"\n" +-"" ++msgstr "\n" ++"" + + #: preferences.c:349 + msgid "Select directory for file 'Rconsole'" +-msgstr "Rconsole" ++msgstr "Rconsole" + + #: preferences.c:440 + msgid "Select 'Rconsole' file" +-msgstr "'Rconsole'" ++msgstr "'Rconsole'" + + #: preferences.c:635 + #, c-format + msgid "Error at line %d of file %s" +-msgstr "%2$s%1$d" ++msgstr "%2$s%1$d" + + #: preferences.c:678 + msgid "Rgui Configuration Editor" +-msgstr "Rgui" ++msgstr "Rgui" + + #: preferences.c:787 + msgid "Apply" +-msgstr "" ++msgstr "" + + #: preferences.c:789 + msgid "Load" +-msgstr "" ++msgstr "" + + #: rui.c:124 + msgid "Select file to source" +-msgstr "" ++msgstr "" + + #: rui.c:145 + msgid "Select image to load" +-msgstr "" ++msgstr "" + + #: rui.c:160 + msgid "Save image in" +-msgstr "" ++msgstr "" + + #: rui.c:175 + msgid "Load history from" +-msgstr "" ++msgstr "" + + #: rui.c:184 + msgid "Save history in" +-msgstr "" ++msgstr "" + + #: rui.c:234 rui.c:243 + msgid "No text available" +-msgstr "" ++msgstr "" + + #: rui.c:292 + msgid "Name of data frame or matrix" +-msgstr "" ++msgstr "" + + #: rui.c:299 + #, c-format + msgid "'%s' cannot be found" +-msgstr "'%s'" ++msgstr "'%s'" + + #: rui.c:365 + msgid "Are you sure?" +-msgstr "?" ++msgstr "?" + + #: rui.c:446 + msgid "Help on" +-msgstr "" ++msgstr "" + + #: rui.c:497 + msgid "Search help" +-msgstr "" ++msgstr "" + + #: rui.c:512 + msgid "Search for words in help list archives and documentation" +-msgstr "" ++msgstr "" + + #: rui.c:527 + msgid "Apropos" +-msgstr "" ++msgstr "" + + #: rui.c:771 + msgid "Can only drag-and-drop .R, .RData and .rda files" +-msgstr "-.R.RData.rda" ++msgstr "-.R.RData.rda" + + #: rui.c:777 rui.c:1037 + msgid "Paste commands only" +-msgstr "" ++msgstr "" + + #: rui.c:778 rui.c:986 + msgid "Copy and paste" +-msgstr "" ++msgstr "" + + #: rui.c:780 + msgid "Clear window" +-msgstr "" ++msgstr "" + + #: rui.c:784 rui.c:1054 + msgid "Buffered output" +-msgstr "" ++msgstr "" + + #: rui.c:824 + msgid "Packages" +-msgstr "" ++msgstr "" + + #: rui.c:825 + msgid "Load package..." +-msgstr "..." ++msgstr "..." + + #: rui.c:827 + msgid "Set CRAN mirror..." +-msgstr "CRAN..." ++msgstr "CRAN..." + + #: rui.c:829 + msgid "Select repositories..." +-msgstr "..." ++msgstr "..." + + #: rui.c:831 + msgid "Install package(s)..." +-msgstr "..." ++msgstr "..." + + #: rui.c:833 + msgid "Update packages..." +-msgstr "..." ++msgstr "..." + + #: rui.c:836 + msgid "Install package(s) from local zip files..." +-msgstr "zip..." ++msgstr "zip..." + + #: rui.c:864 + msgid "FAQ on R" +-msgstr "RFAQ" ++msgstr "RFAQ" + + #: rui.c:866 + msgid "FAQ on R for &Windows" +-msgstr "WindowsRFAQ" ++msgstr "WindowsRFAQ" + + #: rui.c:872 rui.c:875 + msgid "Manuals (in PDF)" +-msgstr "(PDF)" ++msgstr "(PDF)" + + #: rui.c:902 + msgid "R functions (text)..." +-msgstr "R()..." ++msgstr "R()..." + + #: rui.c:904 + msgid "Html help" +-msgstr "Html" ++msgstr "Html" + + #: rui.c:906 + msgid "Search help..." +-msgstr "..." ++msgstr "..." + + #: rui.c:911 + msgid "Apropos..." +-msgstr "..." ++msgstr "..." + + #: rui.c:913 + msgid "R Project home page" +-msgstr "R" ++msgstr "R" + + #: rui.c:914 + msgid "CRAN home page" +-msgstr "CRAN" ++msgstr "CRAN" + + #: rui.c:916 + msgid "About" +-msgstr "" ++msgstr "" + + #: rui.c:970 + msgid "Load image" +-msgstr "" ++msgstr "" + + #: rui.c:974 + msgid "Save image" +-msgstr "" ++msgstr "" + + #: rui.c:990 + msgid "Stop current computation" +-msgstr "" ++msgstr "" + + #: rui.c:1014 + msgid "Source R code..." +-msgstr "R..." ++msgstr "R..." + + #: rui.c:1017 + msgid "Display file(s)..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1019 + msgid "Load Workspace..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1020 + msgid "Save Workspace..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1022 + msgid "Load History..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1024 + msgid "Save History..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1027 + msgid "Change dir..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1032 + msgid "Exit" +-msgstr "" ++msgstr "" + + #: rui.c:1039 + msgid "Copy and Paste" +-msgstr "" ++msgstr "" + + #: rui.c:1043 + msgid "Data editor..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1047 + msgid "Misc" +-msgstr "" ++msgstr "" + + #: rui.c:1048 + msgid "Stop current computation \tESC" +-msgstr " \tESC" ++msgstr " \tESC" + + #: rui.c:1050 + msgid "Stop all computations" +-msgstr "" ++msgstr "" + + #: rui.c:1052 + msgid "Break to debugger" +-msgstr "" ++msgstr "" + + #: rui.c:1056 + msgid "List objects" +-msgstr "" ++msgstr "" + + #: rui.c:1057 + msgid "Remove all objects" +-msgstr "" ++msgstr "" + + #: rui.c:1058 + msgid "List &search path" +-msgstr "" ++msgstr "" + + #: rui.c:1066 + msgid "Console" +-msgstr "" ++msgstr "" + + #: rui.c:1103 + msgid "Select file" +-msgstr "" ++msgstr "" + + #: rui.c:1146 + msgid "'mname' is limited to 1000 bytes" +-msgstr "'mname'1000" ++msgstr "'mname'1000" + + #: rui.c:1188 + #, c-format + msgid "menu %s does not exist" +-msgstr "%s" ++msgstr "%s" + + #: rui.c:1242 + msgid "'menu' is limited to 500 bytes" +-msgstr "'menu'500" ++msgstr "'menu'500" + + #: rui.c:1252 + msgid "base menu does not exist" +-msgstr "" ++msgstr "" + + #: rui.c:1267 + msgid "failed to allocate menu" +-msgstr "" ++msgstr "" + + #: rui.c:1283 rui.c:1404 + msgid "menu + item is limited to 1000 bytes" +-msgstr "?1000" ++msgstr "1000" + + #: rui.c:1291 rui.c:1373 + msgid "menu does not exist" +-msgstr "" ++msgstr "" + + #: rui.c:1309 rui.c:1332 rui.c:1337 + msgid "failed to allocate char storage" +-msgstr "" ++msgstr "" + + #: rui.c:1345 + msgid "failed to allocate menuitem" +-msgstr "" ++msgstr "" + + #: rui.c:1394 + msgid "menu not found" +-msgstr "" ++msgstr "" + + #: rui.c:1412 + msgid "menu or item does not exist" +-msgstr "" ++msgstr "" + + #: system.c:400 + msgid "Save workspace image?" +-msgstr "?" ++msgstr "?" + + #: graphapp/clipboard.c:70 graphapp/clipboard.c:74 + msgid "Insufficient memory: cell not copied to the clipboard" +-msgstr ": " ++msgstr ": " + + #: graphapp/dialogs.c:135 graphapp/dialogs.c:152 graphapp/dialogs.c:169 + msgid "Question" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:189 + msgid " Change working directory to:" +-msgstr " " ++msgstr " " + + #: graphapp/dialogs.c:192 + #, c-format + msgid "Unable to set '%s' as working directory" +-msgstr "'%s'" ++msgstr "'%s'" + + #: graphapp/dialogs.c:400 + msgid "Choose a folder" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:492 graphapp/dialogs.c:494 + msgid "Browse" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:592 + msgid "User" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:593 + msgid "Password" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:754 graphapp/dialogs.c:760 + #, c-format + msgid "\"%s\" not found" +-msgstr "\"%s\"" ++msgstr "\"%s\"" + + #: graphapp/gmenus.c:48 + msgid "Windows" +-msgstr "" ++msgstr "" + + #: graphapp/gmenus.c:49 + msgid "Cascade" +-msgstr "" ++msgstr "" + + #: graphapp/gmenus.c:50 + msgid "Tile" +-msgstr "" ++msgstr "" + + #: graphapp/gmenus.c:51 + msgid "Arrange Icons" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:848 + msgid "Png files (*.png)" +-msgstr "Png(*.png)" ++msgstr "Png(*.png)" + + #: ../library/grDevices/src/devWindows.c:849 + msgid "Portable network graphics file" +-msgstr "Portable network graphics" ++msgstr "Portable network graphics" + + #: ../library/grDevices/src/devWindows.c:851 + msgid "Windows bitmap files (*.bmp)" +-msgstr "Windows bitmap(*.bmp)" ++msgstr "Windows bitmap(*.bmp)" + + #: ../library/grDevices/src/devWindows.c:852 + msgid "Windows bitmap file" +-msgstr "Windows bitmap" ++msgstr "Windows bitmap" + + #: ../library/grDevices/src/devWindows.c:854 + msgid "Jpeg files (*.jpeg,*jpg)" +-msgstr "Jpeg(*.jpeg,*jpg)" ++msgstr "Jpeg(*.jpeg,*jpg)" + + #: ../library/grDevices/src/devWindows.c:855 + msgid "Jpeg file" +-msgstr "Jpeg" ++msgstr "Jpeg" + + #: ../library/grDevices/src/devWindows.c:875 + msgid "Postscript files (*.ps)" +-msgstr "Postscript(*.ps)" ++msgstr "Postscript(*.ps)" + + #: ../library/grDevices/src/devWindows.c:876 + msgid "Postscript file" +-msgstr "Postscript" ++msgstr "Postscript" + + #: ../library/grDevices/src/devWindows.c:887 + msgid "PDF files (*.pdf)" +-msgstr "PDF(*.pdf)" ++msgstr "PDF(*.pdf)" + + #: ../library/grDevices/src/devWindows.c:888 + msgid "PDF file" +-msgstr "PDF" ++msgstr "PDF" + + #: ../library/grDevices/src/devWindows.c:899 + msgid "Enhanced metafiles (*.emf)" +@@ -983,53 +982,53 @@ msgstr "Enhanced metafiles" + #: ../library/grDevices/src/devWindows.c:903 + #: ../library/grDevices/src/devWindows.c:2721 + msgid "file path selected is too long: only 512 bytes are allowed" +-msgstr "512" ++msgstr "512" + + #: ../library/grDevices/src/devWindows.c:1119 + msgid "No plot to replace!" +-msgstr "!" ++msgstr "!" + + #: ../library/grDevices/src/devWindows.c:1165 + msgid "Variable name" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1172 + msgid "Variable doesn't exist or doesn't contain any plots!" +-msgstr "!" ++msgstr "!" + + #: ../library/grDevices/src/devWindows.c:1188 + msgid "Name of variable to save to" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1496 + msgid "Copy to the clipboard as a metafile" +-msgstr "metafile" ++msgstr "metafile" + + #: ../library/grDevices/src/devWindows.c:1514 + #: ../library/grDevices/src/devWindows.c:1525 + msgid "Stop locator" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1524 + #: ../library/grDevices/src/devWindows.c:1528 + msgid "Stop" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1530 + msgid "Continue" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1534 + msgid "Next" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1535 + msgid "Next plot" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1541 + msgid "Save as" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1542 + msgid "Metafile..." +@@ -1057,115 +1056,116 @@ msgstr "Jpeg" + + #: ../library/grDevices/src/devWindows.c:1548 + msgid "50% quality..." +-msgstr "50% ..." ++msgstr "50% ..." + + #: ../library/grDevices/src/devWindows.c:1549 + msgid "75% quality..." +-msgstr "75% ..." ++msgstr "75% ..." + + #: ../library/grDevices/src/devWindows.c:1550 + msgid "100% quality..." +-msgstr "100% ..." ++msgstr "100% ..." + + #: ../library/grDevices/src/devWindows.c:1551 + msgid "Copy to the clipboard" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1552 + msgid "as a Bitmap\tCTRL+C" +-msgstr "Bitmap\tCTRL+C" ++msgstr "Bitmap\tCTRL+C" + + #: ../library/grDevices/src/devWindows.c:1553 + msgid "as a Metafile\tCTRL+W" +-msgstr "Metafile\tCTRL+W" ++msgstr "Metafile\tCTRL+W" + + #: ../library/grDevices/src/devWindows.c:1556 + msgid "Print...\tCTRL+P" +-msgstr "...\tCTRL+P" ++msgstr "...\tCTRL+P" + + #: ../library/grDevices/src/devWindows.c:1558 + msgid "close Device" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1559 + msgid "History" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1560 + msgid "Recording" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1563 + msgid "Add\tINS" +-msgstr "\tINS" ++msgstr "\tINS" + + #: ../library/grDevices/src/devWindows.c:1564 + msgid "Replace" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1566 + msgid "Previous\tPgUp" +-msgstr "\tPgUp" ++msgstr "\tPgUp" + + #: ../library/grDevices/src/devWindows.c:1567 + msgid "Next\tPgDown" +-msgstr "\tPgDown" ++msgstr "\tPgDown" + + #: ../library/grDevices/src/devWindows.c:1569 + msgid "Save to variable..." +-msgstr "..." ++msgstr "..." + + #: ../library/grDevices/src/devWindows.c:1570 + msgid "Get from variable..." +-msgstr "..." ++msgstr "..." + + #: ../library/grDevices/src/devWindows.c:1572 + msgid "Clear history" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1573 + msgid "Resize" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1574 + msgid "R mode" +-msgstr "R" ++msgstr "R" + + #: ../library/grDevices/src/devWindows.c:1576 + msgid "Fit to window" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1578 + msgid "Fixed size" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1585 + msgid "Copy as metafile" +-msgstr "metafile" ++msgstr "metafile" + + #: ../library/grDevices/src/devWindows.c:1587 + msgid "Copy as bitmap" +-msgstr "bitmap" ++msgstr "bitmap" + + #: ../library/grDevices/src/devWindows.c:1590 + msgid "Save as metafile..." +-msgstr "metafile..." ++msgstr "metafile..." + + #: ../library/grDevices/src/devWindows.c:1592 + msgid "Save as postscript..." +-msgstr "postscript..." ++msgstr "postscript..." + + #: ../library/grDevices/src/devWindows.c:2456 + msgid "Locator is active" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:3032 + msgid "Waiting to confirm page change..." +-msgstr "..." ++msgstr "..." + + #: ../library/grDevices/src/devWindows.c:3044 + msgid "Click or hit ENTER for next page" +-msgstr "ENTER" ++msgstr "ENTER" + + #~ msgid "Select working directory" +-#~ msgstr "" ++#~ msgstr "" ++ +diff -urp R-2.4.0.old/po/R.pot R-2.4.0/po/R.pot +--- R-2.4.0.old/po/R.pot 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/R.pot 2006-10-28 14:36:11.000000000 -0500 +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" + "Language-Team: LANGUAGE <LL(a)li.org>\n" +@@ -83,7 +83,7 @@ msgstr "" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -128,7 +128,7 @@ msgstr "" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -472,7 +472,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1134,7 +1134,7 @@ msgstr "" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1267,156 +1267,156 @@ msgstr "" + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr "" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "" + +@@ -5407,7 +5407,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6017,7 +6017,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6053,19 +6053,19 @@ msgstr "" + msgid "only 0's may be mixed with negative subscripts" + msgstr "" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/ru.gmo and R-2.4.0/po/ru.gmo differ +diff -urp R-2.4.0.old/po/ru.po R-2.4.0/po/ru.po +--- R-2.4.0.old/po/ru.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/ru.po 2006-10-28 14:36:09.000000000 -0500 +@@ -10,7 +10,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.4.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-09-25 03:23-0800\n" + "Last-Translator: Alexey Shipunov <iit512(a)yandex.ru>\n" + "Language-Team: Russian\n" +@@ -87,7 +87,7 @@ msgstr " 'names' R_unlink" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -132,7 +132,7 @@ msgstr " 'names' R_unlink" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -478,7 +478,7 @@ msgid "second argument must be a list" + msgstr " " + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr " " + +@@ -1154,7 +1154,7 @@ msgstr " + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr " NULL " + +@@ -1287,113 +1287,113 @@ msgstr " + msgid "the first argument must be a character vector" + msgstr " " + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "'abbreviate' -ASCII " + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "- " + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr " 'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr " %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr " " + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr " '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr " %d " + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr " %d " + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr " 'pattern' " + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr " 'replacement' " + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr " " + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "- tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr " ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr " ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr " (NA) ." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr " 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr " 'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr " %d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + " agrep() UTF-8 ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr " " + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr " , " + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr " a " + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1401,45 +1401,45 @@ msgstr "" + " \n" + " , , " + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr " 'x' " + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr " 'multiple' TRUE FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr " 'shift' " + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr " 'x' , " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr " '' " + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr " 'x' %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr " 'x' NA" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() " + +@@ -5494,7 +5494,7 @@ msgstr " " + msgid "no input is available" + msgstr " " + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6123,7 +6123,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] (%d) " + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr " " + +@@ -6159,19 +6159,19 @@ msgstr "(subscript) + msgid "only 0's may be mixed with negative subscripts" + msgstr " " + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr " 'CHARSXP'" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr " 'dimnames'" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr " " + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr " -" + +Binary files R-2.4.0.old/po/zh_CN.gmo and R-2.4.0/po/zh_CN.gmo differ +diff -urp R-2.4.0.old/po/zh_CN.po R-2.4.0/po/zh_CN.po +--- R-2.4.0.old/po/zh_CN.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/zh_CN.po 2006-10-28 14:36:12.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2005-05-20 18:26+0800\n" + "Last-Translator: ronggui\n" + "Language-Team: Chinese\n" +@@ -82,7 +82,7 @@ msgstr "'R_unlink''names" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -127,7 +127,7 @@ msgstr "'R_unlink''names" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -471,7 +471,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1135,7 +1135,7 @@ msgstr "size" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "NULL" + +@@ -1268,156 +1268,156 @@ msgstr "split'%s'" + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviateASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "%d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "%d" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "%d" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern'" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement'" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "0" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "(NA)." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old''new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "%d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "UTF-8agrep()ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr "1" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "'x'" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "'multiple'TRUEFALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "'shift'" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "'x'" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "'x', " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "type" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "'x'%d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "'x'NA" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "'x'" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim()" + +@@ -5417,7 +5417,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6039,7 +6039,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] (%d)" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6075,19 +6075,19 @@ msgstr "()" + msgid "only 0's may be mixed with negative subscripts" + msgstr "0" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "'dimnames'" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/zh_TW.gmo and R-2.4.0/po/zh_TW.gmo differ +diff -urp R-2.4.0.old/po/zh_TW.po R-2.4.0/po/zh_TW.po +--- R-2.4.0.old/po/zh_TW.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/zh_TW.po 2006-10-28 14:36:12.000000000 -0500 +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.3.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-04-14 22:49+0800\n" + "Last-Translator: Wei-Lun Chao <chaoweilun(a)pcmail.com.tw>\n" + "Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +@@ -84,7 +84,7 @@ msgstr "R_unlink 'names' " + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -129,7 +129,7 @@ msgstr "R_unlink 'names' " + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -476,7 +476,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1142,7 +1142,7 @@ msgstr "" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "NULL " + +@@ -1276,156 +1276,156 @@ msgstr "split '%s' " + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviate ASCII " + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "'allow_' " + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr " %d " + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "%s" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr " %d " + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr " %d " + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' " + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' " + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr " tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr " ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr " ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "(NA) " + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr " 'old' " + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr " 'new' " + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' 'new' " + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr " %d " + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr " UTF-8 agrep() ASCII " + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr " 1 " + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr " 1 " + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr " 'x' " + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr " 'multiple' TRUE FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr " 'shift' " + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr " 'x' " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "type" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr " 'x' %d " + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr " 'x' NA " + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() " + +@@ -5442,7 +5442,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6073,7 +6073,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] (%d) " + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6109,19 +6109,19 @@ msgstr "() " + msgid "only 0's may be mixed with negative subscripts" + msgstr " 0" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr " CHARSXP " + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr " 'dimnames' " + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +diff -urp R-2.4.0.old/share/make/tests.mk R-2.4.0/share/make/tests.mk +--- R-2.4.0.old/share/make/tests.mk 2006-04-09 17:20:04.000000000 -0500 ++++ R-2.4.0/share/make/tests.mk 2006-10-03 19:41:11.000000000 -0500 +@@ -1,6 +1,6 @@ + ## ${R_HOME}/share/make/tests.mk + +-include $(R_HOME)/etc/Makeconf ++include $(R_HOME)/etc${R_ARCH}/Makeconf + + makevars = + srcdir = . +diff -urp R-2.4.0.old/src/appl/lowess.c R-2.4.0/src/appl/lowess.c +--- R-2.4.0.old/src/appl/lowess.c 2006-04-09 17:19:58.000000000 -0500 ++++ R-2.4.0/src/appl/lowess.c 2006-10-28 14:35:58.000000000 -0500 +@@ -1,7 +1,7 @@ + /* + * R : A Computer Langage for Statistical Data Analysis + * Copyright (C) 1996 Robert Gentleman and Ross Ihaka +- * Copyright (C) 1999-2002 Robert Gentleman, Ross Ihaka and the ++ * Copyright (C) 1999-2006 Robert Gentleman, Ross Ihaka and the + * R Development Core Team + * + * This program is free software; you can redistribute it and/or modify +@@ -132,7 +132,7 @@ void clowess(double *x, double *y, int n + { + int i, iter, j, last, m1, m2, nleft, nright, ns; + Rboolean ok; +- double alpha, c1, c9, cmad, cut, d1, d2, denom, r; ++ double alpha, c1, c9, cmad, cut, d1, d2, denom, r, sc; + + if (n < 2) { + ys[0] = y[0]; return; +@@ -223,9 +223,14 @@ void clowess(double *x, double *y, int n + break; + } + /* residuals */ +- for(i=0; i < n; i++) ++ for(i = 0; i < n; i++) + res[i] = y[i+1] - ys[i+1]; + ++ /* overall scale estimate */ ++ sc = 0.; ++ for(i = 0; i < n; i++) sc += fabs(res[i]); ++ sc /= n; ++ + /* compute robustness weights */ + /* except last time */ + +@@ -234,7 +239,7 @@ void clowess(double *x, double *y, int n + /* Note: The following code, biweight_{6 MAD|Ri|} + is also used in stl(), loess and several other places. + --> should provide API here (MM) */ +- for(i=0 ; i<n ; i++) ++ for(i = 0 ; i < n ; i++) + rw[i] = fabs(res[i]); + + /* Compute cmad := 6 * median(rw[], n) ---- */ +@@ -253,9 +258,11 @@ void clowess(double *x, double *y, int n + #ifdef DEBUG_lowess + REprintf(" cmad = %12g\n", cmad); + #endif ++ if(cmad < 1e-7 * sc) /* effectively zero */ ++ break; + c9 = 0.999*cmad; + c1 = 0.001*cmad; +- for(i=0 ; i<n ; i++) { ++ for(i = 0 ; i < n ; i++) { + r = fabs(res[i]); + if (r <= c1) + rw[i] = 1.; +diff -urp R-2.4.0.old/src/gnuwin32/CHANGES R-2.4.0/src/gnuwin32/CHANGES +--- R-2.4.0.old/src/gnuwin32/CHANGES 2006-09-26 21:05:12.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/CHANGES 2006-11-02 10:45:46.000000000 -0600 +@@ -4,6 +4,30 @@ + See the file NEWS for changes that affect all versions of R. + + ++R 2.4.0 patched ++=============== ++ ++Inno Setup >= 5.1.7 is now required to build the installer. ++ ++Reverted 2.4.0 change that required case-sensitive specification of ++commands to R CMD. ++ ++The Simplified Chinese messages were in the wrong format, causing ++R to crash on startup. (PR#9277) ++ ++The pointsize of fonts in the windows() graphics device may now be set to ++any positive integer. ++ ++Building customized installers failed because the startup options ++weren't being handled properly. ++ ++If Rconsole settings were such that R could not start properly, it ++crashed. It now suggests starting with the --vanilla option, which now ++does not load Rconsole. Additionally, an option --no-Rconsole has ++been added for completeness and debugging. ++ ++ ++ + R 2.4.0 + ======= + +@@ -15,7 +39,7 @@ file and (for future sessions) from the + + The installer can set defaults for MDI/SDI display, help style, and + use of the --internet2 startup option. Custom builds of R can change +-these defaults. ++these defaults. The standard build now defaults to CHM help. + + If CHM help is selected, but is not present (e.g. a package was cross- + compiled on Unix), the help system defaults to text help. +diff -urp R-2.4.0.old/src/gnuwin32/fixed/bin/INSTALL R-2.4.0/src/gnuwin32/fixed/bin/INSTALL +--- R-2.4.0.old/src/gnuwin32/fixed/bin/INSTALL 2006-09-04 09:41:36.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/fixed/bin/INSTALL 2006-10-28 14:35:59.000000000 -0500 +@@ -26,7 +26,7 @@ use R::Dcf; + use R::Utils; + + +-my $revision = ' $Rev: 37712 $ '; ++my $revision = ' $Rev: 39671 $ '; + my $version; + my $name; + $revision =~ / ([\d\.]*) /; +@@ -250,7 +250,11 @@ foreach $pkg (@ARGV){ + if (open pkgdescin, "< $pkg/$ppkg/DESCRIPTION.in") { + ## the Unix version of INSTALL does discard blank lines, + ## although ?read.dcf does not allow them. +- while(<pkgdescin>) { print pkgdesc $_ if $_ =~ /\S/; } ++ while(<pkgdescin>) { ++ ## this is to cope with possibly missing final NL ++ chomp; ++ print pkgdesc "$_\n" if $_ =~ /\S/; ++ } + close pkgdescin; + } else { + print "no DESCRIPTION.in found for package $ppkg\n"; +Only in R-2.4.0.old/src/gnuwin32/fixed: dobundle.pl +diff -urp R-2.4.0.old/src/gnuwin32/front-ends/rcmdfn.c R-2.4.0/src/gnuwin32/front-ends/rcmdfn.c +--- R-2.4.0.old/src/gnuwin32/front-ends/rcmdfn.c 2006-09-07 21:05:22.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/front-ends/rcmdfn.c 2006-10-28 14:35:59.000000000 -0500 +@@ -291,20 +291,6 @@ int rcmdfn (int cmdarg, int argc, char * + } else if (!strcmp(".bat", p + strlen(p) - 4)) strcpy(cmd, ""); + else if (!strcmp(".exe", p + strlen(p) - 4)) strcpy(cmd, ""); + else { +- WIN32_FIND_DATA find_data; +- HANDLE fh; +- char tmp[MAX_PATH]; +- strcpy(tmp, RHome); strcat(tmp, "/bin/"); strcat(tmp, p); +- fh = FindFirstFile(tmp, &find_data); +- if (fh == INVALID_HANDLE_VALUE) { +- fprintf(stderr, "no Perl script '%s'\n", p); +- return(28); +- } +- if(strcmp(p, find_data.cFileName)) { +- fprintf(stderr, "no Perl script '%s'\n", p); +- return(28); +- } +- FindClose(fh); + strcpy(cmd, "perl "); + strcat(cmd, RHome); strcat(cmd, "/bin/"); + } +diff -urp R-2.4.0.old/src/gnuwin32/front-ends/rgui.c R-2.4.0/src/gnuwin32/front-ends/rgui.c +--- R-2.4.0.old/src/gnuwin32/front-ends/rgui.c 2006-09-04 09:41:35.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/front-ends/rgui.c 2006-10-29 10:45:44.000000000 -0600 +@@ -29,6 +29,7 @@ extern void cmdlineoptions(int, char **) + extern int setupui(void); + extern void Rf_mainloop(void); + __declspec(dllimport) extern UImode CharacterMode; ++extern void GA_exitapp(void); + + extern char *getDLLVersion(); + +@@ -48,7 +49,11 @@ int AppMain (int argc, char **argv) + exit(1); + } + cmdlineoptions(argc, argv); +- setupui(); ++ if (!setupui()) { ++ MessageBox(0, "Error setting up console. Try --vanilla option.", ++ "Terminating", MB_TASKMODAL | MB_ICONSTOP | MB_OK); ++ GA_exitapp(); ++ } + Rf_mainloop(); + /* NOTREACHED */ + return 0; +diff -urp R-2.4.0.old/src/gnuwin32/installer/JRins.pl R-2.4.0/src/gnuwin32/installer/JRins.pl +--- R-2.4.0.old/src/gnuwin32/installer/JRins.pl 2006-09-21 21:05:08.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/installer/JRins.pl 2006-10-03 19:41:11.000000000 -0500 +@@ -78,6 +78,7 @@ Name: br; MessagesFile: "compiler:Langua + Name: ca; MessagesFile: "compiler:Languages\\Catalan.isl" + Name: cz; MessagesFile: "compiler:Languages\\Czech.isl" + Name: dk; MessagesFile: "compiler:Languages\\Danish.isl" ++Name: es; MessagesFile: "compiler:Languages\\Spanish.isl" + Name: nl; MessagesFile: "compiler:Languages\\Dutch.isl" + Name: fr; MessagesFile: "compiler:Languages\\French.isl" + Name: fi; MessagesFile: "compiler:Languages\\Finnish.isl" +@@ -93,7 +94,6 @@ Name: chs; MessagesFile: "ChineseSimp.is + Name: cht; MessagesFile: "ChineseTrad.isl" + Name: ja; MessagesFile: "Japanese.isl" + Name: ko; MessagesFile: "Korean.isl" +-Name: es; MessagesFile: "SpanishStd.isl" + + #include "CustomMsg.txt" + +diff -urp R-2.4.0.old/src/gnuwin32/installer/Makefile R-2.4.0/src/gnuwin32/installer/Makefile +--- R-2.4.0.old/src/gnuwin32/installer/Makefile 2006-09-04 09:41:38.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/installer/Makefile 2006-10-28 14:35:59.000000000 -0500 +@@ -79,12 +79,11 @@ endif + # + # files to make source packages + $(MKDIR) -p $(RPREFIX)/share \ +- $(RPREFIX)/src/library $(RPREFIX)/src/gnuwin32/fixed ++ $(RPREFIX)/src/library $(RPREFIX)/src/gnuwin32 + $(CP) $(R_HOME)/doc/html/logo.jpg $(RPREFIX)/doc/html + $(CP) $(R_HOME)/doc/KEYWORDS* $(RPREFIX)/doc + $(CP) -p $(foreach i,$(GW32_FILES),../$i) $(RPREFIX)/src/gnuwin32 + $(SED) -e s/@RVER@/$(RVER)/g ../Makefile.packages > $(RPREFIX)/src/gnuwin32/Makefile +- $(CP) ../fixed/dobundle.pl $(RPREFIX)/src/gnuwin32/fixed + $(CP) -pr ../help ../check $(RPREFIX)/src/gnuwin32 + $(RM) $(RPREFIX)/src/gnuwin32/help/*.c \ + $(RPREFIX)/src/gnuwin32/help/MkChmDll +@@ -155,5 +154,5 @@ myR: + @(cd $(IMAGEDIR); echo "tools:::.installMD5sums(\".\")" | \ + R_DEFAULT_PACKAGES=NULL LC_COLLATE=C R_OSTYPE=windows \ + bin/Rterm.exe --vanilla --slave) +- perl JRins.pl $(RPREFIX) $(IMAGEDIR) ++ perl JRins.pl $(RPREFIX) $(IMAGEDIR) $(MDISDI) $(HelpStyle) $(Internet) + "$(ISDIR)/iscc" R.iss > myR.log +Only in R-2.4.0.old/src/gnuwin32/installer: SpanishStd.isl +diff -urp R-2.4.0.old/src/gnuwin32/Makefile R-2.4.0/src/gnuwin32/Makefile +--- R-2.4.0.old/src/gnuwin32/Makefile 2006-09-06 21:05:05.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/Makefile 2006-10-28 14:36:00.000000000 -0500 +@@ -421,9 +421,10 @@ distclean: clean clean-recommended + $(RM) ../../doc/html/search/index.txt ../../doc/html/index.html \ + ../../doc/html/packages.html ../../doc/html/rwin.html \ + ../../doc/html/rw-FAQ.html ../../doc/html/search/SearchEngine.html +- $(RM) ../../etc/Rconsole ../../etc/Rdevga ../../etc/Rprofile.site \ +- ../../etc/rgb.txt ../../share/make/wintests.mk \ +- ../include/Platform.h ../../tests/*.Rout ../../tests/*.Rout.fail ++ $(RM) ../../etc/Makeconf ../../etc/Rconsole ../../etc/Rdevga \ ++ ../../etc/Rprofile.site ../../etc/rgb.txt \ ++ ../../share/make/wintests.mk \ ++ ../../tests/*.Rout ../../tests/*.Rout.fail + $(MAKE) -C fixed distclean + $(MAKE) -C ../include -f Makefile.win distclean + -$(MAKE) -C installer distclean +diff -urp R-2.4.0.old/src/gnuwin32/preferences.c R-2.4.0/src/gnuwin32/preferences.c +--- R-2.4.0.old/src/gnuwin32/preferences.c 2006-09-16 21:05:15.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/preferences.c 2006-10-29 10:45:44.000000000 -0600 +@@ -785,8 +785,8 @@ static void showDialog(Gui gui) + setlistitem(highlightcol, rgbtonum(gui->hlt)); + + bApply = newbutton(G_("Apply"), rect(50, 410, 70, 25), apply); +- bSave = newbutton(G_("Save"), rect(130, 410, 70, 25), save); +- bLoad = newbutton(G_("Load"), rect(210, 410, 70, 25), load); ++ bSave = newbutton(G_("Save..."), rect(130, 410, 70, 25), save); ++ bLoad = newbutton(G_("Load..."), rect(210, 410, 70, 25), load); + bOK = newbutton(G_("OK"), rect(350, 410, 70, 25), ok); + bCancel = newbutton(G_("Cancel"), rect(430, 410, 70, 25), cancel); + show(wconfig); +diff -urp R-2.4.0.old/src/gnuwin32/rui.c R-2.4.0/src/gnuwin32/rui.c +--- R-2.4.0.old/src/gnuwin32/rui.c 2006-09-21 21:05:08.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/rui.c 2006-10-29 10:45:44.000000000 -0600 +@@ -54,6 +54,7 @@ console RConsole = NULL; + #ifdef USE_MDI + int RguiMDI = RW_MDI | RW_TOOLBAR | RW_STATUSBAR; + int MDIset = 0; ++int R_LoadRconsole = 1; + window RFrame; + rect MDIsize; + #endif +@@ -664,25 +665,25 @@ void readconsolecfg() + + struct structGUI gui; + +- gui.crows = 32; +- gui.ccols = 90; ++ gui.crows = 25; ++ gui.ccols = 80; + gui.cx = gui.cy = 0; + gui.grx = Rwin_graphicsx; + gui.gry = Rwin_graphicsy; + gui.bg = White; +- gui.fg = Black; ++ gui.fg = DarkBlue; + gui.user = gaRed; + gui.hlt = DarkRed; + gui.prows = 25; + gui.pcols = 80; + gui.pagerMultiple = 0; +- gui.cbb = 64*1024; +- gui.cbl = 8*1024; ++ gui.cbb = 65000; ++ gui.cbl = 8000; + gui.setWidthOnResize = 1; +- strcpy(gui.font, "FixedFont"); ++ strcpy(gui.font, "Courier New"); + strcpy(gui.style, "normal"); +- gui.tt_font = 0; +- gui.pointsize = 12; ++ gui.tt_font = 1; ++ gui.pointsize = 10; + strcpy(gui.language, ""); + gui.buffered = 1; + +@@ -693,13 +694,15 @@ void readconsolecfg() + + gui.MDIsize = rect(0, 0, 0, 0); + #endif +- sprintf(optf, "%s/Rconsole", getenv("R_USER")); +- if (!loadRconsole(&gui, optf)) { +- sprintf(optf, "%s/etc/Rconsole", getenv("R_HOME")); ++ if (R_LoadRconsole) { ++ sprintf(optf, "%s/Rconsole", getenv("R_USER")); + if (!loadRconsole(&gui, optf)) { +- app_cleanup(); +- RConsole = NULL; +- exit(10); ++ sprintf(optf, "%s/etc/Rconsole", getenv("R_HOME")); ++ if (!loadRconsole(&gui, optf)) { ++ app_cleanup(); ++ RConsole = NULL; ++ exit(10); ++ } + } + } + if (gui.tt_font) { +diff -urp R-2.4.0.old/src/gnuwin32/rui.h R-2.4.0/src/gnuwin32/rui.h +--- R-2.4.0.old/src/gnuwin32/rui.h 2006-09-04 21:05:03.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/rui.h 2006-10-29 10:45:44.000000000 -0600 +@@ -24,6 +24,7 @@ + #define RW_LARGEICONS 0x1000 + + extern int MDIset; ++extern int R_LoadRconsole; + + #include <R_ext/Boolean.h> + #include <R_ext/libextern.h> +diff -urp R-2.4.0.old/src/include/Makefile.win R-2.4.0/src/include/Makefile.win +--- R-2.4.0.old/src/include/Makefile.win 2006-09-04 09:40:59.000000000 -0500 ++++ R-2.4.0/src/include/Makefile.win 2006-10-28 14:35:50.000000000 -0500 +@@ -78,7 +78,8 @@ Rmath.h: Rmath.h0 + + ## If we do not have svn, get the old file from SVN-REVISION.bak (if poss). + ## This needs to be copy-on-change. +-## We don't get the date from svn info as it is not in GMT. ++## The date from svn info is not in GMT, but we have decided to live ++## with that as they changed the format in svn 1.4.x + ## <FIXME> USE_SVNVERSION does not work if there is no 'svnversion' + FORCE: + $(R_HOME)/SVN-REVISION: FORCE +@@ -95,9 +96,10 @@ else + rm svn-tmp; \ + fi + endif +- @if test -f svn-tmp && test -f "../../.svn/entries" ; then \ +- cdate=`grep committed-date "../../.svn/entries" | sed -n 1p | sed -e 's/^ *committed-date=\"//' -e 's/T.*//'` ; \ +- echo "Last Changed Date: $${cdate}" >> svn-tmp ; \ ++ @if test -f svn-tmp ; then \ ++ (cd ../..; LC_ALL=C TZ=GMT svn info || echo "Last Changed Date: unknown") 2> /dev/null \ ++ | sed -n '/^Last Changed Date:/p' | sed 's/[0-9][0-9]:.*//' \ ++ >> svn-tmp ; \ + else \ + rm -f svn-tmp ; \ + fi +@@ -108,7 +110,7 @@ endif + else \ + cp -p $(R_HOME)/SVN-REVISION.bak $@ 2> /dev/null || \ + (echo "Revision: 00000" > $@; \ +- echo "Last Changed Date: 2005-00-00" >> $@) ; \ ++ echo "Last Changed Date: 2006-00-00" >> $@) ; \ + fi + @rm -f svn-tmp $(R_HOME)/SVN-REVISION.bak + +diff -urp R-2.4.0.old/src/library/base/man/abbreviate.Rd R-2.4.0/src/library/base/man/abbreviate.Rd +--- R-2.4.0.old/src/library/base/man/abbreviate.Rd 2006-09-04 09:41:21.000000000 -0500 ++++ R-2.4.0/src/library/base/man/abbreviate.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -35,6 +35,9 @@ abbreviate(names.arg, minlength = 4, use + + If \code{use.classes} is \code{FALSE} then the only distinction is to + be between letters and space. This has NOT been implemented. ++ ++ There is a limit on 8191 bytes on the elements of \code{names.arg} ++ (after possible coercion). + } + \value{ + A character vector containing abbreviations for the strings in its +diff -urp R-2.4.0.old/src/library/base/man/connections.Rd R-2.4.0/src/library/base/man/connections.Rd +--- R-2.4.0.old/src/library/base/man/connections.Rd 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/base/man/connections.Rd 2006-11-01 19:41:41.000000000 -0600 +@@ -2,6 +2,7 @@ + \alias{connections} + \alias{connection} + \alias{file} ++\alias{clipboard} + \alias{pipe} + \alias{fifo} + \alias{gzfile} +@@ -254,12 +255,13 @@ isIncomplete(con) + in modes \code{"r"} and \code{"w"} only. + #endif + #ifdef unix +- in mode \code{"r"} only. It reads the X11 primary selection, which +- can also be specified as \code{"X11_primary"} and the secondary ++ in mode \code{"r"} only. It reads the X11 primary selection (see ++ \url{http://standards.freedesktop.org/clipboards-spec/clipboards-latest.txt}), ++ which can also be specified as \code{"X11_primary"} and the secondary + selection as \code{"X11_secondary"}. + #endif + +- When the clipboard is opened for reading, the contents are immediately ++ When a clipboard is opened for reading, the contents are immediately + copied to internal storage in the connection. + + #ifdef windows +diff -urp R-2.4.0.old/src/library/base/man/grep.Rd R-2.4.0/src/library/base/man/grep.Rd +--- R-2.4.0.old/src/library/base/man/grep.Rd 2006-09-24 21:05:08.000000000 -0500 ++++ R-2.4.0/src/library/base/man/grep.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -54,11 +54,12 @@ gregexpr(pattern, text, extended = TRUE, + \item{useBytes}{logical. If \code{TRUE} the matching is done + byte-by-byte rather than character-by-character. See Details.} + \item{replacement}{a replacement for matched pattern in \code{sub} and +- \code{gsub}. Coerced to character if possible. This can include +- backreferences \code{"\\1"} to \code{"\\9"} to parenthesized +- subexpressions of \code{pattern}. For \code{perl = TRUE} only, it +- can also contain \code{"\\U"} or \code{"\\L"} to convert the rest of +- the replacement to upper or lower case. ++ \code{gsub}. Coerced to character if possible. For \code{fixed = ++ FALSE} this can include backreferences \code{"\\1"} to ++ \code{"\\9"} to parenthesized subexpressions of \code{pattern}. For ++ \code{perl = TRUE} only, it can also contain \code{"\\U"} or ++ \code{"\\L"} to convert the rest of the replacement to upper or ++ lower case. + } + } + \details{ +diff -urp R-2.4.0.old/src/library/base/man/groupGeneric.Rd R-2.4.0/src/library/base/man/groupGeneric.Rd +--- R-2.4.0.old/src/library/base/man/groupGeneric.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/groupGeneric.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -7,8 +7,6 @@ + \alias{Ops.data.frame} + \alias{Summary} + \alias{Summary.data.frame} +-\alias{Arith} +-\alias{Compare} + \alias{Complex} + \alias{group generic} % used in class.Rd + \concept{group generic} +@@ -120,7 +118,7 @@ Summary(\dots, na.rm = FALSE) + } + This group dispatches on the first argument supplied. + +- \item Group \code{Complex}: ++ \item Group \code{"Complex"}: + \itemize{ + \item \code{Arg}, \code{Conj}, \code{Im}, \code{Mod}, \code{Re} + % do_cmathfuns() [complex.c:267]: if(DispatchGroup("Complex",...)) +diff -urp R-2.4.0.old/src/library/base/man/merge.Rd R-2.4.0/src/library/base/man/merge.Rd +--- R-2.4.0.old/src/library/base/man/merge.Rd 2006-09-27 21:05:07.000000000 -0500 ++++ R-2.4.0/src/library/base/man/merge.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -18,8 +18,7 @@ merge(x, y, \dots) + sort = TRUE, suffixes = c(".x",".y"), \dots) + } + \arguments{ +- \item{x, y}{data frames, or objects to be coerced to one. Neither is +- currently allowed to have zero rows.} ++ \item{x, y}{data frames, or objects to be coerced to one.} + \item{by, by.x, by.y}{specifications of the common columns. See Details.} + \item{all}{logical; \code{all = L} is shorthand for \code{all.x = L} and + \code{all.y = L}.} +diff -urp R-2.4.0.old/src/library/base/man/ns-internal.Rd R-2.4.0/src/library/base/man/ns-internal.Rd +--- R-2.4.0.old/src/library/base/man/ns-internal.Rd 2006-09-07 21:05:19.000000000 -0500 ++++ R-2.4.0/src/library/base/man/ns-internal.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -27,7 +27,7 @@ importIntoEnv(impenv, impnames, expenv, + isBaseNamespace(ns) + namespaceExport(ns, vars) + namespaceImport(self, \dots) +-namespaceImportFrom(self, ns, vars, generics) ++namespaceImportFrom(self, ns, vars, generics, packages) + namespaceImportClasses(self, ns, vars) + namespaceImportMethods(self, ns, vars) + packageHasNamespace(package, package.lib) +@@ -49,6 +49,7 @@ setNamespaceInfo(ns, which, val) + \item{generics}{optional character vector.} + \item{self}{name space environment.} + \item{package}{string naming the package/name space to load.} ++ \item{packages}{vector of package names parallel to \code{generics}.} + \item{package.lib}{character vector specifying library.} + \item{mustExist}{logical.} + \item{genname}{character.} +diff -urp R-2.4.0.old/src/library/base/man/parse.Rd R-2.4.0/src/library/base/man/parse.Rd +--- R-2.4.0.old/src/library/base/man/parse.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/parse.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -36,7 +36,8 @@ parse(file = "", n = NULL, text = NULL, + that is missing the final EOL marker. + + See \code{\link{source}} for the limits on the size of functions +- that can be parsed (by default). ++ that can be parsed (by default). There is also a limit of 8192 bytes ++ on the size of strings which can be parsed. + + When input is taken from the console, \code{n = NULL} is equivalent to + \code{n = 1}, and \code{n < 0} will read until an EOF character is read. +diff -urp R-2.4.0.old/src/library/base/man/regex.Rd R-2.4.0/src/library/base/man/regex.Rd +--- R-2.4.0.old/src/library/base/man/regex.Rd 2006-09-24 21:05:08.000000000 -0500 ++++ R-2.4.0/src/library/base/man/regex.Rd 2006-10-30 10:45:47.000000000 -0600 +@@ -56,7 +56,7 @@ + + The precise way character ranges are interpreted depends on the values + of \code{perl} and \code{ignore.case}. For basic and extended regular +- expressions the the collation order is taken from the OS's ++ expressions the collation order is taken from the OS's + implementation of the setting of the locale category + \code{LC_COLLATE}, so \code{[W-Z]} may include \code{x} and if it + does may or may not include \code{w}. (In most English locales the +diff -urp R-2.4.0.old/src/library/base/man/Rhome.Rd R-2.4.0/src/library/base/man/Rhome.Rd +--- R-2.4.0.old/src/library/base/man/Rhome.Rd 2006-04-09 17:19:27.000000000 -0500 ++++ R-2.4.0/src/library/base/man/Rhome.Rd 2006-10-28 14:35:54.000000000 -0500 +@@ -1,8 +1,9 @@ + \name{R.home} + \alias{R.home} ++\alias{R_HOME} + \title{Return the R Home Directory} + \description{ +- Return the \R home directory. ++ Return the \R home directory. + } + \usage{ + R.home(component="home") +@@ -13,8 +14,19 @@ R.home(component="home") + \code{"etc"} and \code{"share"} giving the paths to the + corresponding parts of an \R installation.} + } ++\details{ ++ The \R home directory is the top-level directory of the \R ++ installation being run. ++ ++ The \R home directory is often referred to as \code{R_HOME}, ++ and is the value of an environment variable of that name in an \R ++ session. ++#ifdef unix ++ It can be found outside an \R session by \code{R \link{RHOME}}. ++#endif ++} + \value{ +- A character string giving the current \R home directory or path to a ++ A character string giving the \R home directory or path to a + particular component. Normally the components are all subdirectories + of the \R home directory, but this may not be the case in a Unix-like + installation. +diff -urp R-2.4.0.old/src/library/base/man/row.names.Rd R-2.4.0/src/library/base/man/row.names.Rd +--- R-2.4.0.old/src/library/base/man/row.names.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/row.names.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -34,10 +34,10 @@ row.names(x) <- value + Prior to \R 2.4.0, row names were character. As from \R 2.4.0, they + are allowed to be integer or character, but for backwards + compatibility \code{row.names} will always return a character vector. +- (Use \code{attr(x, "row.names")} if you need the internal value.) ++ (Use \code{attr(x, "row.names")} if you need the actual value.) + + Using \code{NULL} for the value resets the row names to +- \code{seq(len=nrow(x))}. ++ \code{seq_len(nrow(x))}. + } + \value{ + \code{row.names} returns a character vector. +@@ -49,9 +49,9 @@ row.names(x) <- value + it has a method that calls \code{rownames} for an array argument. + + Row names of the form \code{1:n} for \code{n > 2} are stored +- internally in a compact form, which might be seen by calling +- \code{\link{attributes}} but never via \code{row.names} or +- \code{attr(x, "row.names")}. ++ internally in a compact form, which might be seen from C code or by ++ deparsing but never via \code{row.names} or ++ \code{\link{attr}(x, "row.names")}. + } + \references{ + Chambers, J. M. (1992) +diff -urp R-2.4.0.old/src/library/base/man/source.Rd R-2.4.0/src/library/base/man/source.Rd +--- R-2.4.0.old/src/library/base/man/source.Rd 2006-09-04 09:41:21.000000000 -0500 ++++ R-2.4.0/src/library/base/man/source.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -49,7 +49,7 @@ source(file, local = FALSE, echo = verbo + + If \code{\link{options}}("keep.source") is true (the default), the + source of functions is kept so they can be listed exactly as input. +- This imposes a limit of 128K chars on the function size and a nesting ++ This imposes a limit of 128K bytes on the function size and a nesting + limit of 265. Use \code{option(keep.source = FALSE)} when these + limits might take effect: if exceeded they generate an error. + +@@ -61,7 +61,8 @@ source(file, local = FALSE, echo = verbo + trial encoding. + + Unlike input from a console, lines in the file or on a connection can +- contain an unlimited number of characters. ++ contain an unlimited number of characters. However, there is a limit ++ of 8192 bytes on the size of character strings. + } + \references{ + Becker, R. A., Chambers, J. M. and Wilks, A. R. (1988) +diff -urp R-2.4.0.old/src/library/base/man/Startup.Rd R-2.4.0/src/library/base/man/Startup.Rd +--- R-2.4.0.old/src/library/base/man/Startup.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/Startup.Rd 2006-10-29 10:45:43.000000000 -0600 +@@ -77,6 +77,10 @@ + The command-line flag \option{--vanilla} implies + \option{--no-site-file}, \option{--no-init-file}, + \option{--no-restore} and \option{--no-environ}. ++#ifdef windows ++ In Windows, it also implies \option{--no-Rconsole}, which ++ prevents loading the \code{\link{Rconsole}} file. ++#endif + } + \details{ + Note that there are two sorts of files used in startup: +diff -urp R-2.4.0.old/src/library/base/man/strsplit.Rd R-2.4.0/src/library/base/man/strsplit.Rd +--- R-2.4.0.old/src/library/base/man/strsplit.Rd 2006-09-07 21:05:19.000000000 -0500 ++++ R-2.4.0/src/library/base/man/strsplit.Rd 2006-10-30 10:45:47.000000000 -0600 +@@ -52,7 +52,7 @@ strsplit(x, split, extended = TRUE, fixe + character} (almost always a Unicode point). + + +- A missing value of \code{split} does not split the the corresponding ++ A missing value of \code{split} does not split the corresponding + element(s) of \code{x} at all. + + The algorithm applied to each input string is +diff -urp R-2.4.0.old/src/library/base/man/unlist.Rd R-2.4.0/src/library/base/man/unlist.Rd +--- R-2.4.0.old/src/library/base/man/unlist.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/unlist.Rd 2006-10-31 10:45:45.000000000 -0600 +@@ -20,7 +20,7 @@ unlist(x, recursive = TRUE, use.names = + specific classes of objects, see \link{InternalMethods}. + + If \code{x} has length zero the result is \code{NULL}. +- ++ + If \code{recursive = FALSE}, the function will not recurse beyond the + first level items in \code{x}. + +@@ -40,7 +40,7 @@ unlist(x, recursive = TRUE, use.names = + + Where possible the list elements are coerced to a common mode during + the unlisting, and so the result often ends up as a character +- vector. Vectors will be corced to the highest type of the components ++ vector. Vectors will be coerced to the highest type of the components + in the hierarchy NULL < raw < logical < integer < real < complex < character + < list < expression: pairlists are treated as lists. + +@@ -54,7 +54,7 @@ unlist(x, recursive = TRUE, use.names = + \value{ + \code{NULL} or an expression or a vector of an appropriate mode to + hold the list components. +- ++ + The output type is determined from the highest type + of the components in the hierarchy raw < logical < integer < real < + complex < character < list < expression, after coercion of pairlists +diff -urp R-2.4.0.old/src/library/base/R/merge.R R-2.4.0/src/library/base/R/merge.R +--- R-2.4.0.old/src/library/base/R/merge.R 2006-09-04 09:41:13.000000000 -0500 ++++ R-2.4.0/src/library/base/R/merge.R 2006-10-28 14:35:54.000000000 -0500 +@@ -28,7 +28,6 @@ merge.data.frame <- + } + + nx <- nrow(x <- as.data.frame(x)); ny <- nrow(y <- as.data.frame(y)) +- if (nx == 0 || ny == 0) stop("no rows to match") + by.x <- fix.by(by.x, x) + by.y <- fix.by(by.y, y) + if((l.b <- length(by.x)) != length(by.y)) +@@ -44,7 +43,7 @@ merge.data.frame <- + cnm <- nm.y %in% nm + names(y)[cnm] <- paste(nm.y[cnm], suffixes[2], sep="") + } +- ij <- expand.grid(1:nx, 1:ny) ++ ij <- expand.grid(seq_len(nx), seq_len(ny)) + res <- cbind(x[ij[,1], , drop = FALSE], y[ij[,2], , drop = FALSE]) + } + else { +@@ -56,8 +55,8 @@ merge.data.frame <- + y <- cbind(Row.names = I(row.names(y)), y) + by.y <- by.y + 1 + } +- row.names(x) <- 1:nx +- row.names(y) <- 1:ny ++ row.names(x) <- seq_len(nx) ++ row.names(y) <- seq_len(ny) + ## create keys from 'by' columns: + if(l.b == 1) { # (be faster) + bx <- x[, by.x]; if(is.factor(bx)) bx <- as.character(bx) +@@ -68,17 +67,18 @@ merge.data.frame <- + bx <- x[, by.x, drop=FALSE]; by <- y[, by.y, drop=FALSE] + names(bx) <- names(by) <- paste("V", 1:ncol(bx), sep="") + bz <- do.call("paste", c(rbind(bx, by), sep = "\r")) +- bx <- bz[1:nx] +- by <- bz[nx + (1:ny)] ++ bx <- bz[seq_len(nx)] ++ by <- bz[nx + seq_len(ny)] + } + comm <- match(bx, by, 0) + bxy <- bx[comm > 0] # the keys which are in both + xinds <- match(bx, bxy, 0) + yinds <- match(by, bxy, 0) +- ## R-only solution {when !all.x && !all.y} : +- ## o <- outer(xinds, yinds, function(x, y) (x > 0) & x==y) +- ## m <- list(xi = row(o)[o], yi = col(o)[o]) +- m <- .Internal(merge(xinds, yinds, all.x, all.y)) ++ if(nx > 0 && ny > 0) ++ m <- .Internal(merge(xinds, yinds, all.x, all.y)) ++ else ++ m <- list(xi=integer(0), yi=integer(0), ++ x.alone=seq_len(nx), y.alone=seq_len(ny)) + nm <- nm.x <- names(x)[-by.x] + nm.by <- names(x)[by.x] + nm.y <- names(y)[-by.y] +diff -urp R-2.4.0.old/src/library/base/R/namespace.R R-2.4.0/src/library/base/R/namespace.R +--- R-2.4.0.old/src/library/base/R/namespace.R 2006-09-22 21:05:06.000000000 -0500 ++++ R-2.4.0/src/library/base/R/namespace.R 2006-10-28 14:35:54.000000000 -0500 +@@ -657,7 +657,7 @@ namespaceImport <- function(self, ...) { + namespaceImportFrom(self, asNamespace(ns)) + } + +-namespaceImportFrom <- function(self, ns, vars, generics) { ++namespaceImportFrom <- function(self, ns, vars, generics, packages) { + addImports <- function(ns, from, what) { + imp <- structure(list(what), names = getNamespaceName(from)) + imports <- getNamespaceImports(ns) +@@ -726,7 +726,8 @@ namespaceImportFrom <- function(self, ns + delete <- c(delete, ii) + if(!missing(generics)) { + genName <- generics[[i]] +- fdef <- methods:::getGeneric(genName, where = impenv) ++ fdef <- methods:::getGeneric(genName, ++ where = impenv, package = packages[[i]]) + if(is.null(fdef)) + warning(gettextf( + "Found methods to import for function \"%s\" but not the generic itself", +@@ -784,7 +785,7 @@ namespaceImportMethods <- function(self, + methods:::is(get(g, envir = ns), "genericFunction")) + allVars <- c(allVars, g) + } +- namespaceImportFrom(self, asNamespace(ns), allVars, allFuns) ++ namespaceImportFrom(self, asNamespace(ns), allVars, allFuns, packages) + } + + importIntoEnv <- function(impenv, impnames, expenv, expnames) { +diff -urp R-2.4.0.old/src/library/base/R/stop.R R-2.4.0/src/library/base/R/stop.R +--- R-2.4.0.old/src/library/base/R/stop.R 2006-09-04 09:41:13.000000000 -0500 ++++ R-2.4.0/src/library/base/R/stop.R 2006-10-28 14:35:54.000000000 -0500 +@@ -45,7 +45,7 @@ warning <- function(..., call. = TRUE, i + call = conditionCall(cond) + withRestarts({ + .Internal(.signalCondition(cond, message, call)) +- .Internal(.dfltStop(message, call)) ++ .Internal(.dfltWarn(message, call)) + }, muffleWarning = function() NULL) #**** allow simpler form?? + invisible(message) + } +diff -urp R-2.4.0.old/src/library/graphics/man/plotdefault.Rd R-2.4.0/src/library/graphics/man/plotdefault.Rd +--- R-2.4.0.old/src/library/graphics/man/plotdefault.Rd 2006-05-23 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/graphics/man/plotdefault.Rd 2006-10-28 14:35:51.000000000 -0500 +@@ -24,7 +24,7 @@ + \code{"s"} and \code{"S"} for stair steps and + \code{"h"} for histogram-like vertical lines. Finally, + \code{"n"} does not produce any points or lines.} +- \item{xlim}{the x limits (x1,x2) of the plot. Note that \code{x1 > x2} ++ \item{xlim}{the x limits (x1, x2) of the plot. Note that \code{x1 > x2} + is allowed and leads to a \dQuote{reversed axis}.} + \item{ylim}{the y limits of the plot.} + \item{log}{a character string which contains \code{"x"} if the x axis +diff -urp R-2.4.0.old/src/library/graphics/man/plot.window.Rd R-2.4.0/src/library/graphics/man/plot.window.Rd +--- R-2.4.0.old/src/library/graphics/man/plot.window.Rd 2006-09-04 09:41:01.000000000 -0500 ++++ R-2.4.0/src/library/graphics/man/plot.window.Rd 2006-10-28 14:35:51.000000000 -0500 +@@ -12,8 +12,8 @@ + plot.window(xlim, ylim, log = "", asp = NA, \dots) + } + \arguments{ +- \item{xlim, ylim}{numeric of length 2, giving the x and y coordinates +- ranges.} ++ \item{xlim, ylim}{numeric vectors of length 2, giving the x and y ++ coordinates ranges.} + \item{log}{character; indicating which axes should be in log scale.} + \item{asp}{numeric, giving the \bold{asp}ect ratio y/x.} + \item{\dots}{further graphical parameters as in \code{\link{par}}. +@@ -30,6 +30,9 @@ plot.window(xlim, ylim, log = "", asp = + \code{asp > 1} can be used to produce more accurate maps when using + latitude and longitude. + ++ To reverse an axis, use \code{xlim} or \code{ylim} of the form ++ \code{c(hi, lo)}. ++ + The function attempts to produce a plausible set of scales if one or + both of \code{xlim} and \code{ylim} is of length one or the two values + given are identical, but it is better to avoid that case. +diff -urp R-2.4.0.old/src/library/graphics/man/stripchart.Rd R-2.4.0/src/library/graphics/man/stripchart.Rd +--- R-2.4.0.old/src/library/graphics/man/stripchart.Rd 2006-09-12 21:05:02.000000000 -0500 ++++ R-2.4.0/src/library/graphics/man/stripchart.Rd 2006-10-30 10:45:46.000000000 -0600 +@@ -18,7 +18,7 @@ stripchart(x, method = "overplot", jitte + can be specified as a single numeric vector, or as list of numeric + vectors, each corresponding to a component plot. Alternatively a + symbolic specification of the form \code{x ~ g} can be given, +- indicating the the observations in the vector \code{x} are to be ++ indicating the observations in the vector \code{x} are to be + grouped according to the levels of the factor \code{g}. \code{NA}s + are allowed in the data.} + \item{method}{the method to be used to separate coincident points. +diff -urp R-2.4.0.old/src/library/graphics/man/symbols.Rd R-2.4.0/src/library/graphics/man/symbols.Rd +--- R-2.4.0.old/src/library/graphics/man/symbols.Rd 2006-09-04 09:41:01.000000000 -0500 ++++ R-2.4.0/src/library/graphics/man/symbols.Rd 2006-10-30 10:45:46.000000000 -0600 +@@ -72,7 +72,7 @@ symbols(x, y = NULL, circles, squares, r + to zero. + + Argument \code{inches} controls the sizes of the symbols. If +- \code{TRUE} (the default), the the symbols are scaled so that the ++ \code{TRUE} (the default), the symbols are scaled so that the + largest dimension of any symbol is one inch. If a positive number is + given the symbols are scaled to make largest dimension this size in + inches (so \code{TRUE} and \code{1} are equivalent). If \code{inches} +diff -urp R-2.4.0.old/src/library/graphics/R/datetime.R R-2.4.0/src/library/graphics/R/datetime.R +--- R-2.4.0.old/src/library/graphics/R/datetime.R 2006-09-04 09:41:00.000000000 -0500 ++++ R-2.4.0/src/library/graphics/R/datetime.R 2006-10-28 14:35:50.000000000 -0500 +@@ -23,13 +23,13 @@ axis.POSIXct <- function(side, x, at, fo + if(missing(format)) format <- "%a" + } else { # days, up to a couple of months + sc <- 60*60*24 +- if(missing(format)) format <- "%b %d" + } + if(d < 60*60*24*50) { + zz <- pretty(z/sc) + z <- zz*sc + class(z) <- c("POSIXt", "POSIXct") + if(sc == 60*60*24) z <- as.POSIXct(round(z, "days")) ++ if(missing(format)) format <- "%b %d" + } else if(d < 1.1*60*60*24*365) { # months + class(z) <- c("POSIXt", "POSIXct") + zz <- as.POSIXlt(z) +diff -urp R-2.4.0.old/src/library/graphics/R/dotchart.R R-2.4.0/src/library/graphics/R/dotchart.R +--- R-2.4.0.old/src/library/graphics/R/dotchart.R 2006-09-12 21:05:02.000000000 -0500 ++++ R-2.4.0/src/library/graphics/R/dotchart.R 2006-10-28 14:35:50.000000000 -0500 +@@ -5,7 +5,9 @@ function(x, labels = NULL, groups = NULL + xlim = range(x[is.finite(x)]), + main = NULL, xlab = NULL, ylab = NULL, ...) + { +- opar <- par("mai", "cex", "yaxs") ++ ## opar <- par(no.readonly=TRUE) ## slightly more efficient: ++ opar <- par("cex", "yaxs", "mai", ## needed too: ++ "mar", "usr", "xaxp", "yaxp") + on.exit(par(opar)) + par(cex = cex, yaxs = "i") + +diff -urp R-2.4.0.old/src/library/graphics/R/mosaicplot.R R-2.4.0/src/library/graphics/R/mosaicplot.R +--- R-2.4.0.old/src/library/graphics/R/mosaicplot.R 2006-09-04 09:41:00.000000000 -0500 ++++ R-2.4.0/src/library/graphics/R/mosaicplot.R 2006-10-28 14:35:51.000000000 -0500 +@@ -12,6 +12,9 @@ mosaicplot <- function(x, ...) UseMethod + ### Changes by W. Fischer and U. Ligges: + ## - Deparsing x in for main title. New arguments: sub, las, cex.axis + ## - made to work by BDR ++### Changes by John W. Emerson (JWE): ++## - Fixed xlab and ylab to reflect changes in variables and/or ++## orientation (e.g. use of sort and dir options). + + mosaicplot.default <- + function(x, main = deparse(substitute(x)), sub = NULL, xlab = NULL, +@@ -215,11 +218,13 @@ function(x, main = deparse(substitute(x) + as.numeric(cut(residuals, breaks))) + } + +- ## The next four may all be NULL: +- label <- dimnames(x) +- nam.dn <- names(label) +- if(is.null(xlab)) xlab <- nam.dn[1] +- if(is.null(ylab)) ylab <- nam.dn[2] ++ ############################################################## ++ ## The next four may all be NULL: ### MOVED by JWE to below. ++ ## label <- dimnames(x) ++ ## nam.dn <- names(label) ++ ## if(is.null(xlab)) xlab <- nam.dn[1] ++ ## if(is.null(ylab)) ylab <- nam.dn[2] ++ ############################################################## + + ## Initialize spacing. + if(is.null(off)) +@@ -242,6 +247,24 @@ function(x, main = deparse(substitute(x) + label <- label[sort] + } + ++ ## ################################################################# ++ ## MOVED and modified by JWE, from above, 10/16/2006 to fix dir= and ++ ## sort= bug with respect to xlab= and ylab= options. ++ ++ ## The next four may all be NULL: ++ label <- dimnames(x) ++ nam.dn <- names(label) ++ ## Here, we need to identify the first "h" and first "v" splits, and ++ ## use their names for xlab= and ylab=, if they are NULL. ++ ++ if(is.null(xlab) && any(dir == "v")) ++ xlab <- nam.dn[min(which(dir == "v"))] ++ if(is.null(ylab) && any(dir == "h")) ++ ylab <- nam.dn[min(which(dir == "h"))] ++ ++ ## END MODIFICATIONS by JWE ++ ## ################################################################# ++ + ncolors <- length(tabulate(Ind[,dimd])) + if(!extended && ((is.null(color) || length(color) != ncolors))) { + color <- +@@ -370,3 +393,5 @@ function(formula, data = NULL, ..., + mosaicplot(table(mf), main = main, ...) + } + } ++ ++ +diff -urp R-2.4.0.old/src/library/graphics/R/rect.R R-2.4.0/src/library/graphics/R/rect.R +--- R-2.4.0.old/src/library/graphics/R/rect.R 2006-04-09 17:19:00.000000000 -0500 ++++ R-2.4.0/src/library/graphics/R/rect.R 2006-10-28 14:35:50.000000000 -0500 +@@ -5,7 +5,7 @@ rect <- + if (is.numeric(density) && all(is.na(density) | density < 0)) + density <- NULL + if (!is.null(density) && !is.null(angle)) { +- if (is.logical(border)) { ++ if (is.logical(border) && !is.na(border)) { + if (border) border <- col + else border <- NA + } +diff -urp R-2.4.0.old/src/library/grDevices/man/palettes.Rd R-2.4.0/src/library/grDevices/man/palettes.Rd +--- R-2.4.0.old/src/library/grDevices/man/palettes.Rd 2006-04-09 17:19:30.000000000 -0500 ++++ R-2.4.0/src/library/grDevices/man/palettes.Rd 2006-10-28 14:35:56.000000000 -0500 +@@ -9,11 +9,12 @@ + Create a vector of \code{n} \dQuote{contiguous} colors. + } + \usage{ +-rainbow(n, s = 1, v = 1, start = 0, end = max(1,n - 1)/n, gamma = 1) +-heat.colors(n) +-terrain.colors(n) +-topo.colors(n) +-cm.colors(n) ++rainbow(n, s = 1, v = 1, start = 0, end = max(1,n - 1)/n, ++ gamma = 1, alpha = 1) ++heat.colors(n, alpha = 1) ++terrain.colors(n, alpha = 1) ++topo.colors(n, alpha = 1) ++cm.colors(n, alpha = 1) + } + \arguments{ + \item{n}{the number of colors (\eqn{\ge 1}{>= 1}) to be in the +@@ -25,6 +26,8 @@ cm.colors(n) + \item{end}{the (corrected) hue in [0,1] at which the rainbow ends.} + \item{gamma}{the gamma correction, see argument \code{gamma} in + \code{\link{hsv}}.} ++ \item{alpha}{the alpha transparency, a number in [0,1], see argument ++ \code{alpha} in \code{\link{hsv}}.} + } + \details{ + Conceptually, all of these functions actually use (parts of) a line +diff -urp R-2.4.0.old/src/library/grDevices/man/windows/windows.Rd R-2.4.0/src/library/grDevices/man/windows/windows.Rd +--- R-2.4.0.old/src/library/grDevices/man/windows/windows.Rd 2006-04-09 17:19:30.000000000 -0500 ++++ R-2.4.0/src/library/grDevices/man/windows/windows.Rd 2006-10-28 14:35:56.000000000 -0500 +@@ -34,8 +34,9 @@ win.print(width = 7, height = 7, pointsi + \arguments{ + \item{width, height}{the (nominal) width and height of the canvas of + the plotting window in inches.} +- \item{pointsize}{the default pointsize of plotted text. The allowed +- range is \code{[6, 48]}: values outside that range are reset to 12.} ++ \item{pointsize}{the default pointsize of plotted text. Values are ++ rounded to the nearest integer: values less than or equal to zero ++ are reset to 12.} + \item{record}{logical: sets the initial state of the flag for + recording plots.} + \item{rescale}{controls the action for resizing plots.} +diff -urp R-2.4.0.old/src/library/grDevices/R/colorstuff.R R-2.4.0/src/library/grDevices/R/colorstuff.R +--- R-2.4.0.old/src/library/grDevices/R/colorstuff.R 2006-09-04 09:41:22.000000000 -0500 ++++ R-2.4.0/src/library/grDevices/R/colorstuff.R 2006-10-28 14:35:55.000000000 -0500 +@@ -7,19 +7,17 @@ col2rgb <- function(col, alpha=FALSE) { + result + } + ++## FIXME: gray() should also allow alpha; ditto for gray.colors() below + gray <- function(level) .Internal(gray(level)) + grey <- gray + + rgb <- function(red, green, blue, alpha, names = NULL, maxColorValue = 1) + { +- if (missing(alpha)) { +- alphaspec <- FALSE +- alpha <- maxColorValue +- } else { +- alphaspec <- TRUE +- } ++ alphaspec <- !missing(alpha) ++ if(!alphaspec) ++ alpha <- maxColorValue + ## in the first case, (r,g,b) are (coerced to) integer, otherwise +- ## double. ++ ## double : + if(maxColorValue == 255) + result <- .Internal(rgb256(red, green, blue, alpha, names)) + else +@@ -30,14 +28,9 @@ rgb <- function(red, green, blue, alpha, + else result + } + +-hsv <- function(h=1, s=1, v=1, gamma=1, alpha) ++hsv <- function(h=1, s=1, v=1, gamma = 1, alpha = 1) + { +- if (missing(alpha)) { +- alphaspec <- FALSE +- alpha <- 1 +- } else { +- alphaspec <- TRUE +- } ++ alphaspec <- !missing(alpha) + result <- .Internal(hsv(h, s, v, gamma, alpha)) + ## If alpha not specified only return #RRGGBB + if (!alphaspec) +@@ -46,14 +39,9 @@ hsv <- function(h=1, s=1, v=1, gamma=1, + } + + hcl <- +-function (h = 0, c = 35, l = 85, alpha, fixup = TRUE) ++function (h = 0, c = 35, l = 85, alpha = 1, fixup = TRUE) + { +- if (missing(alpha)) { +- alphaspec <- FALSE +- alpha <- 1 +- } else { +- alphaspec <- TRUE +- } ++ alphaspec <- !missing(alpha) + result <- .Internal(hcl(h, c, l, alpha, fixup)) + if (!alphaspec) + structure(substr(result, 1, 7), names=names(result)) +@@ -90,30 +78,30 @@ palette <- function(value) + ## A quick little ''rainbow'' function -- improved by MM + ## doc in ../man/palettes.Rd + rainbow <- +- function (n, s = 1, v = 1, start = 0, end = max(1,n - 1)/n, gamma = 1) ++ function (n, s = 1, v = 1, start = 0, end = max(1,n - 1)/n, gamma = 1, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + if(start == end || any(c(start,end) < 0)|| any(c(start,end) > 1)) + stop("'start' and 'end' must be distinct and in [0, 1].") + hsv(h = seq.int(start, ifelse(start > end, 1, 0) + end, length= n) %% 1, +- s, v, gamma) ++ s, v, gamma, alpha) + } else character(0) + } + +-topo.colors <- function (n) ++topo.colors <- function (n, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + j <- n %/% 3 + k <- n %/% 3 + i <- n - j - k +- c(if(i > 0) hsv(h= seq.int(from = 43/60, to = 31/60, length = i)), +- if(j > 0) hsv(h= seq.int(from = 23/60, to = 11/60, length = j)), +- if(k > 0) hsv(h= seq.int(from = 10/60, to = 6/60, length = k), +- s= seq.int(from = 1, to = 0.3, length = k), v = 1)) ++ c(if(i > 0) hsv(h= seq.int(from= 43/60, to= 31/60, length = i), alpha=alpha), ++ if(j > 0) hsv(h= seq.int(from= 23/60, to= 11/60, length = j), alpha=alpha), ++ if(k > 0) hsv(h= seq.int(from= 10/60, to= 6/60, length = k), alpha=alpha, ++ s= seq.int(from= 1, to= 0.3, length = k), v = 1)) + } else character(0) + } + +-terrain.colors <- function (n) ++terrain.colors <- function (n, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + k <- n%/%2 +@@ -122,26 +110,26 @@ terrain.colors <- function (n) + v <- c(0.65, 0.9, 0.95) + c(hsv(h = seq.int(h[1], h[2], length = k), + s = seq.int(s[1], s[2], length = k), +- v = seq.int(v[1], v[2], length = k)), ++ v = seq.int(v[1], v[2], length = k), alpha = alpha), + hsv(h = seq.int(h[2], h[3], length = n - k + 1)[-1], + s = seq.int(s[2], s[3], length = n - k + 1)[-1], +- v = seq.int(v[2], v[3], length = n - k + 1)[-1])) ++ v = seq.int(v[2], v[3], length = n - k + 1)[-1], alpha = alpha)) + } else character(0) + } + +-heat.colors <- function (n) ++heat.colors <- function (n, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + j <- n %/% 4 + i <- n - j +- c(rainbow(i, start = 0, end = 1/6), ++ c(rainbow(i, start = 0, end = 1/6, alpha = alpha), + if (j > 0) + hsv(h = 1/6, s = seq.int(from= 1-1/(2*j), to= 1/(2*j), length = j), +- v = 1)) ++ v = 1, alpha = alpha)) + } else character(0) + } + +-cm.colors <- function (n) ++cm.colors <- function (n, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + even.n <- n %% 2 == 0 +@@ -149,13 +137,15 @@ cm.colors <- function (n) + l1 <- k + 1 - even.n + l2 <- n - k + even.n + c(if(l1 > 0) +- hsv(h = 6/12, s= seq.int(.5, ifelse(even.n,.5/k,0), length = l1), v = 1), ++ hsv(h = 6/12, s = seq.int(.5, ifelse(even.n,.5/k,0), length = l1), ++ v = 1, alpha = alpha), + if(l2 > 1) +- hsv(h = 10/12, s= seq.int(0, 0.5, length = l2)[-1], v = 1)) ++ hsv(h = 10/12, s = seq.int(0, 0.5, length = l2)[-1], ++ v = 1, alpha = alpha)) + } else character(0) + } + +-gray.colors <- ++gray.colors <- ## FIXME: add 'alpha = 1' + function(n, start = 0.3, end = 0.9, gamma = 2.2) + gray(seq.int(from = start^gamma, to = end^gamma, length = n)^(1/gamma)) + grey.colors <- gray.colors +diff -urp R-2.4.0.old/src/library/grDevices/src/devWindows.c R-2.4.0/src/library/grDevices/src/devWindows.c +--- R-2.4.0.old/src/library/grDevices/src/devWindows.c 2006-09-04 09:41:23.000000000 -0500 ++++ R-2.4.0/src/library/grDevices/src/devWindows.c 2006-10-28 14:35:56.000000000 -0500 +@@ -578,8 +578,7 @@ static char* translateFontFamily(char* f + /* 0 = plain text, 1 = bold */ + /* 2 = oblique, 3 = bold-oblique */ + +-#define SMALLEST 2 +-#define LARGEST 100 ++#define SMALLEST 1 + + static void SetFont(char *family, int face, int size, double rot, + NewDevDesc *dd) +@@ -590,7 +589,6 @@ static void SetFont(char *family, int fa + if (face < 1 || face > fontnum) + face = 1; + if (size < SMALLEST) size = SMALLEST; +- if (size > LARGEST) size = LARGEST; + if (!xd->usefixed && + (size != xd->fontsize || face != xd->fontface || + rot != xd->fontangle || strcmp(family, xd->fontfamily))) { +@@ -2564,9 +2562,8 @@ Rboolean GADeviceDriver(NewDevDesc *dd, + /* Font will load at first use */ + + ps = pointsize; +- if (ps < 6 || ps > 48) ++ if (ps < 1) + ps = 12; +- ps = 2 * (ps / 2); + xd->fontface = -1; + xd->fontsize = -1; + xd->basefontsize = ps ; +Binary files R-2.4.0.old/src/library/grid/inst/doc/displaylist.pdf and R-2.4.0/src/library/grid/inst/doc/displaylist.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/frame.pdf and R-2.4.0/src/library/grid/inst/doc/frame.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/grid.pdf and R-2.4.0/src/library/grid/inst/doc/grid.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/grobs.pdf and R-2.4.0/src/library/grid/inst/doc/grobs.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/interactive.pdf and R-2.4.0/src/library/grid/inst/doc/interactive.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/locndimn.pdf and R-2.4.0/src/library/grid/inst/doc/locndimn.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/moveline.pdf and R-2.4.0/src/library/grid/inst/doc/moveline.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/nonfinite.pdf and R-2.4.0/src/library/grid/inst/doc/nonfinite.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/plotexample.pdf and R-2.4.0/src/library/grid/inst/doc/plotexample.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/rotated.pdf and R-2.4.0/src/library/grid/inst/doc/rotated.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/saveload.pdf and R-2.4.0/src/library/grid/inst/doc/saveload.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/sharing.pdf and R-2.4.0/src/library/grid/inst/doc/sharing.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/viewports.pdf and R-2.4.0/src/library/grid/inst/doc/viewports.pdf differ +diff -urp R-2.4.0.old/src/library/grid/man/viewport.Rd R-2.4.0/src/library/grid/man/viewport.Rd +--- R-2.4.0.old/src/library/grid/man/viewport.Rd 2006-04-09 17:19:12.000000000 -0500 ++++ R-2.4.0/src/library/grid/man/viewport.Rd 2006-10-28 14:35:53.000000000 -0500 +@@ -5,7 +5,7 @@ + \alias{vpTree} + \title{Create a Grid Viewport} + \description{ +- These functions create viewports, which describe a rectangular regions ++ These functions create viewports, which describe rectangular regions + on a graphics device and define a number of coordinate systems within + those regions. + } +diff -urp R-2.4.0.old/src/library/methods/man/MethodSupport.Rd R-2.4.0/src/library/methods/man/MethodSupport.Rd +--- R-2.4.0.old/src/library/methods/man/MethodSupport.Rd 2006-04-09 17:19:10.000000000 -0500 ++++ R-2.4.0/src/library/methods/man/MethodSupport.Rd 2006-11-02 19:41:45.000000000 -0600 +@@ -11,7 +11,7 @@ + \usage{ + getMethodsForDispatch(f, fdef) + +-cacheMethod(f, sig, def, args, fdef) ++cacheMethod(f, sig, def, args, fdef, inherited = FALSE) + + resetGeneric(f, fdef, mlist, where, deflt) + } +@@ -29,7 +29,8 @@ resetGeneric(f, fdef, mlist, where, defl + \item{\code{cacheMethod}:}{ + Store the definition for this function and signature in the method + metadata for the function. Used to store extensions of coerce +- methods found through inheritance. ++ methods found through inheritance, and to cache methods with ++ \code{\link{callNextMethod}} information. + + No persistent effect, since the method metadata is session-scope + only. +diff -urp R-2.4.0.old/src/library/methods/man/seemsS4Object.Rd R-2.4.0/src/library/methods/man/seemsS4Object.Rd +--- R-2.4.0.old/src/library/methods/man/seemsS4Object.Rd 2006-09-04 09:41:08.000000000 -0500 ++++ R-2.4.0/src/library/methods/man/seemsS4Object.Rd 2006-11-02 19:41:45.000000000 -0600 +@@ -2,8 +2,8 @@ + \alias{seemsS4Object} + \title{Heuristic test for an object from an S4 class} + \description{ +- Returns \code{TRUE} if \code{object} seems to have been generated from +- a formally defined (\dQuote{S4}) class. ++ Returns \code{TRUE} if \code{object} has been generated from ++ a formally defined (\dQuote{S4}) class. DEPRECATED: use isS4(object) instead. + } + \usage{ + seemsS4Object(object) +@@ -13,9 +13,13 @@ seemsS4Object(object) + } + \details{ + The \code{\link{class}} of the object is examined for the \code{"package"} +- attribute included when objects are generated from an S4 class. ++ attribute included when objects are generated from an S4 class. The ++ test in this function has been superseded by an internal bit set ++ when S4 objects are generated. + +- This test can be fooled in at least two ways: ++ The \code{seemsS4Object} function is deprecated and will be removed. ++ ++ The test can be fooled in at least two ways: + \enumerate{ + \item It will give \code{TRUE} incorrectly if someone puts a + \code{"package"} string attribute on the class of an S3 object. +diff -urp R-2.4.0.old/src/library/methods/R/as.R R-2.4.0/src/library/methods/R/as.R +--- R-2.4.0.old/src/library/methods/R/as.R 2006-09-09 21:05:02.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/as.R 2006-11-02 19:41:45.000000000 -0600 +@@ -25,6 +25,7 @@ as <- + fdef = coerceFun, mlist = coerceMethods) + if(is.null(asMethod)) { + canCache <- TRUE ++ inherited <- FALSE + if(is(object, Class)) { + ClassDef <- getClassDef(Class, where) + ## use the ext information, computed or supplied +@@ -47,13 +48,17 @@ as <- + } + ## if none of these applies, look for an inherited method + ## but only on the from argument +- if(is.null(asMethod)) ++ if(is.null(asMethod)) { + asMethod <- selectMethod("coerce", sig, TRUE, + c(from = TRUE, to = FALSE), +- fdef = coerceFun, mlist = coerceMethods) ++ fdef = coerceFun, mlist = ++ coerceMethods) ++ inherited <- TRUE ++ } + ## cache in the coerce function's environment + if(canCache && !is.null(asMethod)) { +- cacheMethod("coerce", sig, asMethod, fdef = coerceFun) ++ cacheMethod("coerce", sig, asMethod, fdef = coerceFun, ++ inherited = inherited) + } + } + } +@@ -129,32 +134,36 @@ as <- + coerceMethods <- getMethodsForDispatch("coerce<-", coerceFun) + asMethod <- .quickCoerceSelect(thisClass, Class, coerceFun, coerceMethods) + if(is.null(asMethod)) { +- sig <- c(from=thisClass, to = Class) +- canCache <- TRUE +- asMethod <- selectMethod("coerce<-", sig, TRUE, FALSE, #optional, no inheritance +- fdef = coerceFun, mlist = coerceMethods) +- if(is.null(asMethod)) { +- if(is(object, Class)) { +- asMethod <- possibleExtends(thisClass, Class) +- if(identical(asMethod, TRUE)) {# trivial, probably identical classes +- class(value) <- class(object) +- return(value) +- } +- else { +- test <- asMethod@test +- asMethod <- asMethod@replace +- canCache <- (!is(test, "function")) || identical(body(test), TRUE) +- if(canCache) { ##the replace code is a bare function +- asMethod <- .asCoerceMethod(asMethod, sig, TRUE) ++ sig <- c(from=thisClass, to = Class) ++ canCache <- TRUE ++ inherited <- FALSE ++ asMethod <- selectMethod("coerce<-", sig, TRUE, FALSE, #optional, no inheritance ++ fdef = coerceFun, mlist = coerceMethods) ++ if(is.null(asMethod)) { ++ if(is(object, Class)) { ++ asMethod <- possibleExtends(thisClass, Class) ++ if(identical(asMethod, TRUE)) {# trivial, probably identical classes ++ class(value) <- class(object) ++ return(value) + } +- } +- } +- else +- asMethod <- selectMethod("coerce<-", sig, TRUE, c(from = TRUE, to = FALSE)) +- } ++ else { ++ test <- asMethod@test ++ asMethod <- asMethod@replace ++ canCache <- (!is(test, "function")) || identical(body(test), TRUE) ++ if(canCache) { ##the replace code is a bare function ++ asMethod <- .asCoerceMethod(asMethod, sig, TRUE) ++ } ++ } ++ } ++ else { # search for inherited method ++ asMethod <- selectMethod("coerce<-", sig, TRUE, c(from = TRUE, to = FALSE)) ++ inherited <- TRUE ++ } ++ } + ## cache for next call + if(canCache && !is.null(asMethod)) +- cacheMethod("coerce<-", sig, asMethod, fdef = coerceFun) ++ cacheMethod("coerce<-", sig, asMethod, fdef = coerceFun, ++ inherited = inherited) + } + if(is.null(asMethod)) + stop(gettextf("no method or default for as() replacement of \"%s\" with Class=\"%s\"", thisClass, Class), domain = NA) +diff -urp R-2.4.0.old/src/library/methods/R/is.R R-2.4.0/src/library/methods/R/is.R +--- R-2.4.0.old/src/library/methods/R/is.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/is.R 2006-10-28 14:35:53.000000000 -0500 +@@ -116,33 +116,25 @@ setIs <- + obj <- extensionObject + ## revise the superclass/subclass info in the stored class definition + .validExtends(class1, class2, classDef, classDef2, obj@simple) +- if(!classDef@sealed) { +- where1 <- findClass(class1, where)[[1]] +- if(!bindingIsLocked(m1, where1)) { +- ## the direct contains information +- elNamed(classDef@contains, class2) <- obj +- if(doComplete) +- classDef@contains <- completeExtends(classDef, class2, obj, where = where) +- assignClassDef(class1, classDef, where1) +- } +- } +- if(!classDef2@sealed) { +- where2 <- findClass(classDef2) +- if(length(where2) > 0) { +- where2 <- where2[[1]] +- if(!bindingIsLocked(m2, where2)) { +- elNamed(classDef2@subclasses, class1) <- obj +- if(doComplete) +- classDef2@subclasses <- completeSubclasses(classDef2, class1, obj, where) +- assignClassDef(class2, classDef2, where2) +- } +- .removePreviousCoerce(class1, class2, where, prevIs) +- } +- else +- stop(gettextf("Unable to find package environment for class \"%s\" to revise subclass information", class2)) ++ where2 <- findClass(classDef2) ++ if(length(where2) > 0) { ++ where2 <- where2[[1]] ++ elNamed(classDef2@subclasses, class1) <- obj ++ if(doComplete) ++ classDef2@subclasses <- completeSubclasses(classDef2, class1, obj, where) ++ assignClassDef(class2, classDef2, where2, TRUE) ++ .removePreviousCoerce(class1, class2, where, prevIs) + } ++ else ++ stop(gettextf("Unable to find package environment for class \"%s\" to revise subclass information", class2)) ++ where1 <- findClass(class1, where)[[1]] ++ ## the direct contains information ++ elNamed(classDef@contains, class2) <- obj ++ if(doComplete) ++ classDef@contains <- completeExtends(classDef, class2, obj, where = where) ++ assignClassDef(class1, classDef, where1, TRUE) + invisible(classDef) +-} ++ } + + .validExtends <- function(class1, class2, classDef1, classDef2, slotTests) { + .msg <- function(class1, class2) gettextf("class \"%s\" cannot extend class \"%s\"", class1, class2) +diff -urp R-2.4.0.old/src/library/methods/R/Methods.R R-2.4.0/src/library/methods/R/Methods.R +--- R-2.4.0.old/src/library/methods/R/Methods.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/Methods.R 2006-11-02 19:41:45.000000000 -0600 +@@ -81,6 +81,16 @@ setGeneric <- + } + if(doUncache) + .uncacheGeneric(name, oldDef) ++ groups = fdef@group ++ for(group in groups) { # add as member of group generic(s) if not there ++ gdef <- getGeneric(group) ++ if(is(gdef, "groupGenericFunction") && ++ is.na(match(fdef@generic, as.character(gdef@groupMembers)))) { ++ gwhere <- .genEnv(group, where) ++ gdef@groupMembers <- c(gdef@groupMembers, list(fdef@generic)) ++ assign(group, gdef, gwhere) ++ } ++ } + assign(name, fdef, where) + .cacheGeneric(name, fdef) + if(!.UsingMethodsTables() && +@@ -265,10 +275,18 @@ getMethodsForDispatch <- function(f, fde + cacheMethod <- + ## cache the given definition in the method metadata for f + ## Support function: DON'T USE DIRECTLY (does no checking) +- function(f, sig, def, args = names(sig), fdef) { ++ function(f, sig, def, args = names(sig), fdef, inherited = FALSE) { + ev <- environment(fdef) +- if(.UsingMethodsTables()) +- .cacheMethodInTable(fdef, sig, def, .getMethodsTable(fdef, ev)) ++ if(.UsingMethodsTables()) { ++ .cacheMethodInTable(fdef, sig, def, ++ .getMethodsTable(fdef, ev, inherited = inherited)) ++ ## if this is not an inherited method, update the inherited table as well ++ ## TODO: in this case, should uncache inherited methods, though the callin ++ ## function will normally have done this. ++ if(!inherited) ++ .cacheMethodInTable(fdef, sig, def, ++ .getMethodsTable(fdef, ev, inherited = TRUE)) ++ } + else { + methods <- get(".Methods", envir = ev) + methods <- insertMethod(methods, sig, args, def, TRUE) +@@ -280,6 +298,9 @@ cacheMethod <- + } + } + ++.removeCachedMethod <- function(f, sig, fdef = getGeneric(f)) ++ cacheMethod(f, sig, NULL, names(sig), fdef) ++ + + setMethod <- + ## Define a method for the specified combination of generic function and signature. +diff -urp R-2.4.0.old/src/library/methods/R/methodsTable.R R-2.4.0/src/library/methods/R/methodsTable.R +--- R-2.4.0.old/src/library/methods/R/methodsTable.R 2006-09-13 21:05:02.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/methodsTable.R 2006-11-02 19:41:45.000000000 -0600 +@@ -1,5 +1,3 @@ +-options(error=traceback, warn = 1) +- + ### merge version called from namespace imports code. Hope to avoid using generic + .mergeMethodsTable2 <- function(table, newtable, envir, metaname) { + old <- objects(table, all=TRUE) +@@ -138,7 +136,7 @@ options(error=traceback, warn = 1) + ## also Called from cacheMethod (from as(), + ## as<-()) + fenv <- environment(fdef) +- if(!exists(".AllMTable", envir = fenv, inherits = TRUE)) ++ if(!exists(".AllMTable", envir = fenv, inherits = FALSE)) + .setupMethodsTables(fdef) + sig <- .matchSigLength(sig, fdef, fenv, TRUE) + label <- .sigLabel(sig) +@@ -407,15 +405,31 @@ options(error=traceback, warn = 1) + mlist <- generic@default + else + mlist <- get(".Methods", envir = env, inherits = FALSE) +- if(initialize || !exists(".SigLength", envir = env, inherits = FALSE)) +- assign(".SigLength", 1, envir = env) +- ## check that groups of generics agree on .SigLength; otherwise +- ## labels won't match ++ if(initialize || !exists(".SigLength", envir = env, inherits = FALSE)) { ++ nsig <- 1 ++ ## check that groups of generics agree on .SigLength; otherwise ++ ## labels won't match ++ for(gp in generic@group) { ++ gpDef <- getGeneric(gp) ++ if(is(gpDef, "genericFunction")) { ++ .getMethodsTable(gpDef) # force initialization ++ nsig <- max(nsig, get(".SigLength", envir = environment(gpDef))) ++ } ++ } ++ assign(".SigLength", nsig, envir = env) ++ } + argSyms <- lapply(generic@signature, as.name) + assign(".SigArgs", argSyms, envir = env) + mtable <- .mlistAddToTable(generic, mlist) + assign(".MTable", mtable, envir = env) + .resetInheritedMethods(env, mtable) ++ if(is(generic, "groupGenericFunction")) { ++ for(gp in generic@groupMembers) { ++ gpDef <- getGeneric(gp) ++ if(is(gpDef, "genericFunction")) ++ .getMethodsTable(gpDef) # force initialization w. group methods ++ } ++ } + } + + .updateMethodsInTable <- function(generic, where, attach) { +diff -urp R-2.4.0.old/src/library/methods/R/NextMethod.R R-2.4.0/src/library/methods/R/NextMethod.R +--- R-2.4.0.old/src/library/methods/R/NextMethod.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/NextMethod.R 2006-11-02 19:41:45.000000000 -0600 +@@ -96,7 +96,7 @@ callNextMethod <- function(...) { + method <- addNextMethod(method, f, envir=methodEnv) + ## cache the method with the nextMethod included, + ## so later calls will load this information. +- cacheMethod(f, method@target, method, fdef = getGeneric(f)) ++ cacheMethod(f, method@target, method, fdef = getGeneric(f), inherited = TRUE) + } + nextMethod <- method@nextMethod + assign(".nextMethod", nextMethod, envir = callEnv) +diff -urp R-2.4.0.old/src/library/methods/R/RClassUtils.R R-2.4.0/src/library/methods/R/RClassUtils.R +--- R-2.4.0.old/src/library/methods/R/RClassUtils.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/RClassUtils.R 2006-10-28 14:35:53.000000000 -0500 +@@ -412,7 +412,7 @@ isVirtualClass <- + + assignClassDef <- + ## assign the definition of the class to the specially named object +- function(Class, def, where = .GlobalEnv) { ++ function(Class, def, where = .GlobalEnv, force = FALSE) { + if(!is(def,"classRepresentation")) + stop(gettextf("trying to assign an object of class \"%s\" as the definition of class \"%s\": must supply a \"classRepresentation\" object", + class(def), Class), domain = NA) +@@ -420,8 +420,18 @@ assignClassDef <- + if(!.identC(Class, clName)) + stop(gettextf("assigning as \"%s\" a class representation with internal name \"%s\"", + Class, def@className), domain = NA) ++ where <- as.environment(where) ++ mname <- classMetaName(Class) ++ if(exists(mname, envir = where, inherits = FALSE) && bindingIsLocked(mname, where)) { ++ if(force) ++ .assignOverBinding(mname, def, where, FALSE) ++ else ++ stop(gettextf("Class \"%s\" has a locked definition in package \"%s\"", ++ Class, getPackageName(where))) ++ } ++ else ++ assign(mname, def, where) + .cacheClass(clName, def) +- assign(classMetaName(Class), def, where) + } + + +@@ -1445,13 +1455,13 @@ substituteFunctionArgs <- function(def, + + ## bootstrap version: all classes and methods must be in the version of the methods + ## package being built in the toplevel environment: MUST avoid require("methods") ! +-.requirePackage <- function(package) ++.requirePackage <- function(package, mustFind = TRUE) + topenv(parent.frame()) + + .PackageEnvironments <- new.env(hash=TRUE) # caching for required packages + + ## real version of .requirePackage +-..requirePackage <- function(package) { ++..requirePackage <- function(package, mustFind = TRUE) { + value <- package + if(is.character(package)) { + if(package %in% loadedNamespaces()) +@@ -1473,9 +1483,13 @@ substituteFunctionArgs <- function(def, + if(exists(".packageName", topEnv, inherits=TRUE) && + .identC(package, get(".packageName", topEnv))) + return(topEnv) # kludge for source'ing package code +- if(!require(package, character.only = TRUE)) +- stop(gettextf("unable to find required package \"%s\"", package), +- domain = NA) ++ if(!require(package, character.only = TRUE)) { ++ if(mustFind) ++ stop(gettextf("unable to find required package \"%s\"", package), ++ domain = NA) ++ else ++ return(NULL) ++ } + value <- .asEnvironmentPackage(package) + assign(package, value, envir = .PackageEnvironments) + value +@@ -1662,3 +1676,27 @@ substituteFunctionArgs <- function(def, + } + } + ++.removeSubClass <- function(class, subclass, where) { ++ mname <- classMetaName(class) ++ where <- as.environment(where) ++ if(exists(mname, envir = where, inherits = FALSE)) { ++ cdef <- get(mname, envir = where) ++ subclasses <- cdef@subclasses ++ ii <- match(subclass, names(subclasses), 0) ++ ## the subclass may not be there, e.g., if an error occured in ++ ## setClass, or (in 2.4.0) if class is sealed ++ if(ii > 0) { ++ cdef@subclasses <- subclasses[-ii] ++ assign(mname, cdef, envir = where) ++ } ++ sig <- signature(from=subclass, to=class) ++ if(existsMethod("coerce", sig)) ++ .removeCachedMethod("coerce", sig) ++ if(existsMethod("coerce<-", sig)) ++ .removeCachedMethod("coerce<-", sig) ++ .uncacheClass(class, cdef) ++ } ++ else ++ warning(gettextf("No class \"%s\" found as expected in removing subclass \"%s\"", ++ class, subclass)) ++} +diff -urp R-2.4.0.old/src/library/methods/R/RMethodUtils.R R-2.4.0/src/library/methods/R/RMethodUtils.R +--- R-2.4.0.old/src/library/methods/R/RMethodUtils.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/RMethodUtils.R 2006-10-28 14:35:53.000000000 -0500 +@@ -392,6 +392,7 @@ rematchDefinition <- function(definition + newCall <- as.call(newCall) + newBody <- substitute({.local <- DEF; NEWCALL}, + list(DEF = definition, NEWCALL = newCall)) ++ generic <- .copyMethodDefaults(generic, definition) + body(generic, envir = environment(definition)) <- newBody + generic + } +@@ -464,6 +465,12 @@ getGeneric <- + .cacheGeneric(f, value) + } + } ++ if(is.null(value) && nchar(package)>0 && !identical(package, "base")) { ++ env <- .requirePackage(package, FALSE) ++ if(is.environment(env)) ++ value <- .Call("R_getGeneric", f, FALSE, env, package, ++ PACKAGE = "methods") ++ } + value + } + +@@ -1375,3 +1382,25 @@ deletePrimMethods <- function(f, env) { + + .primname <- function(object) + .Call("R_get_primname", object, PACKAGE = "base") ++ ++.copyMethodDefaults <- function(generic, method) { ++ emptyDefault <- function(value) missing(value) || (is.name(value) && (nchar(as.character(value))>0)) ++ fg <- formals(generic) ++ mg <- formals(method) ++ mgn <- names(mg) ++ changed <- FALSE ++ for(what in names(fg)) { ++ i <- match(what, mgn, 0) ++ if(i> 0) { ++ deflt <- mg[[i]] ++ if(!(emptyDefault(deflt) || identical(deflt, fg[[what]]))) { ++ fg[[what]] <- deflt ++ changed <- TRUE ++ } ++ } ++ } ++ if(changed) ++ formals(generic) <- fg ++ generic ++} ++ +diff -urp R-2.4.0.old/src/library/methods/R/SClasses.R R-2.4.0/src/library/methods/R/SClasses.R +--- R-2.4.0.old/src/library/methods/R/SClasses.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/SClasses.R 2006-10-28 14:35:53.000000000 -0500 +@@ -309,6 +309,19 @@ removeClass <- function(Class, where = + "\") has defined subclasses that should also be removed: (", + paste(as.character(subclasses[found]), collapse = ", "), ")") + } ++ if(length(classDef@contains)>0) { ++ superclasses <- names(classDef@contains) ++ for(what in superclasses) { ++ superWhere <- findClass(what, classWhere) ++ if(length(superWhere)>0) { ++ superWhere <- superWhere[[1]] ++ .removeSubClass(what, Class, superWhere) ++ } ++ else ++ warning(gettextf("Couldn't find superclass \"%s\" to clean up when removing class \"%s\"", ++ what, Class)) ++ } ++ } + .uncacheClass(Class, classDef) + .undefineMethod("initialize", Class, classWhere) + what <- classMetaName(Class) +Only in R-2.4.0/src/library/Recommended: lattice_0.14-12.tar.gz +Only in R-2.4.0.old/src/library/Recommended: lattice_0.14-9.tar.gz +Binary files R-2.4.0.old/src/library/Recommended/lattice.tgz and R-2.4.0/src/library/Recommended/lattice.tgz differ +Only in R-2.4.0.old/src/library/Recommended: mgcv_1.3-19.tar.gz +Only in R-2.4.0/src/library/Recommended: mgcv_1.3-20.tar.gz +Binary files R-2.4.0.old/src/library/Recommended/mgcv.tgz and R-2.4.0/src/library/Recommended/mgcv.tgz differ +diff -urp R-2.4.0.old/src/library/stats/man/lowess.Rd R-2.4.0/src/library/stats/man/lowess.Rd +--- R-2.4.0.old/src/library/stats/man/lowess.Rd 2006-04-09 17:19:48.000000000 -0500 ++++ R-2.4.0/src/library/stats/man/lowess.Rd 2006-10-28 14:35:57.000000000 -0500 +@@ -1,5 +1,10 @@ + \name{lowess} + \title{Scatter Plot Smoothing} ++\description{ ++ This function performs the computations for the ++ \emph{LOWESS} smoother which uses locally-weighted polynomial ++ regression (see the references). ++} + \usage{ + lowess(x, y = NULL, f = 2/3, iter = 3, + delta = 0.01 * diff(range(xy$x[o]))) +@@ -11,20 +16,40 @@ lowess(x, y = NULL, f = 2/3, iter = 3, + \item{f}{the smoother span. This gives the proportion of points in + the plot which influence the smooth at each value. + Larger values give more smoothness.} +- \item{iter}{the number of robustifying iterations which should be ++ \item{iter}{the number of \sQuote{robustifying} iterations which should be + performed. + Using smaller values of \code{iter} will make \code{lowess} run faster.} +- \item{delta}{values of \code{x} which lie within \code{delta} +- of each other are replaced by a single value in the output from +- \code{lowess}. Defaults to 1/100th of the range of \code{x}.} ++ \item{delta}{See Details. Defaults to 1/100th of the range of \code{x}.} + } +-\description{ +- This function performs the computations for the +- \emph{LOWESS} smoother (see the reference below). ++\details{ ++ \code{lowess} is defined by a complex algorithm, the Ratfor original ++ of which (by W. S. Cleveland) can be found in the \R sources as file ++ \file{src/appl/lowess.doc}. Normally a local linear polynomial fit is ++ used, but under some circumstances (see the file) a local constant fit ++ can be used. \sQuote{Local} is defined by the distance to the ++ \code{floor(f*n)}th nearest neighbour, and tricubic weighting is used ++ for \code{x} which fall within the neighbourhood. ++ ++ The initial fit is done using weighted least squares. If ++ \code{iter > 0}, further weighted fits are done using the product of ++ the weights from the proximity of the \code{x} values and case weights ++ derived from the residuals at the previous iteration. Specifically, ++ the case weight is Tukey's biweight, with cutoff 6 times the MAD of the ++ residuals. (The current \R implementation differs from the original ++ in stopping iteration if the MAD is effectively zero since the ++ algorithm is highly unstable in that case.) ++ ++ \code{delta} is used to speed up computation: instead of computing the ++ local polynomial fit at each data point it is not computed for points ++ within \code{delta} of the last computed point, and linear ++ interpolation is used to fill in the fitted values for the skipped ++ points. ++} ++\value{ + \code{lowess} returns a list containing components + \code{x} and \code{y} which give the coordinates of the smooth. +- The smooth should be added to a plot of the original +- points with the function \code{lines}. ++ The smooth can be added to a plot of the original ++ points with the function \code{lines}: see the examples. + } + \references{ + Becker, R. A., Chambers, J. M. and Wilks, A. R. (1988) +diff -urp R-2.4.0.old/src/library/stats/man/prcomp.Rd R-2.4.0/src/library/stats/man/prcomp.Rd +--- R-2.4.0.old/src/library/stats/man/prcomp.Rd 2006-05-18 04:13:52.000000000 -0500 ++++ R-2.4.0/src/library/stats/man/prcomp.Rd 2006-10-30 10:45:48.000000000 -0600 +@@ -91,7 +91,7 @@ prcomp(x, \dots) + (centered and possibly scaled) data matrix, not by using + \code{eigen} on the covariance matrix. This + is generally the preferred method for numerical accuracy. The +- \code{print} method for the these objects prints the results in a nice ++ \code{print} method for these objects prints the results in a nice + format and the \code{plot} method produces a scree plot. + + Note that \code{scale = TRUE} cannot be used if there are zero or +diff -urp R-2.4.0.old/src/library/stats/man/princomp.Rd R-2.4.0/src/library/stats/man/princomp.Rd +--- R-2.4.0.old/src/library/stats/man/princomp.Rd 2006-05-18 04:13:52.000000000 -0500 ++++ R-2.4.0/src/library/stats/man/princomp.Rd 2006-10-30 10:45:48.000000000 -0600 +@@ -91,7 +91,7 @@ princomp(x, \dots) + Note that the default calculation uses divisor \code{N} for the + covariance matrix. + +- The \code{\link{print}} method for the these objects prints the ++ The \code{\link{print}} method for these objects prints the + results in a nice format and the \code{\link{plot}} method produces + a scree plot (\code{\link{screeplot}}). There is also a + \code{\link{biplot}} method. +diff -urp R-2.4.0.old/src/library/stats/man/ts.Rd R-2.4.0/src/library/stats/man/ts.Rd +--- R-2.4.0.old/src/library/stats/man/ts.Rd 2006-09-04 09:41:28.000000000 -0500 ++++ R-2.4.0/src/library/stats/man/ts.Rd 2006-10-28 14:35:57.000000000 -0500 +@@ -53,7 +53,7 @@ is.ts(x) + attributes) which represent data which has been sampled at equispaced + points in time. In the matrix case, each column of the matrix + \code{data} is assumed to contain a single (univariate) time series. +- Time series must have an least one observation, and although they need ++ Time series must have at least one observation, and although they need + not be numeric there is very limited support for non-numeric series. + + Class \code{"ts"} has a number of methods. In particular arithmetic +diff -urp R-2.4.0.old/src/library/stats/R/add.R R-2.4.0/src/library/stats/R/add.R +--- R-2.4.0.old/src/library/stats/R/add.R 2006-09-06 21:05:05.000000000 -0500 ++++ R-2.4.0/src/library/stats/R/add.R 2006-10-28 14:35:56.000000000 -0500 +@@ -112,7 +112,8 @@ add1.lm <- function(object, scope, scale + z <- if(iswt) lm.wfit(X, y, wt, offset=offset) + else lm.fit(X, y, offset=offset) + dfs[1] <- z$rank +- RSS[1] <- deviance.lm(z) ++ class(z) <- "lm" # needed as deviance.lm calls generic residuals() ++ RSS[1] <- deviance(z) + ## workaround for PR#7842. terms.formula may have flipped interactions + sTerms <- sapply(strsplit(Terms, ":", fixed=TRUE), + function(x) paste(sort(x), collapse=":")) +@@ -122,8 +123,9 @@ add1.lm <- function(object, scope, scale + X <- x[, usex|ousex, drop = FALSE] + z <- if(iswt) lm.wfit(X, y, wt, offset=offset) + else lm.fit(X, y, offset=offset) ++ class(z) <- "lm" # needed as deviance.lm calls generic residuals() + dfs[tt] <- z$rank +- RSS[tt] <- deviance.lm(z) ++ RSS[tt] <- deviance(z) + } + if(scale > 0) aic <- RSS/scale - n + k*dfs + else aic <- n * log(RSS/n) + k*dfs +diff -urp R-2.4.0.old/src/library/stats4/R/mle.R R-2.4.0/src/library/stats4/R/mle.R +--- R-2.4.0.old/src/library/stats4/R/mle.R 2006-04-09 17:19:08.000000000 -0500 ++++ R-2.4.0/src/library/stats4/R/mle.R 2006-10-28 14:35:52.000000000 -0500 +@@ -33,6 +33,7 @@ mle <- function(minuslogl, start=formals + if (any(is.na(oo))) + stop("some named arguments in 'start' are not arguments to the supplied log-likelihood") + start <- start[order(oo)] ++ nm <- names(start) ## reordered names needed + f <- function(p){ + l <- as.list(p) + names(l) <- nm +diff -urp R-2.4.0.old/src/library/tcltk/man/tcltk-package.Rd R-2.4.0/src/library/tcltk/man/tcltk-package.Rd +--- R-2.4.0.old/src/library/tcltk/man/tcltk-package.Rd 2006-04-09 17:19:08.000000000 -0500 ++++ R-2.4.0/src/library/tcltk/man/tcltk-package.Rd 2006-10-28 14:35:52.000000000 -0500 +@@ -16,7 +16,7 @@ and references in those files for more. + + The Tcl/Tk documentation is in + #ifdef windows +-\code{R_HOME/Tcl/doc}. ++\file{\link{R_HOME}/Tcl/doc}. + #endif + #ifdef unix + the system man pages. +@@ -27,7 +27,7 @@ For a complete list of functions, use \c + #ifdef unix + Note that Tk will not be initialized if there is no \code{DISPLAY} + variable set, but Tcl can still be used. This is most useful to allow +-the loading of a package which depends on \pkg{TclTk} in a session that ++the loading of a package which depends on \pkg{tcltk} in a session that + does not actually use it (e.g. during installation). + #endif + } +diff -urp R-2.4.0.old/src/library/utils/man/unix/RHOME.Rd R-2.4.0/src/library/utils/man/unix/RHOME.Rd +--- R-2.4.0.old/src/library/utils/man/unix/RHOME.Rd 2006-04-09 17:19:06.000000000 -0500 ++++ R-2.4.0/src/library/utils/man/unix/RHOME.Rd 2006-10-28 14:35:52.000000000 -0500 +@@ -1,6 +1,5 @@ + \name{RHOME} + \alias{RHOME} +-\alias{R_HOME} + \title{R Home Directory} + \description{ + Returns the location of the \R home directory, which is the root of +diff -urp R-2.4.0.old/src/library/utils/man/windows/clipboard.Rd R-2.4.0/src/library/utils/man/windows/clipboard.Rd +--- R-2.4.0.old/src/library/utils/man/windows/clipboard.Rd 2006-04-09 17:19:05.000000000 -0500 ++++ R-2.4.0/src/library/utils/man/windows/clipboard.Rd 2006-11-01 19:41:41.000000000 -0600 +@@ -2,6 +2,7 @@ + \alias{getClipboardFormats} + \alias{readClipboard} + \alias{writeClipboard} ++\alias{clipboard} + \title{Read/Write to/from the Windows Clipboard} + \description{ + Transfer text between a character vector and the Windows clipboard. +@@ -18,8 +19,10 @@ writeClipboard(str, format = 1) + } + \value{ + For \code{getClipboardFormats}, an integer vector of available formats. ++ + For \code{readClipboard}, a character vector by default, a raw vector if \code{raw} is + \code{TRUE}, or \code{NULL}, if the format is unavailable. ++ + For \code{writeClipboard} an invisible logical indicating success or failure. + } + \details{ +diff -urp R-2.4.0.old/src/library/utils/R/question.R R-2.4.0/src/library/utils/R/question.R +--- R-2.4.0.old/src/library/utils/R/question.R 2006-04-09 17:19:05.000000000 -0500 ++++ R-2.4.0/src/library/utils/R/question.R 2006-10-28 14:35:51.000000000 -0500 +@@ -79,12 +79,10 @@ topicName <- function(type, topic) + stop(gettextf("error in trying to evaluate the expression for argument '%s' (%s)", + arg, deparse(argExpr)), + domain = NA) +- methods::"elNamed<-"(sigClasses, arg, +- class(argVal)) ++ sigClasses[[arg]] <- class(argVal) + } + else +- methods::"elNamed<-"(sigClasses, arg, +- as.character(argExpr)) ++ sigClasses[[arg]] <- as.character(argExpr) + } + } + method <- methods::selectMethod(f, sigClasses, optional=TRUE, +diff -urp R-2.4.0.old/src/library/utils/R/str.R R-2.4.0/src/library/utils/R/str.R +--- R-2.4.0.old/src/library/utils/R/str.R 2006-09-18 21:05:14.000000000 -0500 ++++ R-2.4.0/src/library/utils/R/str.R 2006-11-03 19:41:46.000000000 -0600 +@@ -103,14 +103,11 @@ str.default <- + mod <- ""; char.like <- FALSE + if(give.attr) a <- attributes(object)#-- save for later... + +- if(is.function(object)) { +- cat(if(is.null(ao <- args(object))) deparse(object) +- else { dp <- deparse(ao); paste(dp[-length(dp)], collapse="\n") },"\n") +- } else if (is.null(object)) ++ if (is.null(object)) + cat(" NULL\n") + else if(S4) { + a <- sapply(methods::.slotNames(object), methods::slot, +- object=object, simplify = FALSE) ++ object=object, simplify = FALSE) + cat("Formal class", " '", paste(cl, collapse = "', '"), + "' [package \"", attr(cl,"package"), "\"] with ", + length(a)," slots\n", sep="") +@@ -120,7 +117,10 @@ str.default <- + nchar.max = nchar.max, give.attr = give.attr, width=width) + return(invisible()) + } +- else if(is.list(object)) { ++ else if(is.function(object)) { ++ cat(if(is.null(ao <- args(object))) deparse(object) ++ else { dp <- deparse(ao); paste(dp[-length(dp)], collapse="\n") },"\n") ++ } else if(is.list(object)) { + i.pl <- is.pairlist(object) + is.d.f <- is.data.frame(object) + ##?if(is.d.f) std.attr <- c(std.attr, "class", if(is.d.f) "row.names") +diff -urp R-2.4.0.old/src/main/character.c R-2.4.0/src/main/character.c +--- R-2.4.0.old/src/main/character.c 2006-09-04 09:41:33.000000000 -0500 ++++ R-2.4.0/src/main/character.c 2006-10-28 14:35:58.000000000 -0500 +@@ -718,6 +718,8 @@ SEXP attribute_hidden do_abbrev(SEXP cal + SET_STRING_ELT(ans, i, NA_STRING); + else { + warn = warn | !utf8strIsASCII(CHAR(STRING_ELT(x, i))); ++ if(strlen(CHAR(STRING_ELT(x, i))) >= MAXELTSIZE) ++ errorcall(call, "element %d is too long", i+1); + SET_STRING_ELT(ans, i, + stripchars(STRING_ELT(x, i), minlen)); + } +diff -urp R-2.4.0.old/src/main/CommandLineArgs.c R-2.4.0/src/main/CommandLineArgs.c +--- R-2.4.0.old/src/main/CommandLineArgs.c 2006-09-04 09:41:33.000000000 -0500 ++++ R-2.4.0/src/main/CommandLineArgs.c 2006-10-29 10:45:43.000000000 -0600 +@@ -85,6 +85,10 @@ do_commandArgs(SEXP call, SEXP op, SEXP + return vals; + } + ++#ifdef Win32 ++extern int R_LoadRconsole; ++#endif ++ + void + R_common_command_line(int *pac, char **argv, Rstart Rp) + { +@@ -141,6 +145,9 @@ R_common_command_line(int *pac, char **a + Rp->LoadInitFile = FALSE; /* --no-init-file */ + R_RestoreHistory = 0; /* --no-restore-history */ + Rp->NoRenviron = TRUE; ++#ifdef Win32 ++ R_LoadRconsole = 0; ++#endif + } + else if (!strcmp(*av, "--no-environ")) { + Rp->NoRenviron = TRUE; +@@ -174,6 +181,11 @@ R_common_command_line(int *pac, char **a + R_StdinEnc[30] = '\0'; + } + } ++#ifdef Win32 ++ else if (!strcmp(*av, "--no-Rconsole")) { ++ R_LoadRconsole = 0; ++ } ++#endif + else if (!strcmp(*av, "-save") || + !strcmp(*av, "-nosave") || + !strcmp(*av, "-restore") || +diff -urp R-2.4.0.old/src/main/connections.c R-2.4.0/src/main/connections.c +--- R-2.4.0.old/src/main/connections.c 2006-09-13 21:05:06.000000000 -0500 ++++ R-2.4.0/src/main/connections.c 2006-10-28 14:35:57.000000000 -0500 +@@ -1177,7 +1177,7 @@ SEXP attribute_hidden do_gzfile(SEXP cal + PROTECT(ans = allocVector(INTSXP, 1)); + INTEGER(ans)[0] = ncon; + PROTECT(class = allocVector(STRSXP, 2)); +- SET_STRING_ELT(class, 0, mkChar("file")); ++ SET_STRING_ELT(class, 0, mkChar("gzfile")); + SET_STRING_ELT(class, 1, mkChar("connection")); + classgets(ans, class); + UNPROTECT(2); +diff -urp R-2.4.0.old/src/main/deparse.c R-2.4.0/src/main/deparse.c +--- R-2.4.0.old/src/main/deparse.c 2006-09-11 21:05:02.000000000 -0500 ++++ R-2.4.0/src/main/deparse.c 2006-11-03 19:41:47.000000000 -0600 +@@ -245,6 +245,7 @@ static SEXP deparse1WithCutoff(SEXP call + if (abbrev) { + char data[14]; + strncpy(data, CHAR(STRING_ELT(svec, 0)), 10); ++ data[10] = '\0'; + if (strlen(CHAR(STRING_ELT(svec, 0))) > 10) strcat(data, "..."); + svec = mkString(data); + } else if(R_BrowseLines > 0 && +diff -urp R-2.4.0.old/src/main/plot3d.c R-2.4.0/src/main/plot3d.c +--- R-2.4.0.old/src/main/plot3d.c 2006-09-07 21:05:22.000000000 -0500 ++++ R-2.4.0/src/main/plot3d.c 2006-10-28 14:35:58.000000000 -0500 +@@ -1475,6 +1475,7 @@ SEXP attribute_hidden do_contour(SEXP ca + warning(_("all z values are equal")); + else + warning(_("all z values are NA")); ++ UNPROTECT(4); + return R_NilValue; + } + +diff -urp R-2.4.0.old/src/main/saveload.c R-2.4.0/src/main/saveload.c +--- R-2.4.0.old/src/main/saveload.c 2006-09-25 21:05:07.000000000 -0500 ++++ R-2.4.0/src/main/saveload.c 2006-10-28 14:35:58.000000000 -0500 +@@ -2358,6 +2358,7 @@ SEXP attribute_hidden do_loadFromConn2(S + PROTECT(res = RestoreToEnv(R_Unserialize(&in), aenv)); + if (wasopen) { + endcontext(&cntxt); ++ } else { + con->close(con); + } + UNPROTECT(1); +diff -urp R-2.4.0.old/src/main/subscript.c R-2.4.0/src/main/subscript.c +--- R-2.4.0.old/src/main/subscript.c 2006-09-04 09:41:33.000000000 -0500 ++++ R-2.4.0/src/main/subscript.c 2006-10-28 14:35:58.000000000 -0500 +@@ -369,7 +369,8 @@ static SEXP stringSubscript(SEXP s, int + int i, j, nnames, sub, extra; + int canstretch = *stretch; + #ifdef USE_HASHING +- Rboolean usehashing = in && (ns * nx > 1000); ++ /* product may overflow, so check factors as well. */ ++ Rboolean usehashing = in && ( (ns > 1000 && nx) || (nx > 1000 && ns) || (ns * nx > 1000) ); + #else + Rboolean usehashing = FALSE; + #endif +diff -urp R-2.4.0.old/src/main/sysutils.c R-2.4.0/src/main/sysutils.c +--- R-2.4.0.old/src/main/sysutils.c 2006-09-07 21:05:22.000000000 -0500 ++++ R-2.4.0/src/main/sysutils.c 2006-10-31 19:41:45.000000000 -0600 +@@ -170,6 +170,7 @@ FILE *R_popen(char *command, char *type) + #ifdef __APPLE_CC__ + /* Luke recommends this to fix PR#1140 */ + sigset_t ss; ++ sigemptyset(&ss); + sigaddset(&ss, SIGPROF); + sigprocmask(SIG_BLOCK, &ss, NULL); + fp = popen(command, type); +@@ -187,6 +188,7 @@ int R_system(char *command) + #ifdef __APPLE_CC__ + /* Luke recommends this to fix PR#1140 */ + sigset_t ss; ++ sigemptyset(&ss); + sigaddset(&ss, SIGPROF); + sigprocmask(SIG_BLOCK, &ss, NULL); + #ifdef HAVE_AQUA +diff -urp R-2.4.0.old/src/modules/X11/dataentry.c R-2.4.0/src/modules/X11/dataentry.c +--- R-2.4.0.old/src/modules/X11/dataentry.c 2006-09-04 09:41:34.000000000 -0500 ++++ R-2.4.0/src/modules/X11/dataentry.c 2006-10-28 14:35:58.000000000 -0500 +@@ -1046,7 +1046,7 @@ static void printstring(char *ibuf, int + for(j=0;*(wcspc+j)!=L'\0';j++)wcs[j]=*(wcspc+j); + wcs[j]=L'\0'; + w_p=wcs; +- cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(wcs),NULL); ++ cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(s)-1,NULL); + s[cnt]='\0'; + if (textwidth(s, strlen(s)) < (bw - text_offset)) break; + *(++wcspc) = L'<'; +@@ -1056,7 +1056,7 @@ static void printstring(char *ibuf, int + for(j=0;*(wcspc+j)!=L'\0';j++)wcs[j]=*(wcspc+j); + wcs[j]=L'\0'; + w_p=wcs; +- cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(wcs),NULL); ++ cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(s)-1,NULL); + s[cnt]='\0'; + if (textwidth(s, strlen(s)) < (bw - text_offset)) break; + *(wcspbuf + i - 2) = L'>'; +@@ -1066,7 +1066,7 @@ static void printstring(char *ibuf, int + for(j=0;*(wcspc+j)!=L'\0';j++) wcs[j]=*(wcspc+j); + wcs[j]=L'\0'; + w_p=wcs; +- cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(wcs),NULL); ++ cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(s)-1,NULL); + + drawtext(x_pos + text_offset, y_pos + box_h - text_offset, s, cnt); + +@@ -2398,6 +2398,7 @@ static int last_wchar_bytes(char *str) + int cnt; + char last_mbs[8]; + char *mbs; ++ size_t bytes; + + mbs = (str == NULL) ? buf : str; + +@@ -2411,8 +2412,8 @@ static int last_wchar_bytes(char *str) + if(wcs[0] == L'\0') return 0; + + memset(last_mbs, 0, sizeof(last_mbs)); +- wcrtomb(last_mbs, wcs[cnt-1], &mb_st); +- return(strlen(last_mbs)); ++ bytes=wcrtomb(last_mbs, wcs[cnt-1], &mb_st); /* -Wall */ ++ return(bytes); + #else + return(1); + #endif +diff -urp R-2.4.0.old/src/modules/X11/rotated.c R-2.4.0/src/modules/X11/rotated.c +--- R-2.4.0.old/src/modules/X11/rotated.c 2006-04-09 17:19:54.000000000 -0500 ++++ R-2.4.0/src/modules/X11/rotated.c 2006-10-28 14:35:58.000000000 -0500 +@@ -2285,7 +2285,8 @@ static RotatedTextItem + /* where abouts does text actually lie in rotated image? */ + /* check angle within 0.5 degrees (0.008 radians) */ + if(fabs((double)angle)<0.008 || fabs((double)angle-M_PI/2)<0.008 || +- fabs((double)angle-M_PI)<0.008 || fabs((double)angle-3*M_PI/2)<0.008) { ++ fabs((double)angle-M_PI)<0.008 || fabs((double)angle-3*M_PI/2)<0.008 || ++ fabs((double)angle-2*M_PI)<0.008) { + xl=0; + xr=(double)item->cols_out; + xinc=0; +diff -urp R-2.4.0.old/src/scripts/texi2dvi R-2.4.0/src/scripts/texi2dvi +--- R-2.4.0.old/src/scripts/texi2dvi 2006-05-18 04:13:54.000000000 -0500 ++++ R-2.4.0/src/scripts/texi2dvi 2006-10-03 07:18:04.000000000 -0500 +@@ -27,7 +27,7 @@ + # the `--debug' option when making a bug report. + + # This string is expanded by rcs automatically when this file is checked out. +-rcs_revision='$Revision: 1.1 $' ++rcs_revision='$Revision: 1.1 $' + rcs_version=`set - $rcs_revision; echo $2` + program=`echo $0 | sed -e 's!.*/!!'` + version="texi2dvi (GNU Texinfo 4.8) $rcs_version +diff -urp R-2.4.0.old/SVN-REVISION R-2.4.0/SVN-REVISION +--- R-2.4.0.old/SVN-REVISION 2006-10-03 05:02:46.000000000 -0500 ++++ R-2.4.0/SVN-REVISION 2006-11-03 19:54:14.000000000 -0600 +@@ -1,2 +1,2 @@ +-Revision: 39566 +-Last Changed Date: 2006-10-03 ++Revision: 39789 ++Last Changed Date: 2006-11-03 +diff -urp R-2.4.0.old/tests/no-segfault.Rin R-2.4.0/tests/no-segfault.Rin +--- R-2.4.0.old/tests/no-segfault.Rin 2006-05-18 04:38:21.000000000 -0500 ++++ R-2.4.0/tests/no-segfault.Rin 2006-10-28 14:36:01.000000000 -0500 +@@ -41,7 +41,7 @@ dev.int <- c("X11", "x11", "pdf", "posts + misc.2 <- c("help.start", "browseEnv", + "gctorture", "q", "quit", "restart", "try", + "read.fwf", "source",## << MM thinks "FIXME" +- "data.entry", "dataentry", "de", apropos("^de\."), ++ "data.entry", "dataentry", "de", apropos("^de\\."), + "chooseCRANmirror", "setRepositories", "select.list") + if(.Platform$OS.type == "windows") { + dev.int <- c(dev.int, "bmp", "windows", "win.graph", "win.print", +diff -urp R-2.4.0.old/tests/reg-plot.ps.save R-2.4.0/tests/reg-plot.ps.save +--- R-2.4.0.old/tests/reg-plot.ps.save 2006-04-09 17:20:05.000000000 -0500 ++++ R-2.4.0/tests/reg-plot.ps.save 2006-10-28 14:36:01.000000000 -0500 +@@ -768,31 +768,31 @@ o + ep + %%Page: 4 4 + bp +-77.04 91.44 793.65 518.24 cl ++106.56 128.16 778.53 488.72 cl + 18.00 18.00 823.89 577.28 cl + /ps 18 def /Font1 findfont 18 s + 0 0 0 rgb +-111.19 100.22 (50-54) 0 0 0 t +-111.19 115.46 (55-59) 0 0 0 t +-111.19 130.71 (60-64) 0 0 0 t +-111.19 145.95 (65-69) 0 0 0 t +-111.19 161.19 (70-74) 0 0 0 t +-111.19 206.92 (50-54) 0 0 0 t +-111.19 222.16 (55-59) 0 0 0 t +-111.19 237.40 (60-64) 0 0 0 t +-111.19 252.65 (65-69) 0 0 0 t +-111.19 267.89 (70-74) 0 0 0 t +-111.19 313.62 (50-54) 0 0 0 t +-111.19 328.86 (55-59) 0 0 0 t +-111.19 344.10 (60-64) 0 0 0 t +-111.19 359.35 (65-69) 0 0 0 t +-111.19 374.59 (70-74) 0 0 0 t +-111.19 420.32 (50-54) 0 0 0 t +-111.19 435.56 (55-59) 0 0 0 t +-111.19 450.80 (60-64) 0 0 0 t +-111.19 466.05 (65-69) 0 0 0 t +-111.19 481.29 (70-74) 0 0 0 t +-168.93 91.44 793.65 518.24 cl ++126.31 134.57 (50-54) 0 0 0 t ++126.31 147.45 (55-59) 0 0 0 t ++126.31 160.33 (60-64) 0 0 0 t ++126.31 173.21 (65-69) 0 0 0 t ++126.31 186.08 (70-74) 0 0 0 t ++126.31 224.71 (50-54) 0 0 0 t ++126.31 237.59 (55-59) 0 0 0 t ++126.31 250.47 (60-64) 0 0 0 t ++126.31 263.34 (65-69) 0 0 0 t ++126.31 276.22 (70-74) 0 0 0 t ++126.31 314.85 (50-54) 0 0 0 t ++126.31 327.73 (55-59) 0 0 0 t ++126.31 340.61 (60-64) 0 0 0 t ++126.31 353.48 (65-69) 0 0 0 t ++126.31 366.36 (70-74) 0 0 0 t ++126.31 404.99 (50-54) 0 0 0 t ++126.31 417.87 (55-59) 0 0 0 t ++126.31 430.75 (60-64) 0 0 0 t ++126.31 443.62 (65-69) 0 0 0 t ++126.31 456.50 (70-74) 0 0 0 t ++184.05 128.16 778.53 488.72 cl + 0.7451 0.7451 0.7451 rgb + 0.75 setlinewidth + [ 0.00 4.00] 0 setdash +@@ -800,170 +800,170 @@ bp + 1 setlinejoin + 10.00 setmiterlimit + np +-168.93 106.68 m +-624.72 0 l ++184.05 141.04 m ++594.48 0 l + o + np +-168.93 121.93 m +-624.72 0 l ++184.05 153.91 m ++594.48 0 l + o + np +-168.93 137.17 m +-624.72 0 l ++184.05 166.79 m ++594.48 0 l + o + np +-168.93 152.41 m +-624.72 0 l ++184.05 179.67 m ++594.48 0 l + o + np +-168.93 167.65 m +-624.72 0 l ++184.05 192.54 m ++594.48 0 l + o + np +-168.93 213.38 m +-624.72 0 l ++184.05 231.18 m ++594.48 0 l + o + np +-168.93 228.62 m +-624.72 0 l ++184.05 244.05 m ++594.48 0 l + o + np +-168.93 243.87 m +-624.72 0 l ++184.05 256.93 m ++594.48 0 l + o + np +-168.93 259.11 m +-624.72 0 l ++184.05 269.81 m ++594.48 0 l + o + np +-168.93 274.35 m +-624.72 0 l ++184.05 282.68 m ++594.48 0 l + o + np +-168.93 320.08 m +-624.72 0 l ++184.05 321.31 m ++594.48 0 l + o + np +-168.93 335.32 m +-624.72 0 l ++184.05 334.19 m ++594.48 0 l + o + np +-168.93 350.57 m +-624.72 0 l ++184.05 347.07 m ++594.48 0 l + o + np +-168.93 365.81 m +-624.72 0 l ++184.05 359.95 m ++594.48 0 l + o + np +-168.93 381.05 m +-624.72 0 l ++184.05 372.82 m ++594.48 0 l + o + np +-168.93 426.78 m +-624.72 0 l ++184.05 411.45 m ++594.48 0 l + o + np +-168.93 442.02 m +-624.72 0 l ++184.05 424.33 m ++594.48 0 l + o + np +-168.93 457.26 m +-624.72 0 l ++184.05 437.21 m ++594.48 0 l + o + np +-168.93 472.51 m +-624.72 0 l ++184.05 450.08 m ++594.48 0 l + o + np +-168.93 487.75 m +-624.72 0 l ++184.05 462.96 m ++594.48 0 l + o + 0 0 0 rgb + 0.75 setlinewidth + [] 0 setdash +-192.07 106.68 4.05 c p1 +-240.04 121.93 4.05 c p1 +-292.63 137.17 4.05 c p1 +-438.39 152.41 4.05 c p1 +-575.85 167.65 4.05 c p1 +-256.65 213.38 4.05 c p1 +-338.75 228.62 4.05 c p1 +-455.92 243.87 4.05 c p1 +-618.29 259.11 4.05 c p1 +-770.51 274.35 4.05 c p1 +-194.84 320.08 4.05 c p1 +-222.51 335.32 4.05 c p1 +-301.85 350.57 4.05 c p1 +-399.64 365.81 4.05 c p1 +-615.52 381.05 4.05 c p1 +-222.51 426.78 4.05 c p1 +-281.56 442.02 4.05 c p1 +-362.74 457.26 4.05 c p1 +-492.82 472.51 4.05 c p1 +-723.46 487.75 4.05 c p1 ++206.07 141.04 4.05 c p1 ++251.72 153.91 4.05 c p1 ++301.76 166.79 4.05 c p1 ++440.47 179.67 4.05 c p1 ++571.27 192.54 4.05 c p1 ++267.52 231.18 4.05 c p1 ++345.65 244.05 4.05 c p1 ++457.15 256.93 4.05 c p1 ++611.66 269.81 4.05 c p1 ++756.51 282.68 4.05 c p1 ++208.70 321.31 4.05 c p1 ++235.04 334.19 4.05 c p1 ++310.54 347.07 4.05 c p1 ++403.60 359.95 4.05 c p1 ++609.02 372.82 4.05 c p1 ++235.04 411.45 4.05 c p1 ++291.22 424.33 4.05 c p1 ++368.48 437.21 4.05 c p1 ++492.26 450.08 4.05 c p1 ++711.74 462.96 4.05 c p1 + 18.00 18.00 823.89 577.28 cl + /ps 18 def /Font1 findfont 18 s + 0 0 0 rgb +-48.24 496.53 (Rural Male) 0 0 0 t +-48.24 389.83 (Rural Female) 0 0 0 t +-48.24 283.13 (Urban Male) 0 0 0 t +-48.24 176.43 (Urban Female) 0 0 0 t ++63.36 469.38 (Rural Male) 0 0 0 t ++63.36 379.24 (Rural Female) 0 0 0 t ++63.36 289.10 (Urban Male) 0 0 0 t ++63.36 198.96 (Urban Female) 0 0 0 t + 0.75 setlinewidth + [] 0 setdash + 1 setlinecap + 1 setlinejoin + 10.00 setmiterlimit + np +-206.83 91.44 m +-553.53 0 l ++220.11 128.16 m ++526.75 0 l + o + np +-206.83 91.44 m ++220.11 128.16 m + 0 -10.80 l + o + np +-299.08 91.44 m ++307.90 128.16 m + 0 -10.80 l + o + np +-391.34 91.44 m ++395.69 128.16 m + 0 -10.80 l + o + np +-483.60 91.44 m ++483.48 128.16 m + 0 -10.80 l + o + np +-575.85 91.44 m ++571.27 128.16 m + 0 -10.80 l + o + np +-668.11 91.44 m ++659.06 128.16 m + 0 -10.80 l + o + np +-760.36 91.44 m ++746.86 128.16 m + 0 -10.80 l + o +-206.83 52.56 (10) .5 0 0 t +-299.08 52.56 (20) .5 0 0 t +-391.34 52.56 (30) .5 0 0 t +-483.60 52.56 (40) .5 0 0 t +-575.85 52.56 (50) .5 0 0 t +-668.11 52.56 (60) .5 0 0 t +-760.36 52.56 (70) .5 0 0 t +-np +-168.93 91.44 m +-624.72 0 l +-0 426.80 l +--624.72 0 l +-0 -426.80 l ++220.11 89.28 (10) .5 0 0 t ++307.90 89.28 (20) .5 0 0 t ++395.69 89.28 (30) .5 0 0 t ++483.48 89.28 (40) .5 0 0 t ++571.27 89.28 (50) .5 0 0 t ++659.06 89.28 (60) .5 0 0 t ++746.86 89.28 (70) .5 0 0 t ++np ++184.05 128.16 m ++594.48 0 l ++0 360.56 l ++-594.48 0 l ++0 -360.56 l + o + 18.00 18.00 823.89 577.28 cl + /ps 22 def /Font2 findfont 22 s + 0 0 0 rgb +-481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t ++481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t + ep + %%Page: 5 5 + bp +@@ -3771,8 +3771,8 @@ np + 0 -7.20 l + o + /ps 12 def /Font1 findfont 12 s +-78.70 65.52 (1 e-11) .5 0 0 t +-222.02 65.52 (1 e+53) .5 0 0 t ++78.70 65.52 (1e-11) .5 0 0 t ++222.02 65.52 (1e+53) .5 0 0 t + 365.35 65.52 (1e+117) .5 0 0 t + 508.68 65.52 (1e+181) .5 0 0 t + 652.00 65.52 (1e+245) .5 0 0 t +@@ -3800,8 +3800,8 @@ np + 77.04 436.50 m + -7.20 0 l + o +-59.76 92.27 (1 e-10) .5 0 90 t +-59.76 178.32 (1 e+49) .5 0 90 t ++59.76 92.27 (1e-10) .5 0 90 t ++59.76 178.32 (1e+49) .5 0 90 t + 59.76 264.38 (1e+108) .5 0 90 t + 59.76 350.44 (1e+167) .5 0 90 t + 59.76 436.50 (1e+226) .5 0 90 t +diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R +--- R-2.4.0.old/tests/reg-tests-1.R 2006-09-25 21:05:07.000000000 -0500 ++++ R-2.4.0/tests/reg-tests-1.R 2006-10-28 14:36:01.000000000 -0500 +@@ -4494,3 +4494,20 @@ test <- 1:10 + try(test[2:4] <- ls) # fails + stopifnot(!exists("*tmp*", where=1)) + ## was true < 2.4.0 ++ ++ ++## merge on zero-row data frames ++L3 <- LETTERS[1:3] ++d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE)) ++e <- d[-1,] ++merge(d, e, by.x = "x", by.y = "x", all.x = TRUE) ++## ++ ++ ++## PR#9313 ++library(stats4) ++g <- function(x, y) -cos(x) + abs(y) ++fit1 <- mle(g, start = list(x = 0, y = 7)) ++fit2 <- mle(g, start = list(y = 7, x = 0)) ++stopifnot(all.equal(coef(fit1), coef(fit2))) ++## Found different solutions in 2.4.0, as names were not remapped in fit2 +diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R +--- R-2.4.0.old/tests/reg-tests-2.R 2006-09-22 21:05:09.000000000 -0500 ++++ R-2.4.0/tests/reg-tests-2.R 2006-10-28 14:36:01.000000000 -0500 +@@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",") + + + ### end of tests added in 2.4.0 ### ++ ++ ++## Platform-specific behaviour in lowess reported to R-help ++## 2006-10-12 by Frank Harrell ++x <- c(0,7,8,14,15,120,242) ++y <- c(122,128,130,158,110,110,92) ++lowess(x, y, iter=0) ++lowess(x, y) ++## MAD of iterated residuals was zero, and result depended on the platform. ++ ++ ++### end of tests added in 2.4.1 ### +diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save +--- R-2.4.0.old/tests/reg-tests-2.Rout.save 2006-09-25 21:05:07.000000000 -0500 ++++ R-2.4.0/tests/reg-tests-2.Rout.save 2006-10-28 14:36:01.000000000 -0500 +@@ -1,6 +1,6 @@ + +-R version 2.4.0 beta (2005-09-25 r39509) +-Copyright (C) The R Foundation for Statistical Computing ++R version 2.5.0 Under development (unstable) (2006-10-15 r39637) ++Copyright (C) 2006 The R Foundation for Statistical Computing + ISBN 3-900051-07-0 + + R is free software and comes with ABSOLUTELY NO WARRANTY. +@@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg + > + > ### end of tests added in 2.4.0 ### + > ++> ++> ## Platform-specific behaviour in lowess reported to R-help ++> ## 2006-10-12 by Frank Harrell ++> x <- c(0,7,8,14,15,120,242) ++> y <- c(122,128,130,158,110,110,92) ++> lowess(x, y, iter=0) ++$x ++[1] 0 7 8 14 15 120 242 ++ ++$y ++[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903 92.00003 ++ ++> lowess(x, y) ++$x ++[1] 0 7 8 14 15 120 242 ++ ++$y ++[1] 122 128 128 158 110 110 92 ++ ++> ## MAD of iterated residuals was zero, and result depended on the platform. ++> ++> ++> ### end of tests added in 2.4.1 ### ++> +diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION +--- R-2.4.0.old/VERSION 2006-10-03 05:00:12.000000000 -0500 ++++ R-2.4.0/VERSION 2006-10-03 07:19:25.000000000 -0500 +@@ -1 +1 @@ +-2.4.0 ++2.4.0 Patched commit 11948727f254b32321ec7ba13366df9aa276aa7f Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Nov 4 06:19:58 2006 +0000 Patch from upstream diff --git a/R-2.4.0-patched-2006-11-03.patch b/R-2.4.0-patched-2006-11-03.patch new file mode 100644 index 0000000..4c82dd7 --- /dev/null +++ b/R-2.4.0-patched-2006-11-03.patch @@ -0,0 +1,10076 @@ +diff -urp R-2.4.0.old/config.site R-2.4.0/config.site +--- R-2.4.0.old/config.site 2006-09-04 09:41:48.000000000 -0500 ++++ R-2.4.0/config.site 2006-10-28 14:36:13.000000000 -0500 +@@ -43,12 +43,16 @@ + ## If unspecified, a search is made for gcc and cc (in that order). + ## To override this choice, specify the name of the command which runs + ## the compiler here, for example 'c89'. ++## It is also convenient to set the architecture here, e.g. 'gcc -m32'. ++## NB, as from R 2.5.0 configure will append flags for C99 compliance, ++## e.g. CC=gcc -std=gnu99 ++## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS. + ## CC= + + ## Debugging and optimization options for the C compiler. + ## Use this to specify CFLAGS for the version of the C compiler + ## specified above. +-## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, ++## If unspecified, defaults to '-g -O2' for gcc, + ## and '-g' in all other cases except icc (for which see R-admin.html). + ## CFLAGS= + +diff -urp R-2.4.0.old/configure R-2.4.0/configure +--- R-2.4.0.old/configure 2006-10-03 05:01:50.000000000 -0500 ++++ R-2.4.0/configure 2006-11-03 19:41:47.000000000 -0600 +@@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++## next is a macro borrowed from autoconf 2.60 ++ echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6 ++if test "${ac_cv_prog_cc_c99+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_c99=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdarg.h> ++#include <stdbool.h> ++#include <stdlib.h> ++#include <wchar.h> ++#include <stdio.h> ++ ++struct incomplete_array ++{ ++ int datasize; ++ double data[]; ++}; ++ ++struct named_init { ++ int number; ++ const wchar_t *name; ++ double average; ++}; ++ ++typedef const char *ccp; ++ ++static inline int ++test_restrict(ccp restrict text) ++{ ++ // See if C++-style comments work. ++ // Iterate through items via the restricted pointer. ++ // Also check for declarations in for loops. ++ for (unsigned int i = 0; *(text+i) != '\0'; ++i) ++ continue; ++ return 0; ++} ++ ++// Check varargs and va_copy work. ++static void ++test_varargs(const char *format, ...) ++{ ++ va_list args; ++ va_start(args, format); ++ va_list args_copy; ++ va_copy(args_copy, args); ++ ++ const char *str; ++ int number; ++ float fnumber; ++ ++ while (*format) ++ { ++ switch (*format++) ++ { ++ case 's': // string ++ str = va_arg(args_copy, const char *); ++ break; ++ case 'd': // int ++ number = va_arg(args_copy, int); ++ break; ++ case 'f': // float ++ fnumber = (float) va_arg(args_copy, double); ++ break; ++ default: ++ break; ++ } ++ } ++ va_end(args_copy); ++ va_end(args); ++} ++ ++int ++main () ++{ ++ ++ // Check bool and long long datatypes. ++ _Bool success = false; ++ long long int bignum = -1234567890LL; ++ unsigned long long int ubignum = 1234567890uLL; ++ ++ // Check restrict. ++ if (test_restrict("String literal") != 0) ++ success = true; ++ char *restrict newvar = "Another string"; ++ ++ // Check varargs. ++ test_varargs("s, d' f .", "string", 65, 34.234); ++ ++ // Check incomplete arrays work. ++ struct incomplete_array *ia = ++ malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10)); ++ ia->datasize = 10; ++ for (int i = 0; i < ia->datasize; ++i) ++ ia->data[i] = (double) i * 1.234; ++ ++ // Check named initialisers. ++ struct named_init ni = { ++ .number = 34, ++ .name = L"Test wide string", ++ .average = 543.34343, ++ }; ++ ++ ni.number = 58; ++ ++ int dynamic_array[ni.number]; ++ dynamic_array[43] = 543; ++ ++ // work around unused variable warnings ++ return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; ++ ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99 ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_c99=$ac_arg ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c99" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c99" in ++ x) ++ echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6 ;; ++ xno) ++ echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6 ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c99" ++ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6 ;; ++esac ++ ++ ++ + + + ac_ext=c +@@ -5352,7 +5528,7 @@ fi + + + # Provide some information about the compiler. +-echo "$as_me:5355:" \ ++echo "$as_me:5531:" \ + "checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 +@@ -6181,8 +6357,8 @@ if test "${r_cv_prog_cc_vis}" = yes; the + fi + fi + case "${CC}" in +- ## Intel compiler +- *icc) ++ ## Intel compiler: note that -c99 may have been appended ++ *icc*) + C_VISIBILITY= + ;; + esac +@@ -6794,7 +6970,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6797 "configure"' > conftest.$ac_ext ++ echo '#line 6973 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8235,11 +8411,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8238: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8414: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8242: \$? = $ac_status" >&5 ++ echo "$as_me:8418: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -8468,11 +8644,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8471: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8647: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8475: \$? = $ac_status" >&5 ++ echo "$as_me:8651: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -8528,11 +8704,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8531: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8707: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8535: \$? = $ac_status" >&5 ++ echo "$as_me:8711: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10712,7 +10888,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10715 "configure" ++#line 10891 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10810,7 +10986,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10813 "configure" ++#line 10989 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12990,11 +13166,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12993: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13169: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12997: \$? = $ac_status" >&5 ++ echo "$as_me:13173: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -13050,11 +13226,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13053: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13229: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13057: \$? = $ac_status" >&5 ++ echo "$as_me:13233: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14411,7 +14587,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 14414 "configure" ++#line 14590 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14509,7 +14685,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 14512 "configure" ++#line 14688 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -15336,11 +15512,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15339: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15515: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15343: \$? = $ac_status" >&5 ++ echo "$as_me:15519: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -15396,11 +15572,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15399: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15575: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15403: \$? = $ac_status" >&5 ++ echo "$as_me:15579: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17430,11 +17606,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17433: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17609: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17437: \$? = $ac_status" >&5 ++ echo "$as_me:17613: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -17663,11 +17839,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17666: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17842: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17670: \$? = $ac_status" >&5 ++ echo "$as_me:17846: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -17723,11 +17899,11 @@ else + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17726: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17902: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17730: \$? = $ac_status" >&5 ++ echo "$as_me:17906: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -19907,7 +20083,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 19910 "configure" ++#line 20086 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -20005,7 +20181,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 20008 "configure" ++#line 20184 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -26291,96 +26467,6 @@ _ACEOF + + + +-if test "$ac_test_CFLAGS" != set; then +- if test "$GCC" = yes; then +- ac_safe=_std_gnu99 +-echo "$as_me:$LINENO: checking whether ${CC} accepts -std=gnu99" >&5 +-echo $ECHO_N "checking whether ${CC} accepts -std=gnu99... $ECHO_C" >&6 +-if eval "test \"\${r_cv_prog_cc_flag_${ac_safe}+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-r_save_CFLAGS="${CFLAGS}" +-CFLAGS="${CFLAGS} -std=gnu99" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "r_cv_prog_cc_flag_${ac_safe}=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-eval "r_cv_prog_cc_flag_${ac_safe}=no" +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-CFLAGS="${r_save_CFLAGS}" +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-fi +- +-if eval "test \"`echo '$r_cv_prog_cc_flag_'$ac_safe`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- separator="" +-test -z "${separator}" && separator=" " +-if test -z "${CFLAGS}"; then +- CFLAGS="-std=gnu99" +-else +- CFLAGS="${CFLAGS}${separator}-std=gnu99" +-fi +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +-fi +- + + echo "$as_me:$LINENO: checking whether we can compute C Make dependencies" >&5 + echo $ECHO_N "checking whether we can compute C Make dependencies... $ECHO_C" >&6 +@@ -26535,7 +26621,7 @@ _ACEOF + # flags. + ac_save_FFLAGS=$FFLAGS + FFLAGS="$FFLAGS $ac_verb" +-(eval echo $as_me:26538: \"$ac_link\") >&5 ++(eval echo $as_me:26624: \"$ac_link\") >&5 + ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$ac_f77_v_output" >&5 + FFLAGS=$ac_save_FFLAGS +@@ -26613,7 +26699,7 @@ _ACEOF + # flags. + ac_save_FFLAGS=$FFLAGS + FFLAGS="$FFLAGS $ac_cv_prog_f77_v" +-(eval echo $as_me:26616: \"$ac_link\") >&5 ++(eval echo $as_me:26702: \"$ac_link\") >&5 + ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$ac_f77_v_output" >&5 + FFLAGS=$ac_save_FFLAGS +@@ -26859,7 +26945,7 @@ _ACEOF + # flags. + r_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $r_verb" +-(eval echo $as_me:26862: \"$ac_link\") >&5 ++(eval echo $as_me:26948: \"$ac_link\") >&5 + r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$r_c_v_output" >&5 + CFLAGS=$r_save_CFLAGS +@@ -26941,7 +27027,7 @@ _ACEOF + # flags. + r_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $r_cv_prog_c_v" +-(eval echo $as_me:26944: \"$ac_link\") >&5 ++(eval echo $as_me:27030: \"$ac_link\") >&5 + r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` + echo "$r_c_v_output" >&5 + CFLAGS=$r_save_CFLAGS +@@ -29188,7 +29274,7 @@ fi + linux*) + case "${CC}" in + ## Intel compiler +- *icc) ++ *icc*) + ## icc declares __GNUC__, so it picks up CFLAGS intended for gcc. + if test "$ac_test_CFLAGS" != set; then + if test $ac_cv_prog_cc_g = yes; then +@@ -29922,12 +30008,12 @@ echo "$as_me: WARNING: Use of flat names + ;; + linux*) # GNU Linux/ELF + case "${CC}" in +- ## Intel compiler +- *icc) ++ ## Intel compiler: note that -c99 may have been appended ++ *icc*) + cpicflags="-fpic" + ;; + ## Portland Group +- *pgcc) ++ *pgcc*) + cpicflags="-fpic" + ;; + esac +@@ -37985,7 +38071,7 @@ ac_x_header_dirs=' + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -37993,7 +38079,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <X11/Intrinsic.h> ++#include <X11/Xlib.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -38020,7 +38106,7 @@ else + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -38041,7 +38127,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <X11/Intrinsic.h> ++#include <X11/Xlib.h> + #ifdef F77_DUMMY_MAIN + + # ifdef __cplusplus +@@ -38053,7 +38139,7 @@ cat >>conftest.$ac_ext <<_ACEOF + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -43510,6 +43596,7 @@ echo "${ECHO_T}in ${JAVA_HOME}" >&6 + case "${host_os}" in + darwin*) + JAVA_LIBS="-framework JavaVM" ++ JAVA_LIBS0="-framework JavaVM" + JAVA_LD_LIBRARY_PATH= + ;; + *) +@@ -43659,7 +43746,7 @@ fi + + + # Provide some information about the compiler. +-echo "$as_me:43662:" \ ++echo "$as_me:43748:" \ + "checking for Fortran compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 +diff -urp R-2.4.0.old/configure.ac R-2.4.0/configure.ac +--- R-2.4.0.old/configure.ac 2006-09-22 21:05:11.000000000 -0500 ++++ R-2.4.0/configure.ac 2006-10-28 14:36:13.000000000 -0500 +@@ -534,6 +534,8 @@ R_PROG_BROWSER + R_PROG_PDFVIEWER + + AC_PROG_CC ++## next is a macro borrowed from autoconf 2.60 ++AC_PROG_CC_C99 + + AC_PROG_GCC_TRADITIONAL + AC_PROG_CPP +@@ -752,12 +754,6 @@ AC_CHECK_SIZEOF(long, 4) + AC_CHECK_SIZEOF(long long, 0) + AC_CHECK_SIZEOF(long double, 0) + +-if test "$ac_test_CFLAGS" != set; then +- if test "$GCC" = yes; then +- R_PROG_CC_FLAG([-std=gnu99], R_SH_VAR_ADD(CFLAGS, [-std=gnu99])) +- fi +-fi +- + R_PROG_CC_MAKEFRAG + R_PROG_CC_LO_MAKEFRAG + +@@ -890,7 +886,7 @@ case "${host_os}" in + linux*) + case "${CC}" in + ## Intel compiler +- *icc) ++ *icc*) + ## icc declares __GNUC__, so it picks up CFLAGS intended for gcc. + if test "$ac_test_CFLAGS" != set; then + if test $ac_cv_prog_cc_g = yes; then +@@ -1289,12 +1285,12 @@ rm -f libconftest${DYLIB_EXT} conftest.c + ;; + linux*) # GNU Linux/ELF + case "${CC}" in +- ## Intel compiler +- *icc) ++ ## Intel compiler: note that -c99 may have been appended ++ *icc*) + cpicflags="-fpic" + ;; + ## Portland Group +- *pgcc) ++ *pgcc*) + cpicflags="-fpic" + ;; + esac +diff -urp R-2.4.0.old/doc/CRAN_mirrors.csv R-2.4.0/doc/CRAN_mirrors.csv +--- R-2.4.0.old/doc/CRAN_mirrors.csv 2006-09-16 21:05:15.000000000 -0500 ++++ R-2.4.0/doc/CRAN_mirrors.csv 2006-10-28 14:36:02.000000000 -0500 +@@ -32,7 +32,7 @@ Israel,Israel,Tel-Aviv,http://cran.activ + "Japan (Aizu)",Japan,Aizu,ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN,"University of Aizu", + "Japan (Tokyo)",Japan,Tokyo,ftp://ftp.ecc.u-tokyo.ac.jp/CRAN/,"University of Tokyo","Teru KAMOGASHIRA <teru(a)sodan.ecc.u-tokyo.ac.jp>" + "Japan (Tsukuba)",Japan,Tsukuba,http://cran.md.tsukuba.ac.jp/,"University of Tsukuba", +-Korea,Korea,Seoul,http://bibscvs.snu.ac.kr/R/,"Seoul National University","SungGON Yi <skon(a)kr.FreeBSD.org>" ++Korea,Korea,Seoul,http://bibs.snu.ac.kr/R/,"Seoul National University","SungGON Yi <skonmeme(a)gmail.com>" + Netherlands,Netherlands,Amsterdam,http://cran.nedmirror.nl/,"Nedmirror, Amsterdam",mirror(a)nedmirror.nl + Norway,Norway,Bergen,http://cran.ii.uib.no/,"University of Bergen",webmaster(a)ii.uib.no + "Poland (Lublin)",Poland,Lublin,http://novum.am.lublin.pl/CRAN/,"Skubiszewski Medical University, Lublin","Lukasz Komsta <luke(a)novum.am.lublin.pl>" +diff -urp R-2.4.0.old/doc/FAQ R-2.4.0/doc/FAQ +--- R-2.4.0.old/doc/FAQ 2006-10-03 05:02:46.000000000 -0500 ++++ R-2.4.0/doc/FAQ 2006-11-02 10:45:59.000000000 -0600 +@@ -1,6 +1,6 @@ + R FAQ + Frequently Asked Questions on R +-Version 2.4.2006-10-02 ++Version 2.4.2006-10-31 + ISBN 3-900051-08-9 + Kurt Hornik + +@@ -95,6 +95,7 @@ R FAQ + 7.34 How can I save the result of each iteration in a loop into a separate file? + 7.35 Why are p-values not displayed when using lmer()? + 7.36 Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader? ++ 7.37 Why does backslash behave strangely inside strings? + 8 R Programming + 8.1 How should I write summary methods? + 8.2 How can I debug dynamically loaded code? +@@ -388,20 +389,21 @@ port of R for Macintosh is no longer sup + + The `bin/linux' directory of a CRAN site contains the following packages. + +- CPU Versions Provider +- ------------------------------------------------------------------- +- Debian et al. i386 stable/oldstable Christian Steigies +- Mandrake i386 10.0 Michele Alzetta +- Red Hat i386 FC3/FC4/FC5 Martyn Plummer +- x86_64 FC3 Brian Ripley +- x86_64 FC4/FC5 Martyn Plummer +- i386 Enterprise Linux Matthew P. Cox +- x86_64 Enterprise Linux Matthew P. Cox +- SuSE i386 7.3/8.0/8.1/8.2 Detlef Steuer +- i586 9.0/9.1/9.2/9.3/10.0/10.1Detlef Steuer +- x86_64 9.2/9.3/10.0/10.1 Detlef Steuer +- Ubuntu i386 dapper Dirk Eddelbuettel +- VineLinux i386 3.2 Susunu Tanimura ++ CPU Versions Provider ++ ------------------------------------------------------------------------ ++ Debian et al. i386 stable/oldstable Christian Steigies ++ Mandrake i386 10.0 Michele Alzetta ++ Red Hat i386 FC3/FC4/FC5/FC6 Martyn Plummer ++ x86_64 FC3 Brian Ripley ++ x86_64 FC4/FC5 Martyn Plummer ++ i386 Enterprise Linux Matthew P. Cox ++ x86_64 Enterprise Linux Matthew P. Cox ++ SuSE i386 7.3/8.0/8.1/8.2 Detlef Steuer ++ i586 9.0/9.1/9.2/9.3/10.0/10.1 Detlef Steuer ++ x86_64 9.2/9.3/10.0/10.1 Detlef Steuer ++ Ubuntu i386 dapper Christian Steigies ++ amd64 dapper Christian Steigies ++ VineLinux i386 3.2 Susunu Tanimura + + Debian packages, maintained by Dirk Eddelbuettel and Doug Bates, have + long been part of the Debian distribution, and can be accessed through APT, +@@ -1211,8 +1213,8 @@ Computational and Graphical Statistics_, + + For a very long time, there was no such thing. + +- XL Solutions (http://www.xlsolutions-corp.com/) is currently beta +-testing a commercially supported version of R named R+ (read R plus). ++ XLSolutions Corporation (http://www.xlsolutions-corp.com/) is currently ++beta testing a commercially supported version of R named R+ (read R plus). + + In addition, REvolution Computing (http://www.revolution-computing.com/) + has released RPro (http://www.revolution-computing.com/rpro.html), an +@@ -1462,6 +1464,9 @@ distributions of R.) + *CompetingRiskFrailty* + Competing risk model with frailties for right censored survival data. + ++*CreditMetrics* ++ Functions for calculating the CreditMetrics risk model. ++ + *DAAG* + Various data sets used in examples and exercises in "Data Analysis and + Graphics Using R" by John H. Maindonald and W. John Brown, 2003. +@@ -1605,6 +1610,9 @@ distributions of R.) + MCMC inference from individual genetic data based on a spatial + statistical model. + ++*GeoXP* ++ Interactive exploratory spatial data analysis. ++ + *GroupSeq* + Computations related to group-seqential boundaries. + +@@ -1651,6 +1659,10 @@ distributions of R.) + Utilities from the Institute of Data Analyses and Process Design, + IDP/ZHW. + ++*IPSUR* ++ Accompanies "Introduction to Probability and Statistics Using R" by G. ++ Andy Chang and G. Jay Kerns(in progress). ++ + *ISwR* + Data sets for "Introductory Statistics with R" by Peter Dalgaard, + 2002, Springer. +@@ -1987,10 +1999,6 @@ distributions of R.) + Transforms with an Implementation in S" by Rene Carmona, Wen L. Hwang + and Bruno Torresani, 1998, Academic Press. + +-*SAGx* +- Retrieval, preparation and analysis of data from the Affymetrix +- GeneChip. +- + *SASmixed* + Data sets and sample linear mixed effects analyses corresponding to the + examples in "SAS System for Mixed Models" by R. C. Littell, G. A. +@@ -2041,6 +2049,9 @@ distributions of R.) + *SparseM* + Basic linear algebra for sparse matrices. + ++*SpherWave* ++ Spherical Wavelets and SW-based spatially adaptive methods. ++ + *StatDataML* + Read and write StatDataML. + +@@ -2086,6 +2097,9 @@ distributions of R.) + Utilities supporting VDC, an open source digital library system for + quantitative data. + ++*VGAM* ++ Vector Generalized Linear and Additive Models. ++ + *VLMC* + Functions, classes & methods for estimation, prediction, and simulation + (bootstrap) of VLMC (Variable Length Markov Chain) models. +@@ -2093,12 +2107,18 @@ distributions of R.) + *VaR* + Methods for calculation of Value at Risk (VaR). + ++*WeedMap* ++ Map of weed intensity. ++ + *WhatIf* + Software for evaluating counterfactuals. + + *XML* + Tools for reading XML documents and DTDs. + ++*ZIGP* ++ Zero Inflated Generalized Poisson (ZIGP) regression models. ++ + *Zelig* + Everyone's statistical software: an easy-to-use program that can + estimate, and help interpret the results of, an enormous range of +@@ -2140,6 +2160,9 @@ distributions of R.) + *adehabitat* + A collection of tools for the analysis of habitat selection by animals. + ++*adimpro* ++ Adaptive smoothing of digital images. ++ + *adlift* + Adaptive Wavelet transforms for signal denoising. + +@@ -2327,6 +2350,10 @@ distributions of R.) + *cfa* + Analysis of configuration frequencies. + ++*cgh* ++ Analysis of microarray comparative genome hybridisation data using the ++ Smith-Waterman algorithm. ++ + *chplot* + Augmented convex hull plots: informative and nice plots for grouped + bivariate data. +@@ -2359,6 +2386,9 @@ distributions of R.) + *classPP* + Projection Pursuit for supervised classification. + ++*classifly* ++ Explore classification models in high dimensions. ++ + *clim.pact* + Climate analysis and downscaling for monthly and daily data. + +@@ -2695,6 +2725,9 @@ distributions of R.) + *fCalendar* + The Rmetrics module for "Date, Time and Calendars". + ++*fEcofin* ++ The Rmetrics module with "Selected economic and financial data sets". ++ + *fExtremes* + The Rmetrics module for "Beyond the Sample, Dealing with Extreme + Values". +@@ -2843,6 +2876,9 @@ distributions of R.) + Functions to fit Generalized Additive Models for Location Scale and + Shape. + ++*gamlss.dist* ++ Extra distributions for GAMLSS modeling. ++ + *gamlss.nl* + A GAMLSS add on package for fitting non linear parametric models. + +@@ -3057,6 +3093,9 @@ distributions of R.) + *homals* + Homogeneity Analysis (HOMALS) package with optional Tcl/Tk interface. + ++*homtest* ++ Homogeneity tests for regional frequency analysis. ++ + *hopach* + Hierarchical Ordered Partitioning and Collapsing Hybrid (HOPACH). + +@@ -3389,9 +3428,6 @@ distributions of R.) + Routines for GAMs and other genralized ridge regression problems with + multiple smoothing parameter selection by GCV or UBRE. _Recommended_. + +-*micEcdat* +- Data sets for micro-econometrics. +- + *micEcon* + Tools for microeconomic analysis and microeconomic modelling. + +@@ -3421,6 +3457,12 @@ distributions of R.) + *mixreg* + Functions to fit mixtures of regressions. + ++*mixtools* ++ Tools for mixture models. ++ ++*mlCopulaSelection* ++ Copula selection and fitting using maximum likelihood. ++ + *mlbench* + A collection of artificial and real-world machine learning benchmark + problems, including the Boston housing data. +@@ -3462,6 +3504,9 @@ distributions of R.) + *mratios* + Inferences for ratios of coefficients in the general linear model. + ++*msgcop* ++ Semiparametric Bayesian Gaussian copula estimation. ++ + *msm* + Functions for fitting continuous-time Markov multi-state models to + categorical processes observed at arbitrary times, optionally with +@@ -3621,6 +3666,10 @@ distributions of R.) + *oz* + Functions for plotting Australia's coastline and state boundaries. + ++*pARtial* ++ (Partial) attributable risk estimates, corresponding variance estimates ++ and confidence intervals. ++ + *paleoTS* + Modeling evolution in paleontological time-series. + +@@ -3743,6 +3792,9 @@ distributions of R.) + *portfolio* + Classes for analyzing and implementing portfolios. + ++*portfolioSim* ++ Framework for simulating equity portfolio strategies. ++ + *powell* + Optimizes a function using Powell's UObyQA algorithm. + +@@ -3880,9 +3932,15 @@ distributions of R.) + C Double Description for R, an interface to the CDD computational + geometry library. + ++*rcdk* ++ Interface to the CDK libraries, a Java framework for cheminformatics. ++ + *rcom* + R COM Client Interface and internal COM Server. + ++*rcompletion* ++ TAB completion for R using Readline. ++ + *rda* + Shrunken Centroids Regularized Discriminant Analysis. + +@@ -3932,6 +3990,9 @@ distributions of R.) + *rgenoud* + R version of GENetic Optimization Using Derivatives. + ++*rggm* ++ Robustified methods for Gaussian Graphical Models. ++ + *rggobi* + Interface between R and GGobi. + +@@ -4312,6 +4373,9 @@ distributions of R.) + Computes the distribution of a linear combination of independent + Student's t variables. + ++*tdm* ++ A tool for Therapeutic Drug Monitoring. ++ + *tdthap* + Transmission/disequilibrium tests for extended marker haplotypes. + +@@ -4328,6 +4392,9 @@ distributions of R.) + *time* + Time tracking for developers. + ++*titan* ++ Titration analysis for mass spectrometry data. ++ + *titecrm* + TIme-To-Event Continual Reassessment Method and calibration tools. + +@@ -4638,6 +4705,9 @@ available via `http://www.omegahat.org/R + Interface to Snowball implementation of Porter's word stemming + algorithm. + ++*Ryacas* ++ R interface to yacas. ++ + *SASXML* + Example for reading XML files in SAS 8.2 manner. + +@@ -6266,6 +6336,53 @@ The unwanted effect can be removed by tu + use the `Edit | Preferences | Page Display | Smooth line art' menu in Adobe + Reader 7.0. + ++7.37 Why does backslash behave strangely inside strings? ++======================================================== ++ ++This question most often comes up in relation to file names (see *Note How ++do file names work in Windows?::) but it also happens that people complain ++that they cannot seem to put a single `\' character into a text string ++unless it happens to be followed by certain other characters. ++ ++ To understand this, you have to distinguish between character strings ++and _representations_ of character strings. Mostly, the representation in ++R is just the string with a single or double quote at either end, but there ++are strings that cannot be represented that way, e.g., strings that ++themselves contains the quote character. So ++ ++ > str <- "This \"text\" is quoted" ++ > str ++ [1] "This \"text\" is quoted" ++ > cat(str, "\n") ++ This "text" is quoted ++ ++The _escape sequences_ `\"' and `\n' represent a double quote and the ++newline character respectively. Printing text strings, using `print()' or ++by typing the name at the prompt will use the escape sequences too, but the ++`cat()' function will display the string as-is. Notice that `"\n"' is a ++one-character string, not two; the backslash is not actually in the string, ++it is just generated in the printed representation. ++ ++ > nchar("\n") ++ [1] 1 ++ > substring("\n", 1, 1) ++ [1] "\n" ++ ++ So how do you put a backslash in a string? For this, you have to escape ++the escape character. I.e., you have to double the backslash. as in ++ ++ > cat("\\n", "\n") ++ \n ++ ++ Some functions, particularly those involving regular expression ++matching, themselves use metacharacters, which may need to be escaped by ++the backslash mechanism. In those cases you may need a _quadruple_ ++backslash to represent a single literal one. ++ ++ In current versions of R (up to 2.4.0) an unknown escape sequence like ++`\p' is quietly interpreted as just `p'. The development version now emits ++a warning. ++ + 8 R Programming + *************** + +diff -urp R-2.4.0.old/doc/html/R-admin.html R-2.4.0/doc/html/R-admin.html +--- R-2.4.0.old/doc/html/R-admin.html 2006-10-03 05:14:24.000000000 -0500 ++++ R-2.4.0/doc/html/R-admin.html 2006-11-03 20:01:31.000000000 -0600 +@@ -27,7 +27,7 @@ + + This is a guide to installation and administration for R. + +- The current version of this document is 2.4.0 (2006-10-03). ++ The current version of this document is 2.4.0 (2006-11-03). + + ISBN 3-900051-09-7 + +@@ -101,13 +101,16 @@ Subversion repository. If you have a Su + <a href="http://subversion.tigris.org/"><code>subversion.tigris.org</code></a>), you + can check out and update the current r-devel from + <a href="https://svn.r-project.org/R/trunk/">https://svn.r-project.org/R/trunk/</a> and the current r-patched from +-`<samp>https://svn.r-project.org/R/branches/R-<var>x</var>-<var>y</var>-patches/</samp>' ++`<samp>https://svn.r-project.org/R/branches/R-<var>x</var>-<var>y</var>-branch/</samp>' + (where <var>x</var> and <var>y</var> are the major and minor number of the current + released version of R). E.g., use + + <pre class="example"> svn checkout https://svn.r-project.org/R/trunk/ <var>path</var> + </pre> +- to check out r-devel into directory <var>path</var>. ++ to check out `<samp>r-devel</samp>' into directory <var>path</var>. The alpha, beta ++and RC versions of an upcoming <var>x.y.0</var> release are available from ++`<samp>https://svn.r-project.org/R/branches/R-<var>x</var>-<var>y</var>-branch/</samp>' in ++the four-week period prior to the release. + + Note that `<samp>https:</samp>' is required, and that the SSL certificate for + the Subversion server of the R project is +@@ -510,7 +513,7 @@ Windows 64). + Your file system must allow long file names (as is likely except + perhaps for some network-mounted systems). + +- Installation is via the installer <samp>R-2.4.0.exe</samp>. ++ Installation is via the installer <samp>R-2.4.0pat.exe</samp>. + Just double-click on the icon and follow the instructions. You can + uninstall R from the Control Panel. (Note that you will probably + (depending on the Windows language settings) be asked to choose a +@@ -775,12 +778,12 @@ customizations to that installation. Th + </pre> + where <samp>rootdir</samp> is the path to the root of the customized + installation (forward slashes and no spaces, please). This creates an +-executable with the standard name, <samp>R-2.4.0.exe</samp>, so ++executable with the standard name, <samp>R-2.4.0pat.exe</samp>, so + please rename it to indicate that it is customized. + + The defaults for the startup parameters may also be customized. For example + +-<pre class="example"> make rinstaller MDISDI=1 ++<pre class="example"> make myR IMAGEDIR=rootdir MDISDI=1 + </pre> + will create an installer that defaults to installing R to run in SDI + mode. See <samp>src/gnuwin32/installer/Makefile</samp> for the names and +@@ -1128,7 +1131,7 @@ originals. + <li><code>zipdata-foo</code> to compress the data files. This is recommended if + you have either many small data files (as in package Devore5) or a + few large data files. +-<li><code>pkgcheck-foo</code> to check the package (like <code>R CMD CHECK foo</code>). ++<li><code>pkgcheck-foo</code> to check the package (like <code>R CMD check foo</code>). + </ul> + + Using this approach allows variables to be set during the build, e.g. +@@ -1501,10 +1504,11 @@ installed. + You need a means of compiling C and FORTRAN 77 (see <a href="#Using-FORTRAN">Using FORTRAN</a>). Some add-on packages also need a C++ compiler. Your C + compiler should be <acronym>IEC</acronym> 60059<a rel="footnote" href="#fn-6" name="fnd-6">6</a>, POSIX 1003.1 and C99-compliant if at all + possible. R tries to choose suitable flags for the C compilers it +-knows about, but you may have to set <code>CFLAGS</code> suitably. For recent +-versions of <samp>gcc</samp> with <code>glibc</code> this means including +-<samp>-std=gnu99</samp> in <code>CFLAGS</code> (<samp>-std=c99</samp> excludes POSIX +-functionality). ++knows about, but you may have to set <code>CC</code> or <code>CFLAGS</code> suitably. ++For recent versions of <samp>gcc</samp> with <code>glibc</code> this means including ++<samp>-std=gnu99</samp> (<samp>-std=c99</samp> excludes POSIX functionality). ++If the compiler is detected as <samp>gcc</samp>, <code>-std=gnu99</code> will be ++appended to <code>CC</code> unless it conflicts with a setting of <code>CFLAGS</code>. + + Unless you do not want to view graphs on-screen you need `<samp>X11</samp>' + installed, including its headers and client libraries. (On Fedora Core +@@ -2078,8 +2082,8 @@ On most platforms using <samp>CFLAGS</code> and <code>FFLAGS</code> produces worthwhile performance gains. + On systems using the GNU linker (especially those using R as a shared + library), it is likely that including `<samp>-Wl,-O1</samp>' in <code>LDFLAGS</code> +-is worthwhile, and on upcoming systems<a rel="footnote" href="#fn-15" name="fnd-15">15</a> +-`<samp>'-Wl,-O1,-Bdirect,--hash-style=both'</samp>' is recommended at ++is worthwhile, and on recent systems<a rel="footnote" href="#fn-15" name="fnd-15">15</a> ++`<samp>'-Bdirect,--hash-style=both,-Wl,-O1'</samp>' is recommended at + <a href="http://lwn.net/Articles/192624/">http://lwn.net/Articles/192624/</a> + + <a name="Making-manuals"></a> +@@ -2392,10 +2396,11 @@ libraries. + libraries in <samp>/usr/local/lib64</samp>. To build a 32-bit version of R + on `<samp>x86_64</samp>' with Fedora Core 5 we used + +-<pre class="example"> CFLAGS="-m32 -O2 -g -Wall -pedantic -std=gnu99" ++<pre class="example"> CC="gcc -m32" + CXXFLAGS="-m32 -O2 -g" + FFLAGS="-m32 -O2 -g" +- LDFLAGS="-m32 -L/usr/local/lib" ++ FCFLAGS="-m32 -O2 -g" ++ LDFLAGS="-L/usr/local/lib" + LIBnn=lib + </pre> + Fedora Core 3 also needed +@@ -2452,9 +2457,10 @@ optimization. For `<samp><span class="s + CXX=icc + ICC_LIBS=/opt/compilers/intel/cce/9.0/lib + IFC_LIBS=/opt/compilers/intel/fce/9.0/lib +- LDFLAGS="-L$ICC_LIBS -L$IFC_LIBS -L/usr/local/lib" ++ LDFLAGS="-L$ICC_LIBS -L$IFC_LIBS -L/usr/local/lib64" + </pre> +- R will add `<samp>-mp</samp>' in <code>R_XTRA_{C,F,CXX}FLAGS</code> to maintain ++ <samp>configure</samp> will add `<samp>-c99</samp>' to <code>CC</code> for C99-compliance. ++R will add `<samp>-mp</samp>' in <code>R_XTRA_{C,F,CXX}FLAGS</code> to maintain + correct <acronym>IEC</acronym> 60559 arithmetic. The flag <samp>-wd188</samp> + suppresses a large number of warnings about the enumeration type + `<samp>Rboolean</samp>'. Because the Intel C compiler sets `<samp>__GNUC__</samp>' +@@ -2564,7 +2570,7 @@ yourself. + this disables <acronym>IEEE</acronym> arithmetic and <samp>make check</samp> will + fail. The maximal set of optimization options known to work on Sparc is + +-<pre class="example"> -xlibmil -xO5 -dalign -xc99 ++<pre class="example"> -xlibmil -xO5 -dalign + </pre> + (`<samp>x86</samp>' versions do not need `<samp>-dalign</samp>', and some do not + support it.) +@@ -2578,10 +2584,10 @@ the compiler correctly. + + To compile for a 64-bit target on Sparc Solaris (which needs an + UltraSparc chip and for support to be enabled in the OS) with the Forte +-7 compilers we used <samp>--without-blas</samp> and ++7 compilers we used + +-<pre class="example"> CC="cc -xarch=v9" +- CFLAGS="-xO5 -xlibmil -dalign -xc99" ++<pre class="example"> CC="cc -xarch=v9 -xc99" ++ CFLAGS="-xO5 -xlibmil -dalign" + F77="f95 -xarch=v9" + FFLAGS="-xO5 -xlibmil -dalign" + CXX="CC -xarch=v9" +@@ -2599,9 +2605,10 @@ UltraSparc chip and for support to be en + FC="gfortran -m64" + LDFLAGS="-L/usr/local/lib/sparcv9 -L/usr/local/lib" + </pre> +- replacing `<samp>g77</samp>' with `<samp>gfortran</samp>' for <samp>gcc</samp> 4.0.x. Note ++ replacing `<samp>g77</samp>' with `<samp>gfortran</samp>' for <samp>gcc</samp> 4.x.y. Note + that <samp>/usr/local/lib/sparcv9</samp> may need to be in the +-<samp>LD_LIBRARY_PATH</samp> during configuration. ++<samp>LD_LIBRARY_PATH</samp> during configuration. (<samp>configure</samp> will ++append <code>-std=gnu99</code> to <code>CC</code>.) + + Solaris on Sparc CPUs need `<samp>PIC</samp>' and not `<samp>pic</samp>' versions of + <samp>CPICFLAGS</samp> and <samp>FPICFLAGS</samp> since the `<samp>pic</samp>' version only +@@ -3080,7 +3087,7 @@ but no compiled code, only the first two + + A complete build of R including compiled <acronym>HTML</acronym> help files and + PDF manuals, and producing the standalone installer +-<samp>R-2.4.0.exe</samp> will also need the following: ++<samp>R-2.4.0pat.exe</samp> will also need the following: + <ul> + <li>The Microsoft <acronym>HTML</acronym> Help Workshop + <li>LaTeX +@@ -3208,8 +3215,8 @@ suitably; ensure you have the required f + + <h3 class="section">E.6 The Inno Setup installer</h3> + +-To make the installer package (<samp>R-2.4.0.exe</samp>) we require +-Inno Setup 5.1.5 or later from <a href="http://jrsoftware.org"><code>jrsoftware.org</code></a>. ++To make the installer package (<samp>R-2.4.0pat.exe</samp>) we require ++Inno Setup 5.1.7 or later from <a href="http://jrsoftware.org"><code>jrsoftware.org</code></a>. + + Edit file <samp>src/gnuwin32/MkRules</samp> and change <code>ISDIR</code> to the + location where Inno Setup was installed. +diff -urp R-2.4.0.old/doc/manual/Makefile.in R-2.4.0/doc/manual/Makefile.in +--- R-2.4.0.old/doc/manual/Makefile.in 2006-09-04 21:05:05.000000000 -0500 ++++ R-2.4.0/doc/manual/Makefile.in 2006-10-28 14:36:02.000000000 -0500 +@@ -211,6 +211,7 @@ $(OBJECTS_DVI): $(srcdir)/texinfo.tex + R-admin.dvi: $(texiincludes) + R-data.dvi: $(texiincludes) + R-exts.dvi: $(texiincludes) ++R-ints.dvi: $(texiincludes) + version.texi: Makefile $(top_srcdir)/VERSION $(top_builddir)/SVN-REVISION + @echo "creating $(subdir)/$@" + @(v=`sed 's/$[^ ]*$.*/\1/' $(top_srcdir)/VERSION`; \ +@@ -238,6 +239,7 @@ R-admin.html: $(texiincludes) + R-data.html: $(texiincludes) + R-exts.html: $(texiincludes) + R-intro.html: $(texiincludes) ++R-ints.html: $(texiincludes) + R-lang.html: $(texiincludes) + + info: $(OBJECTS_INFO) +@@ -245,6 +247,7 @@ R-admin.info: $(texiincludes) + R-data.info: $(texiincludes) + R-exts.info: $(texiincludes) + R-intro.info: $(texiincludes) ++R-ints.info: $(texiincludes) + R-lang.info: $(texiincludes) + + pdf: refman.pdf $(OBJECTS_PDF) +@@ -325,6 +328,7 @@ R-admin.pdf: $(texiincludes) + R-data.pdf: $(texiincludes) + R-exts.pdf: $(texiincludes) + R-intro.pdf: stamp-images-pdf $(texiincludes) ++R-ints.pdf: $(texiincludes) + stamp-images-pdf: + @if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \ + $(MAKE) rdocdir=$(top_builddir)/doc install-images-pdf; \ +diff -urp R-2.4.0.old/doc/manual/R-admin.texi R-2.4.0/doc/manual/R-admin.texi +--- R-2.4.0.old/doc/manual/R-admin.texi 2006-09-27 21:05:07.000000000 -0500 ++++ R-2.4.0/doc/manual/R-admin.texi 2006-11-01 19:41:42.000000000 -0600 +@@ -166,7 +166,7 @@ Subversion repository. If you have a Su + @url{http://subversion.tigris.org/, @code{subversion.tigris.org}}), you + can check out and update the current r-devel from + @url{https://svn.r-project.org/R/trunk/} and the current r-patched from +-@samp{https://svn.r-project.org/R/branches/R-@var{x}-@var{y}-patches/} ++@samp{https://svn.r-project.org/R/branches/R-@var{x}-@var{y}-branch/} + (where @var{x} and @var{y} are the major and minor number of the current + released version of R). E.g., use + +@@ -175,7 +175,10 @@ svn checkout https://svn.r-project.org/R + @end example + + @noindent +-to check out r-devel into directory @var{path}. ++to check out @samp{r-devel} into directory @var{path}. The alpha, beta ++and RC versions of an upcoming @var{x.y.0} release are available from ++@samp{https://svn.r-project.org/R/branches/R-@var{x}-@var{y}-branch/} in ++the four-week period prior to the release. + + Note that @samp{https:} is required, and that the SSL certificate for + the Subversion server of the R project is +@@ -1005,7 +1008,7 @@ please rename it to indicate that it is + The defaults for the startup parameters may also be customized. For example + + @example +-make rinstaller MDISDI=1 ++make myR IMAGEDIR=rootdir MDISDI=1 + @end example + + @noindent +@@ -1410,7 +1413,7 @@ originals. + you have either many small data files (as in package @pkg{Devore5}) or a + few large data files. + @item +-@code{pkgcheck-foo} to check the package (like @code{R CMD CHECK foo}). ++@code{pkgcheck-foo} to check the package (like @code{R CMD check foo}). + @end itemize + + Using this approach allows variables to be set during the build, e.g. +@@ -1840,10 +1843,11 @@ FORTRAN}). Some add-on packages also ne + compiler should be @acronym{IEC}@tie{}60059@footnote{also known as + @acronym{IEEE}@tie{}754}, POSIX 1003.1 and C99-compliant if at all + possible. @R{} tries to choose suitable flags for the C compilers it +-knows about, but you may have to set @code{CFLAGS} suitably. For recent +-versions of @command{gcc} with @code{glibc} this means including +-@option{-std=gnu99} in @code{CFLAGS} (@option{-std=c99} excludes POSIX +-functionality). ++knows about, but you may have to set @code{CC} or @code{CFLAGS} suitably. ++For recent versions of @command{gcc} with @code{glibc} this means including ++@option{-std=gnu99} (@option{-std=c99} excludes POSIX functionality). ++If the compiler is detected as @command{gcc}, @code{-std=gnu99} will be ++appended to @code{CC} unless it conflicts with a setting of @code{CFLAGS}. + + Unless you do not want to view graphs on-screen you need @samp{X11} + installed, including its headers and client libraries. (On Fedora Core +@@ -2521,8 +2525,8 @@ On most platforms using @command{gcc}, h + @code{CFLAGS} and @code{FFLAGS} produces worthwhile performance gains. + On systems using the GNU linker (especially those using @R{} as a shared + library), it is likely that including @samp{-Wl,-O1} in @code{LDFLAGS} +-is worthwhile, and on upcoming systems(a)footnote{e.g. Fedora Core 6} +-@samp{'-Wl,-O1,-Bdirect,--hash-style=both'} is recommended at ++is worthwhile, and on recent systems(a)footnote{e.g. Fedora Core 6} ++@samp{'-Bdirect,--hash-style=both,-Wl,-O1'} is recommended at + @url{http://lwn.net/Articles/192624/} + + @node Making manuals, , Compilation flags, Configuration variables +@@ -2888,10 +2892,11 @@ libraries in @file{/usr/local/lib64}. T + on @cputype{x86_64} with Fedora Core 5 we used + + @example +-CFLAGS="-m32 -O2 -g -Wall -pedantic -std=gnu99" ++CC="gcc -m32" + CXXFLAGS="-m32 -O2 -g" + FFLAGS="-m32 -O2 -g" +-LDFLAGS="-m32 -L/usr/local/lib" ++FCFLAGS="-m32 -O2 -g" ++LDFLAGS="-L/usr/local/lib" + LIBnn=lib + @end example + +@@ -2957,10 +2962,11 @@ F77=ifort + CXX=icc + ICC_LIBS=/opt/compilers/intel/cce/9.0/lib + IFC_LIBS=/opt/compilers/intel/fce/9.0/lib +-LDFLAGS="-L$ICC_LIBS -L$IFC_LIBS -L/usr/local/lib" ++LDFLAGS="-L$ICC_LIBS -L$IFC_LIBS -L/usr/local/lib64" + @end example + + @noindent ++@command{configure} will add @samp{-c99} to @code{CC} for C99-compliance. + @R{} will add @samp{-mp} in @code{R_XTRA_@{C,F,CXX@}FLAGS} to maintain + correct @acronym{IEC}@tie{}60559 arithmetic. The flag @option{-wd188} + suppresses a large number of warnings about the enumeration type +@@ -3086,7 +3092,7 @@ this disables @acronym{IEEE} arithmetic + fail. The maximal set of optimization options known to work on Sparc is + + @example +--xlibmil -xO5 -dalign -xc99 ++-xlibmil -xO5 -dalign + @end example + + @noindent +@@ -3102,11 +3108,11 @@ the compiler correctly. + + To compile for a 64-bit target on Sparc Solaris (which needs an + UltraSparc chip and for support to be enabled in the OS) with the Forte +-7 compilers we used @option{--without-blas} and ++7 compilers we used + + @example +-CC="cc -xarch=v9" +-CFLAGS="-xO5 -xlibmil -dalign -xc99" ++CC="cc -xarch=v9 -xc99" ++CFLAGS="-xO5 -xlibmil -dalign" + F77="f95 -xarch=v9" + FFLAGS="-xO5 -xlibmil -dalign" + CXX="CC -xarch=v9" +@@ -3130,9 +3136,10 @@ LDFLAGS="-L/usr/local/lib/sparcv9 -L/usr + @end example + + @noindent +-replacing @samp{g77} with @samp{gfortran} for @command{gcc} 4.0.x. Note ++replacing @samp{g77} with @samp{gfortran} for @command{gcc} 4.x.y. Note + that @file{/usr/local/lib/sparcv9} may need to be in the +-@env{LD_LIBRARY_PATH} during configuration. ++@env{LD_LIBRARY_PATH} during configuration. (@command{configure} will ++append @code{-std=gnu99} to @code{CC}.) + + Solaris on Sparc CPUs need @samp{PIC} and not @samp{pic} versions of + @env{CPICFLAGS} and @env{FPICFLAGS} since the @samp{pic} version only +@@ -3814,7 +3821,7 @@ suitably; ensure you have the required f + @section The Inno Setup installer + + To make the installer package (@file{@value{RWVERSION}.exe}) we require +-Inno Setup 5.1.5 or later from @url{http://jrsoftware.org, ++Inno Setup 5.1.7 or later from @url{http://jrsoftware.org, + @code{jrsoftware.org}}. + + Edit file @file{src/gnuwin32/MkRules} and change @code{ISDIR} to the +diff -urp R-2.4.0.old/doc/manual/R-exts.texi R-2.4.0/doc/manual/R-exts.texi +--- R-2.4.0.old/doc/manual/R-exts.texi 2006-09-18 21:05:16.000000000 -0500 ++++ R-2.4.0/doc/manual/R-exts.texi 2006-10-30 10:45:48.000000000 -0600 +@@ -8119,7 +8119,7 @@ this is defined. + @node Internationalization, Allowing interrupts, Utility functions, The R API + @section Internationalization + +-@R{} has its own C-level interface to the the encoding conversion ++@R{} has its own C-level interface to the encoding conversion + capabilities provided by @code{iconv}, for the following reasons + + @itemize @bullet +diff -urp R-2.4.0.old/doc/manual/R-FAQ.texi R-2.4.0/doc/manual/R-FAQ.texi +--- R-2.4.0.old/doc/manual/R-FAQ.texi 2006-10-03 05:00:11.000000000 -0500 ++++ R-2.4.0/doc/manual/R-FAQ.texi 2006-11-02 10:45:47.000000000 -0600 +@@ -4,7 +4,7 @@ + @settitle R FAQ + @setchapternewpage on + @set FAQ_YEAR 2006 +-@set FAQ_DATE @value{FAQ_YEAR}-10-02 ++@set FAQ_DATE @value{FAQ_YEAR}-10-31 + @set REL_YEAR 2006 + @set REL_MAJOR 2 + @set REL_MINOR 4 +@@ -500,24 +500,25 @@ to Mac OS 9.2.2. This port of R for Mac + @node Are there Unix binaries for R?, What documentation exists for R?, How can R be installed?, R Basics + @section Are there Unix binaries for R? + +-@c Linux binaries as of 2006-09-13: ++@c Linux binaries as of 2006-10-31: + @c + @c debian +-@c stable i386 2.3.1 Christian T. Steigies <cts(a)debian.org> ++@c stable i386 2.4.0 Christian T. Steigies <cts(a)debian.org> + @c oldstable + @c i386 2.1.1 Christian T. Steigies <cts(a)debian.org> + @c mandrake + @c 10.0 i386 2.0.0 Michele Alzetta <mikalzet(a)libero.it> + @c redhat + @c el3 i386 2.3.1 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> +-@c el4 i386 2.3.1 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> +-@c x86_64 2.3.1 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> +-@c fc3 i386 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> +-@c x86_64 2.3.1 Brian Ripley +-@c fc4 i386 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> +-@c x86_64 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> +-@c fc5 i386 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> +-@c x86_64 2.3.1 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c el4 i386 2.4.0 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> ++@c x86_64 2.4.0 Matthew P Cox <rhel_cran(a)hmdc.harvard.edu> ++@c fc3 i386 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c x86_64 2.4.0 Brian Ripley ++@c fc4 i386 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c x86_64 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c fc5 i386 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c x86_64 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> ++@c fc6 i386 2.4.0 Martyn Plummer <martyn.plummer(a)r-project.org> + @c suse + @c 7.3 i386 1.8.0 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> + @c 8.0 i386 1.8.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> +@@ -531,10 +532,11 @@ to Mac OS 9.2.2. This port of R for Mac + @c x86_64 2.2.0 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> + @c 10.0 i586 2.3.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> + @c x86_64 2.3.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> +-@c 10.1 i586 2.3.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> +-@c x86_64 2.3.1 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> ++@c 10.1 i586 2.4.0 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> ++@c x86_64 2.4.0 Detlef Steuer <Detlef.Steuer(a)unibw-hamburg.de> + @c ubuntu +-@c dapper i386 2.3.1 Dirk Eddelbuettel <edd(a)debian.org> ++@c dapper i386 2.4.0 Christian T. Steigies <cts(a)debian.org> ++@c amd64 2.4.0 Christian T. Steigies <cts(a)debian.org> + @c vinelinux + @c 3.2 i386 2.3.1 Susunu Tanimura <stanimura-ngs(a)umin.ac.jp> + +@@ -542,11 +544,11 @@ The @file{bin/linux} directory of a @CRA + packages. + + @quotation +-@multitable {Debian et al.} {x86_64} {9.0/9.1/9.2/9.3/10.0} {James Henstridge} ++@multitable {Debian et al.} {x86_64} {9.0/9.1/9.2/9.3/10.0/10.1} {James Henstridge} + @headitem @tab CPU @tab Versions @tab Provider + @item Debian et al. @tab i386 @tab stable/oldstable @tab Christian Steigies + @item Mandrake @tab i386 @tab 10.0 @tab Michele Alzetta +-@item Red Hat @tab i386 @tab FC3/FC4/FC5 @tab Martyn Plummer ++@item Red Hat @tab i386 @tab FC3/FC4/FC5/FC6 @tab Martyn Plummer + @item @tab x86_64 @tab FC3 @tab Brian Ripley + @item @tab x86_64 @tab FC4/FC5 @tab Martyn Plummer + @item @tab i386 @tab Enterprise Linux @tab Matthew P. Cox +@@ -554,7 +556,8 @@ packages. + @item SuSE @tab i386 @tab 7.3/8.0/8.1/8.2 @tab Detlef Steuer + @item @tab i586 @tab 9.0/9.1/9.2/9.3/10.0/10.1 @tab Detlef Steuer + @item @tab x86_64 @tab 9.2/9.3/10.0/10.1 @tab Detlef Steuer +-@item Ubuntu @tab i386 @tab dapper @tab Dirk Eddelbuettel ++@item Ubuntu @tab i386 @tab dapper @tab Christian Steigies ++@item @tab amd64 @tab dapper @tab Christian Steigies + @item VineLinux @tab i386 @tab 3.2 @tab Susunu Tanimura + @end multitable + @end quotation +@@ -1615,8 +1618,9 @@ Annotation in Plots'', @url{http://www.a + + For a very long time, there was no such thing. + +-@url{http://www.xlsolutions-corp.com/, XL Solutions} is currently beta +-testing a commercially supported version of R named R+ (read R plus). ++@url{http://www.xlsolutions-corp.com/, XLSolutions Corporation} is ++currently beta testing a commercially supported version of R named R+ ++(read R plus). + + In addition, @url{http://www.revolution-computing.com/, REvolution + Computing} has released +@@ -1867,6 +1871,8 @@ Graphical modeling for contingency table + @c </COMMENT> + @item CompetingRiskFrailty + Competing risk model with frailties for right censored survival data. ++@item CreditMetrics ++Functions for calculating the CreditMetrics risk model. + @item DAAG + Various data sets used in examples and exercises in ``Data Analysis and + Graphics Using R'' by John H. Maindonald and W. John Brown, 2003. +@@ -1973,6 +1979,8 @@ large sparse graphical Gaussian models. + @item Geneland + MCMC inference from individual genetic data based on a spatial + statistical model. ++@item GeoXP ++Interactive exploratory spatial data analysis. + @item GroupSeq + Computations related to group-seqential boundaries. + @item HH +@@ -2009,6 +2017,9 @@ interval-censored data. + @item IDPmisc + Utilities from the Institute of Data Analyses and Process Design, + IDP/ZHW. ++@item IPSUR ++Accompanies ``Introduction to Probability and Statistics Using R'' by ++G. Andy Chang and G. Jay Kerns(in progress). + @item ISwR + Data sets for ``Introductory Statistics with R'' by Peter Dalgaard, + 2002, Springer. +@@ -2268,9 +2279,12 @@ especially for the wavelet and Gabor tra + on the book ``Practical Time-Frequency Analysis: Gabor and Wavelet + Transforms with an Implementation in S'' by Rene Carmona, Wen L. Hwang + and Bruno Torresani, 1998, Academic Press. +-@item SAGx +-Retrieval, preparation and analysis of data from the Affymetrix +-GeneChip. ++@c <COMMENT> ++@c Removed on 2006-10-06 as requested by the maintainer (now @BioC). ++@c @item SAGx ++@c Retrieval, preparation and analysis of data from the Affymetrix ++@c GeneChip. ++@c </COMMENT> + @item SASmixed + Data sets and sample linear mixed effects analyses corresponding to the + examples in ``SAS System for Mixed Models'' by R. C. Littell, +@@ -2309,6 +2323,8 @@ soil. + Sparse logistic regression. + @item SparseM + Basic linear algebra for sparse matrices. ++@item SpherWave ++Spherical Wavelets and SW-based spatially adaptive methods. + @item StatDataML + Read and write StatDataML. + @item StoppingRules +@@ -2342,15 +2358,21 @@ Statistics'' by J. Verzani, 2005, Chapma + @item VDCutil + Utilities supporting VDC, an open source digital library system for + quantitative data. ++@item VGAM ++Vector Generalized Linear and Additive Models. + @item VLMC + Functions, classes & methods for estimation, prediction, and simulation + (bootstrap) of VLMC (Variable Length Markov Chain) models. + @item VaR + Methods for calculation of Value at Risk (VaR). ++@item WeedMap ++Map of weed intensity. + @item WhatIf + Software for evaluating counterfactuals. + @item XML + Tools for reading @XML{} documents and DTDs. ++@item ZIGP ++Zero Inflated Generalized Poisson (ZIGP) regression models. + @item Zelig + Everyone's statistical software: an easy-to-use program that can + estimate, and help interpret the results of, an enormous range of +@@ -2380,6 +2402,8 @@ Multivariate data analysis and graphical + Tcl/Tk Graphical User Interface for @strong{ade4}. + @item adehabitat + A collection of tools for the analysis of habitat selection by animals. ++@item adimpro ++Adaptive smoothing of digital images. + @item adlift + Adaptive Wavelet transforms for signal denoising. + @item agce +@@ -2524,6 +2548,9 @@ update algorithm (Hard Competitive Learn + finding the number of clusters in a data set. + @item cfa + Analysis of configuration frequencies. ++@item cgh ++Analysis of microarray comparative genome hybridisation data using the ++Smith-Waterman algorithm. + @item chplot + Augmented convex hull plots: informative and nice plots for grouped + bivariate data. +@@ -2547,6 +2574,8 @@ Choose univariate class intervals for ma + purposes. + @item classPP + Projection Pursuit for supervised classification. ++@item classifly ++Explore classification models in high dimensions. + @item clim.pact + Climate analysis and downscaling for monthly and daily data. + @item climatol +@@ -2798,6 +2827,8 @@ teaching financial engineering and compu + (@url{http://www.Rmetrics.org/}). + @item fCalendar + The Rmetrics module for ``Date, Time and Calendars''. ++@item fEcofin ++The Rmetrics module with ``Selected economic and financial data sets''. + @item fExtremes + The Rmetrics module for ``Beyond the Sample, Dealing with Extreme + Values''. +@@ -2907,6 +2938,8 @@ Introduction with R'' by S. Wood (2006). + @item gamlss + Functions to fit Generalized Additive Models for Location Scale and + Shape. ++@item gamlss.dist ++Extra distributions for GAMLSS modeling. + @item gamlss.nl + A GAMLSS add on package for fitting non linear parametric models. + @item gamlss.tr +@@ -3071,6 +3104,8 @@ marginal inference for regression-scale + higher order inference for nonlinear heteroscedastic models. + @item homals + Homogeneity Analysis (HOMALS) package with optional Tcl/Tk interface. ++@item homtest ++Homogeneity tests for regional frequency analysis. + @item hopach + Hierarchical Ordered Partitioning and Collapsing Hybrid (HOPACH). + @item hot +@@ -3325,8 +3360,11 @@ Multiple Fractional Polynomials. + Routines for GAMs and other genralized ridge regression problems with + multiple smoothing parameter selection by GCV or UBRE. + @emph{Recommended}. +-@item micEcdat +-Data sets for micro-econometrics. ++@c <COMMENT> ++@c Removed on 2006-10-11 as requested by the maintainer. ++@c @item micEcdat ++@c Data sets for micro-econometrics. ++@c </COMMENT> + @item micEcon + Tools for microeconomic analysis and microeconomic modelling. + @item mice +@@ -3347,6 +3385,10 @@ Estimation/multiple imputation programs + continuous data. + @item mixreg + Functions to fit mixtures of regressions. ++@item mixtools ++Tools for mixture models. ++@item mlCopulaSelection ++Copula selection and fitting using maximum likelihood. + @item mlbench + A collection of artificial and real-world machine learning benchmark + problems, including the Boston housing data. +@@ -3382,6 +3424,8 @@ Inferences for ratios of coefficients in + @c @item mscalib + @c Calibration and filtering of MALDI-TOF Peptide Mass Fingerprint data. + @c </COMMENT> ++@item msgcop ++Semiparametric Bayesian Gaussian copula estimation. + @item msm + Functions for fitting continuous-time Markov multi-state models to + categorical processes observed at arbitrary times, optionally with +@@ -3531,6 +3575,9 @@ Ornstein-Uhlenbeck models for phylogenet + A collection of some tests commonly used for identifying outliers. + @item oz + Functions for plotting Australia's coastline and state boundaries. ++@item pARtial ++(Partial) attributable risk estimates, corresponding variance estimates ++and confidence intervals. + @item paleoTS + Modeling evolution in paleontological time-series. + @item pamr +@@ -3635,6 +3682,8 @@ manipulations. + Statistical and POPulation GENetics. + @item portfolio + Classes for analyzing and implementing portfolios. ++@item portfolioSim ++Framework for simulating equity portfolio strategies. + @item powell + Optimizes a function using Powell's UObyQA algorithm. + @item powerpkg +@@ -3736,8 +3785,12 @@ running BUGS from R. Support for Linux + @item rcdd + C Double Description for R, an interface to the CDD computational + geometry library. ++@item rcdk ++Interface to the CDK libraries, a Java framework for cheminformatics. + @item rcom + R COM Client Interface and internal COM Server. ++@item rcompletion ++TAB completion for R using Readline. + @item rda + Shrunken Centroids Regularized Discriminant Analysis. + @item ref +@@ -3774,6 +3827,8 @@ Provides bindings to Frank Warmerdam's G + Library (GDAL). + @item rgenoud + R version of GENetic Optimization Using Derivatives. ++@item rggm ++Robustified methods for Gaussian Graphical Models. + @item rggobi + Interface between R and GGobi. + @item rgl +@@ -4096,6 +4151,8 @@ A series of widgets and functions to sup + @item tdist + Computes the distribution of a linear combination of independent + Student's @math{t} variables. ++@item tdm ++A tool for Therapeutic Drug Monitoring. + @item tdthap + Transmission/disequilibrium tests for extended marker haplotypes. + @item tensor +@@ -4107,6 +4164,8 @@ Bayesian regression and adaptive samplin + models. + @item time + Time tracking for developers. ++@item titan ++Titration analysis for mass spectrometry data. + @item titecrm + TIme-To-Event Continual Reassessment Method and calibration tools. + @item tkrplot +@@ -4416,6 +4475,8 @@ An interface to call XLisp-Stat function + @item Rstem + Interface to Snowball implementation of Porter's word stemming + algorithm. ++@item Ryacas ++R interface to yacas. + @item SASXML + Example for reading @XML{} files in SAS 8.2 manner. + @item SJava +@@ -5289,6 +5350,7 @@ dir /opt/R/src/unix + * How can I save the result of each iteration in a loop into a separate file?:: + * Why are p-values not displayed when using lmer()?:: + * Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader?:: ++* Why does backslash behave strangely inside strings?:: + @end menu + + @c @node Why does R run out of memory?, Why does sourcing a correct file fail?, R Miscellanea, R Miscellanea +@@ -6165,7 +6227,7 @@ Doug Bates has kindly provided an extens + r-help list, which can be reviewed at + @uref{https://stat.ethz.ch/pipermail/r-help/2006-May/094765.html}. + +-@node Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader?, , Why are p-values not displayed when using lmer()?, R Miscellanea ++@node Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader?, Why does backslash behave strangely inside strings?, Why are p-values not displayed when using lmer()?, R Miscellanea + @section Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader? + + Output from @code{polygon()} (and other functions calling +@@ -6185,6 +6247,64 @@ The unwanted effect can be removed by tu + art: use the `Edit | Preferences | Page Display | Smooth line art' menu + in Adobe Reader 7.0. + ++@node Why does backslash behave strangely inside strings?, , Why are there unwanted lines between polygons in PDF output viewed in Adobe Reader?, R Miscellanea ++@section Why does backslash behave strangely inside strings? ++ ++This question most often comes up in relation to file names (see ++@ref{How do file names work in Windows?}) but it also happens that ++people complain that they cannot seem to put a single @samp{\} character ++into a text string unless it happens to be followed by certain other ++characters. ++ ++To understand this, you have to distinguish between character strings ++and @emph{representations} of character strings. Mostly, the ++representation in R is just the string with a single or double quote at ++either end, but there are strings that cannot be represented that way, ++e.g., strings that themselves contains the quote character. So ++ ++@example ++> str <- "This \"text\" is quoted" ++> str ++[1] "This \"text\" is quoted" ++> cat(str, "\n") ++This "text" is quoted ++@end example ++ ++@noindent ++The @emph{escape sequences} @samp{\"} and @samp{\n} represent a double ++quote and the newline character respectively. Printing text strings, ++using @code{print()} or by typing the name at the prompt will use the ++escape sequences too, but the @code{cat()} function will display the ++string as-is. Notice that @samp{"\n"} is a one-character string, not ++two; the backslash is not actually in the string, it is just generated ++in the printed representation. ++ ++@example ++> nchar("\n") ++[1] 1 ++> substring("\n", 1, 1) ++[1] "\n" ++@end example ++ ++So how do you put a backslash in a string? For this, you have to ++escape the escape character. I.e., you have to double the backslash. ++as in ++ ++@example ++> cat("\\n", "\n") ++\n ++@end example ++ ++Some functions, particularly those involving regular expression ++matching, themselves use metacharacters, which may need to be escaped ++by the backslash mechanism. In those cases you may need a ++@emph{quadruple} backslash to represent a single literal one. ++ ++@c <FIXME 2.5.0> ++In current versions of R (up to 2.4.0) an unknown escape sequence like ++@samp{\p} is quietly interpreted as just @samp{p}. ++The development version now emits a warning. ++@c </FIXME> + + @node R Programming, R Bugs, R Miscellanea, Top + @chapter R Programming +diff -urp R-2.4.0.old/doc/manual/R-intro.texi R-2.4.0/doc/manual/R-intro.texi +--- R-2.4.0.old/doc/manual/R-intro.texi 2006-09-26 21:05:13.000000000 -0500 ++++ R-2.4.0/doc/manual/R-intro.texi 2006-10-29 10:45:45.000000000 -0600 +@@ -6882,9 +6882,13 @@ directory where @R{} was started, but ca + variable @env{R_HISTFILE}) should be restored at startup or not. The + default is to restore. + ++@item --no-Rconsole ++(Windows only) Prevent loading the @file{Rconsole} file at startup. ++ + @item --vanilla + Combine @option{--no-save}, @option{--no-environ} + @option{--no-site-file}, @option{--no-init-file} and @option{--no-restore}. ++In Windows, this also includes @option{--no-Rconsole}. + + @item --no-readline + (UNIX only) Turn off command-line editing via @strong{readline}. This is useful +diff -urp R-2.4.0.old/doc/manual/R-ints.texi R-2.4.0/doc/manual/R-ints.texi +--- R-2.4.0.old/doc/manual/R-ints.texi 2006-09-26 21:05:13.000000000 -0500 ++++ R-2.4.0/doc/manual/R-ints.texi 2006-10-28 14:36:02.000000000 -0500 +@@ -1161,7 +1161,7 @@ libraries. + saving on-screen graphs to those formats. This is technically optional, + and needs source code not in the tarball. + +-@item @file{Rchmtl.dll} ++@item @file{Rchtml.dll} + (Windows only.) A link to an ActiveX control that displays Compiled + @HTML{} help. This is optional, and only compiled if CHTML is specified. + +Only in R-2.4.0/m4: c99.m4 +diff -urp R-2.4.0.old/m4/java.m4 R-2.4.0/m4/java.m4 +--- R-2.4.0.old/m4/java.m4 2006-09-10 21:05:02.000000000 -0500 ++++ R-2.4.0/m4/java.m4 2006-11-03 19:41:45.000000000 -0600 +@@ -103,6 +103,7 @@ if test ${acx_java_works} = yes; then + case "${host_os}" in + darwin*) + JAVA_LIBS="-framework JavaVM" ++ JAVA_LIBS0="-framework JavaVM" + JAVA_LD_LIBRARY_PATH= + ;; + *) +diff -urp R-2.4.0.old/m4/Makefile.in R-2.4.0/m4/Makefile.in +--- R-2.4.0.old/m4/Makefile.in 2006-04-09 17:18:56.000000000 -0500 ++++ R-2.4.0/m4/Makefile.in 2006-10-28 14:35:49.000000000 -0500 +@@ -13,7 +13,7 @@ include $(top_builddir)/Makeconf + distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + DISTFILES = Makefile.in README \ + R.m4 \ +- clibs.m4 \ ++ clibs.m4 c99.m4 \ + codeset.m4 \ + gettext.m4 gettext-lib.m4 \ + java.m4 \ +diff -urp R-2.4.0.old/m4/R.m4 R-2.4.0/m4/R.m4 +--- R-2.4.0.old/m4/R.m4 2006-09-04 09:40:57.000000000 -0500 ++++ R-2.4.0/m4/R.m4 2006-10-28 14:35:49.000000000 -0500 +@@ -3107,8 +3107,8 @@ fi + ## The flag is documented, and is effective but also hides + ## unsatisfied references. We cannot test for GCC, as icc passes that test. + case "${CC}" in +- ## Intel compiler +- *icc) ++ ## Intel compiler: note that -c99 may have been appended ++ *icc*) + C_VISIBILITY= + ;; + esac +diff -urp R-2.4.0.old/Makefile.in R-2.4.0/Makefile.in +--- R-2.4.0.old/Makefile.in 2006-09-04 09:41:48.000000000 -0500 ++++ R-2.4.0/Makefile.in 2006-10-28 14:36:13.000000000 -0500 +@@ -30,7 +30,7 @@ Makeconf: $(srcdir)/Makeconf.in $(top_bu + ACLOCAL_M4 = aclocal.m4 + ACINCLUDE_DEPENDENCIES = \ + m4/R.m4 \ +- m4/clibs.m4 \ ++ m4/clibs.m4 m4/c99.m4 \ + m4/codeset.m4 \ + m4/gettext.m4 m4/gettext-lib.m4 \ + m4/java.m4 \ +@@ -104,15 +104,7 @@ svnonly: + touch non-tarball ; \ + (cd $(srcdir); LC_ALL=C TZ=GMT svn info || echo "Revision: unknown") 2> /dev/null \ + | sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \ +- | cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \ +- if grep unknown SVN-REVISION-tmp > /dev/null ; then \ +- echo "Last Changed Date: Today" >> SVN-REVISION-tmp ; \ +- if test -f "$(srcdir)/.svn/entries" ; then \ +- rev=`grep committed-rev "$(srcdir)/.svn/entries" | head -1 | sed -e 's/^ *committed-rev=\"//' -e 's/\"//'`; \ +- cdate=`grep committed-date "$(srcdir)/.svn/entries" | head -1 | sed -e 's/^ *committed-date=\"//' -e 's/T.*//'`; \ +- sed -e "s/unknown/$${rev}/" -e "s/Today/$${cdate}/" SVN-REVISION-tmp > SVN-REVISION-tmp2; mv SVN-REVISION-tmp2 SVN-REVISION-tmp ; \ +- fi ; \ +- fi ; \ ++ | cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \ + $(top_srcdir)/tools/move-if-change SVN-REVISION-tmp SVN-REVISION ; \ + rm -f SVN-REVISION-tmp ; \ + else \ +diff -urp R-2.4.0.old/NEWS R-2.4.0/NEWS +--- R-2.4.0.old/NEWS 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/NEWS 2006-11-03 19:41:47.000000000 -0600 +@@ -6,6 +6,100 @@ + ************************************************** + + ++ CHANGES IN R VERSION 2.4.0 patched ++ ++INSTALLATION ++ ++ o The extraction of info from Subversion for an SVN checkout now ++ also works for svn >= 1.4.0. However, on Windows the 'Last ++ Changed Date' will be in the local timezone, and not in GMT as ++ previously. ++ ++ o configure uses code borrowed from autoconf 2.60 to try harder to ++ ensure that a C99-compliant compiler is used. (It does so by ++ appending to CC.) This avoids problems with systems such as FC5 ++ which override CFLAGS and thereby lose flags such as -std=gnu99. ++ ++ ++NEW FEATURES ++ ++ o rainbow(), heat.colors(), terrain.colors(), topo.colors() and ++ cm.colors() all gain an 'alpha' argument to be passed to hsv(). ++ ++ ++BUG FIXES ++ ++ o Fixed warning() to use .dfltWarn intead of .dfltStop for default ++ handling (PR#9274). ++ ++ o R would slow down when the product of the length of a vector and ++ the length of a character vector used to subset it exceeded 2^31. ++ (PR#9280) ++ ++ o merge() now allows zero-row data frames. ++ ++ o add1.lm() had been broken by other changes for weighted fits. ++ ++ o axis.POSIXct() would sometimes give the wrong labels. ++ ++ o Help for a method call would fail. (PR#9291) ++ ++ o gzfile() returned an object of class "file" not "gzfile". (PR#9271) ++ ++ o load()ing from a connection had a logic bug in when it closed ++ the connection. (PR#9271) ++ ++ o The lowess() algorithm is unstable if the MAD of the residuals ++ becomes (effectively) zero: R now terminates the iterations at ++ that point. (This may result in quite different answers.) ++ ++ The 'delta' argument was incorrectly documented. (PR#9264) ++ ++ o abbreviate() would only work for strings of up to 8191 bytes, ++ but this was not checked. Now longer strings are errors. ++ ++ o Drawing X11 rotated text was buggy for VERY small (negative) ++ angle of rotation. Reported by Ben Bolker. ++ ++ o The X11 data editor would crash in an MBCS locale if R was ++ compiled with FC's CFLAGS that add buffer overflow and ++ stack-smashing detection. ++ ++ o rect() was not accepting border=NA in some cases involving ++ cross-hatching. ++ ++ o Fixes to S4 group generics to ensure that the correct number of ++ active arguments are in the signature of the group and all ++ members. Also a fix to keep the 'groupMembers' slot up to date. ++ ++ o removeClass() now takes care to remove any subclass references ++ to the deleted class. ++ ++ o mle() (in stats4) might not have worked as intended when the ++ order of parameters in 'start' differed from that in the ++ log-likelihood. (PR#9313) ++ ++ o dotchart() now properly restores par() settings behind itself. ++ ++ o system() on Mac OS X was blocking arbitrary signals during the ++ call although only SIGPROF was meant to be blocked. ++ ++ o methods cached via callNextMethod() and (sometimes) as() were ++ being cached as directly specified although in fact they were ++ inherited. Caused problems in later search for inherited methods. ++ ++ o str() works properly for method definitions and other S4-classed ++ function objects. ++ ++ o JAVA_LIBS are now correctly set on MacOS X ++ ++ o Fix null-termination issue suspected of causing crash with Fedora ++ Extra RPMS (PR#9339, Justin Harrington, analysis and fix from Bill ++ Dunlap). ++ ++ ++ ++ + CHANGES IN R VERSION 2.4.0 + + +Binary files R-2.4.0.old/po/de.gmo and R-2.4.0/po/de.gmo differ +diff -urp R-2.4.0.old/po/de.po R-2.4.0/po/de.po +--- R-2.4.0.old/po/de.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/de.po 2006-10-28 14:36:11.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R-2.2.1\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-09-21 10:41+0200\n" + "Last-Translator: Detlef Steuer <steuer(a)hsu-hh.de>\n" + "Language-Team: R-core <R-core(a)r-project.org>\n" +@@ -82,7 +82,7 @@ msgstr "ungltige 'names' in 'R_unlink' + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -127,7 +127,7 @@ msgstr "ungltige 'names' in 'R_unlink' + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -473,7 +473,7 @@ msgid "second argument must be a list" + msgstr "zweites Argument muss eine Liste sein" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "Indizierung auerhalb der Grenzen" + +@@ -1151,7 +1151,7 @@ msgstr "angegebene Vektorgre ist zu + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "Verwendung der NULL Umgebung ist nicht mehr mglich" + +@@ -1284,114 +1284,114 @@ msgstr "ungltiges Teilungsmuster '%s'" + msgid "the first argument must be a character vector" + msgstr "erstes Argument muss ein Charaktervektor sein" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviate mit nicht-ASCII Zeichen genutzt" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "Nicht-Charakter Namen" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "ungltiger Wert von 'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "ungltige multibyte Zeichenkette %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "regular expression ist in dieser Lokalisierung ungltig" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "ungltige regular expression '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "Eingabezeichenkette %d ungltig in dieser locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "ungltige Rckreferenz %d in regular expression" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' ist ungltig in dieser locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' ist ungltig in dieser locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "Muster mit Lnge 0" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "Nicht-Charakter Argument fr tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "abnehmende Bereichsspezifikation ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "abnehmende Bereichsspezifikation ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "ungltige (NA) Argumente." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "ungltige multibyte Zeichenkette 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "ungltige multibyte Zeichenkette 'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' ist lnger als 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "ungltige multibyte Eingabezeichenkette %d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "Benutzung von agrep() in einer UTF-8 Lokalisierung arbeitet wahrscheinlich " + "nur fr ASCII Zeichenketten" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "konnte keinen Speicher fr approximate matching zuteilen" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "konnte case insensitive matching nicht durchfhren" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "Argument muss ein Charakter-Vektor der Lnge 1 sein" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1399,45 +1399,45 @@ msgstr "" + "Argument sollte ein Charakter-Vektor der Lnge 1 sein\n" + "alle Argumente bis auf das erste werden ignoriert" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "Argument 'x' muss ein raw Vektor sein" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "Argument 'multiple' muss TRUE oder FALSE sein" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "Argument 'shift' muss eine kleine ganze Zahl sein" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "Argument 'x' muss ein Vektor ganzer Zahlen sein" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "Argument 'x' muss entweder raw, ganzzahlig oder logisch sein" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "Argument 'type' muss eine Zeichenkette sein" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "Lnge des Argumentes 'x' muss ein Vielfaches von %d sein" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "Argument 'x' darf keine NAs enthalten" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "Argument 'x' muss ein Vektor ganzer Zahlen sein" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() bentigt Charakter-Vektor" + +@@ -5496,7 +5496,7 @@ msgstr "Schreibfehler in Verbindung" + msgid "no input is available" + msgstr "keine Eingabe verfgbar" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6126,7 +6126,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] Index (%d) auerhalb des Bereichs" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "ungltiger Indextyp" + +@@ -6162,19 +6162,19 @@ msgstr "(subscript) boolescher Index zu + msgid "only 0's may be mixed with negative subscripts" + msgstr "nur Nullen drfen mit negativen Indizes gemischt werden" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "Element eines Charaktervektors ist nicht vom Typ CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "kein 'dimnames' Attribut fr Arrays" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "ungltiger Index" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "Indizierung bei einem Nicht-Vektor" + +Binary files R-2.4.0.old/po/en_GB.gmo and R-2.4.0/po/en_GB.gmo differ +diff -urp R-2.4.0.old/po/en_GB.po R-2.4.0/po/en_GB.po +--- R-2.4.0.old/po/en_GB.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/en_GB.po 2006-10-28 14:36:08.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2005-02-22 16:55+0000\n" + "Last-Translator: Prof Brian Ripley <ripley(a)stats.ox.ac.uk>\n" + "Language-Team: English\n" +@@ -82,7 +82,7 @@ msgstr "" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -127,7 +127,7 @@ msgstr "" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -471,7 +471,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1133,7 +1133,7 @@ msgstr "" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1266,156 +1266,156 @@ msgstr "" + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr "" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "" + +@@ -5406,7 +5406,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6016,7 +6016,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6052,19 +6052,19 @@ msgstr "" + msgid "only 0's may be mixed with negative subscripts" + msgstr "" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/en.gmo and R-2.4.0/po/en.gmo differ +diff -urp R-2.4.0.old/po/en.po R-2.4.0/po/en.po +--- R-2.4.0.old/po/en.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/en.po 2006-10-28 14:36:10.000000000 -0500 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2005-01-25 12:01+0000\n" + "Last-Translator: Brian Ripley <Brian.Ripley(a)R-project.org>\n" + "Language-Team: R-core <R-core(a)R-project.org>\n" +@@ -80,7 +80,7 @@ msgstr "" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -125,7 +125,7 @@ msgstr "" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -469,7 +469,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1131,7 +1131,7 @@ msgstr "" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1264,156 +1264,156 @@ msgstr "" + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr "" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "" + +@@ -5404,7 +5404,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6014,7 +6014,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6050,19 +6050,19 @@ msgstr "" + msgid "only 0's may be mixed with negative subscripts" + msgstr "" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/en(a)quot.gmo and R-2.4.0/po/en(a)quot.gmo differ +diff -urp R-2.4.0.old/po/en(a)quot.po R-2.4.0/po/en(a)quot.po +--- R-2.4.0.old/po/en(a)quot.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/en(a)quot.po 2006-10-28 14:36:10.000000000 -0500 +@@ -29,8 +29,8 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.4.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" +-"PO-Revision-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" ++"PO-Revision-Date: 2006-10-24 15:53+0100\n" + "Last-Translator: Automatically generated\n" + "Language-Team: none\n" + "MIME-Version: 1.0\n" +@@ -104,7 +104,7 @@ msgstr "invalid names in R_unli + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -149,7 +149,7 @@ msgstr "invalid names in R_unli + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -494,7 +494,7 @@ msgid "second argument must be a list" + msgstr "second argument must be a list" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "subscript out of bounds" + +@@ -1166,7 +1166,7 @@ msgstr "vector size specified is too lar + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "use of NULL environment is defunct" + +@@ -1299,112 +1299,112 @@ msgstr "invalid split pattern %s" + msgid "the first argument must be a character vector" + msgstr "the first argument must be a character vector" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviate used with non-ASCII chars" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "non-character names" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "invalid value of allow_" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "invalid multibyte string %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "regular expression is invalid in this locale" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "invalid regular expression %s" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "input string %d is invalid in this locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "invalid backreference %d in regular expression" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "pattern is invalid in this locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "replacement is invalid in this locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "zero-length pattern" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "non-character argument to tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "decreasing range specification ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "decreasing range specification ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "invalid (NA) arguments." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "invalid multibyte string old" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "invalid multibyte string new" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "old is longer than new" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "invalid input multibyte string %d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "use of agrep() in a UTF-8 locale may only work for ASCII strings" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "could not allocate memory for approximate matching" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "could not perform case insensitive matching" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "argument must be a character vector of length 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1412,45 +1412,45 @@ msgstr "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "argument x must be a raw vector" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "argument multiple must be TRUE or FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "argument shift must be a small integer" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "argument x must be a integer vector" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "argument x must be raw, integer or logical" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "argument type must be a character string" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "argument x must be a multiple of %d long" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "argument x must not contain NAs" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "argument x must be an integer vector" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() requires a character vector" + +@@ -5479,7 +5479,7 @@ msgstr "error writing to connection" + msgid "no input is available" + msgstr "no input is available" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6103,7 +6103,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] subscript (%d) out of bounds" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "invalid subscript type" + +@@ -6139,19 +6139,19 @@ msgstr "(subscript) logical subscript to + msgid "only 0's may be mixed with negative subscripts" + msgstr "only 0's may be mixed with negative subscripts" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "character vector element does not have type CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "no dimnames attribute for array" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "invalid subscript" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "subscripting on non-vector" + +Binary files R-2.4.0.old/po/es.gmo and R-2.4.0/po/es.gmo differ +diff -urp R-2.4.0.old/po/es.po R-2.4.0/po/es.po +--- R-2.4.0.old/po/es.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/es.po 2006-10-28 14:36:08.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.3.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-04-17 00:24+0100\n" + "Last-Translator: Pablo E. Verde <pabloemilio.verde(a)uni-duesseldorf.de>\n" + "Language-Team: Spanish <RenEspanol(a)googlegroups.com>\n" +@@ -84,7 +84,7 @@ msgstr "'names' invlidos en R_unlink" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -129,7 +129,7 @@ msgstr "'names' invlidos en R_unlink" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -481,7 +481,7 @@ msgid "second argument must be a list" + msgstr "el segundo argumento debe ser una lista" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "subndice fuera de los lmites" + +@@ -1162,7 +1162,7 @@ msgstr "tamao del vector especificado e + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1299,114 +1299,114 @@ msgstr "patrn de separacin invlido '% + msgid "the first argument must be a character vector" + msgstr "el primer argumento debe ser un vector de caracteres" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abreviatura utilizada con caracteres no ASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "nombres de tipo no caracter" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "valor de 'allow_' invlido" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "string multibyte invlida %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "la expresin regular es invlida es este locale" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "expresin regular invlida '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "string de entrada %d es invlida en este locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "auto-referencia %d invlida en una expresin regular" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' es invlido en este locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' es invlido en este locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "patrn de longitud 0" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "argumento que no es caracter para tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "especificacin de rango decreciente ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "especificacin de rango decreciente ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "argumentos (NA) invlidos" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "string multibyte invlida 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "string multibyte invlida 'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' es ms largo que 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "string multibyte %d de entrada invlida" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "el uso de agrep() en un locale UTF-8 puede funcionar slo para strings ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "no fue posible asignar memoria para una concordancia aproximado" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + "no fue posible realizar una concordancia no sensible a maysculas/minsculas" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "el argumento debe ser un vector de caracteres de longitud 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1414,45 +1414,45 @@ msgstr "" + "el argumento debe ser un vector de caracteres de longitud 1\n" + "todos los elementos sern ignorados, salvo el primero" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "el argumento 'x' debe ser un vector de tipo crudo" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "el argumento 'multiple' debe ser TRUE o FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "el argumento 'shift' debe ser un entero pequeo" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "el argumento 'x' debe ser un vector entero" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "el argumento 'x' debe ser crudo, entero o lgico" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "el argumento 'type' debe ser una cadena de caracteres" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "el argumento 'x' debe ser un mltiplo de la longitud de %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "el argumento 'x' no puede contener NAs" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "el argumento 'x' debe ser un vector entero" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() requiere un vector de caracteres" + +@@ -5545,7 +5545,7 @@ msgstr "error al escribir una conexin" + msgid "no input is available" + msgstr "no hay disponible mecanismos de historia" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6185,7 +6185,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "subscrito (%d) en [[ ]] fuera de limites" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "tipo de subscrito invalido" + +@@ -6221,19 +6221,19 @@ msgstr "(subscript) subscrito logico muy + msgid "only 0's may be mixed with negative subscripts" + msgstr "solamente 0's pueden ser mezclados con subscritos negativos" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "elemento del vector de caracteres no tiene tipo CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "arreglo (array) sin atributo 'dimnames'" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "subscrito invalido" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "intento de usar un subscrito e un objeto distinto a un vector" + +Binary files R-2.4.0.old/po/fr.gmo and R-2.4.0/po/fr.gmo differ +diff -urp R-2.4.0.old/po/fr.po R-2.4.0/po/fr.po +--- R-2.4.0.old/po/fr.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/fr.po 2006-10-28 14:36:10.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R-2.2.1\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-04-18 08:23+0100\n" + "Last-Translator: Philippe Grosjean <phgrosjean(a)sciviews.org>\n" + "Language-Team: French <R-core(a)r-project.org>\n" +@@ -84,7 +84,7 @@ msgstr "'names' incorrect dans 'R_unlink + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -129,7 +129,7 @@ msgstr "'names' incorrect dans 'R_unlink + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -480,7 +480,7 @@ msgid "second argument must be a list" + msgstr "le second argument doit tre une liste" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "indice hors limites" + +@@ -1176,7 +1176,7 @@ msgstr "la longueur choisie pour le vect + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "l'utilisation de l'environnement NULL n'est plus autorise" + +@@ -1311,38 +1311,38 @@ msgstr "motif de dcoupage '%s' incorrec + msgid "the first argument must be a character vector" + msgstr "le premier argument doit tre un vecteur de caractres" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviate utilis avec des caractres non ASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "les noms ne sont pas des chanes de caractres" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "valeur incorrecte pour 'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "chane de charactres multioctets incorrecte %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "expression rgulire incorrecte dans cet environnement linguistique" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "expression rgulire incorrecte '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" +@@ -1350,78 +1350,78 @@ msgstr "" + "la chane de caractres entre %d est incorrecte dans cet environnement " + "linguistique" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "rfrence arrire %d incorrecte dans l'expression rgulire" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' est incorrect dans cet environnement linguistique" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' est incorrect dans cet environnement linguistique" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "motif de longueur nulle" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "l'argument de tolower() n'est pas une chane de caractres" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "spcification de plage dcroissante ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "spcification de plage dcroissante ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "arguments (NA) incorrects." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "chane de charactres multioctets 'old' incorrecte" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "chane de charactres multioctets 'new' incorrecte" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' est plus long que 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "chane de caractres multioctets %d incorrecte en entre" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "l'utilisation de agrep() dans un environnement UTF-8 ne peut fonctionner que " + "pour des chanes ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + "impossible d'allouer de la mmoire pour une correspondance approximative" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "une correspondance indpendante de la casse ne peut tre effectue" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "l'argument doit tre un vecteur de caractres de longueur 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1429,45 +1429,45 @@ msgstr "" + "l'argument doit tre un vecteur de caractres de longueur 1\n" + "tous les lments sauf le premier sont ignors" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "l'argument 'x' doit tre un vecteur de type raw" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "l'argument 'multiple' doit tre TRUE ou FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "l'argument 'shift' doit tre un petit entier" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "l'argument 'x' doit tre un vecteur d'entiers" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "l'argument 'x' doit tre de type raw, entier ou logique" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "l'argument 'type' doit tre une chane de caractres" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "l'argument 'x' doit tre un multiple de la longueur %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "l'argument 'x' ne doit pas contenir de valeurs manquantes (NA)" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "l'argument 'x' doit tre un vecteur d'entiers" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() exige un vecteur de caractres comme argument" + +@@ -5607,7 +5607,7 @@ msgstr "erreur d'criture vers la connex + msgid "no input is available" + msgstr "pas d'entre disponible" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6254,7 +6254,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] indice (%d) en dehors des bornes" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "type d'indice incorrect" + +@@ -6290,19 +6290,19 @@ msgstr "(subscript) indice logique trop + msgid "only 0's may be mixed with negative subscripts" + msgstr "les indices ngatifs ne peuvent tre mlangs qu' des 0" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "un lment d'un vecteur de caractres n'a pas le type CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "aucun attribut 'dimnames' pour le tableau" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "indice incorrect" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "indiage d'un lment non vectoriel" + +Binary files R-2.4.0.old/po/it.gmo and R-2.4.0/po/it.gmo differ +diff -urp R-2.4.0.old/po/it.po R-2.4.0/po/it.po +--- R-2.4.0.old/po/it.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/it.po 2006-10-28 14:36:11.000000000 -0500 +@@ -14,7 +14,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-01-16 09:11+0100\n" + "Last-Translator: Daniele Medri <daniele.medri2(a)unibo.it>\n" + "Language-Team: Italian <tp(a)lists.linux.it>\n" +@@ -90,7 +90,7 @@ msgstr "'names' non valido in R_unlink" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -135,7 +135,7 @@ msgstr "'names' non valido in R_unlink" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -490,7 +490,7 @@ msgid "second argument must be a list" + msgstr "il secondo argomento deve essere di tipo list" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "indice fuori limite" + +@@ -1176,7 +1176,7 @@ msgstr "dimensione troppo grande per il + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1312,114 +1312,114 @@ msgstr "pattern di split '%s' non valido + msgid "the first argument must be a character vector" + msgstr "il primo argomento deve essere una vettore character" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviazione usata con caratteri non ASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "nomi non di tipo character" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "valore non valido per 'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "stringa mulibyte %d non valida" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "l'espressione regolare non valida in questo locale" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "espressione regolare '%s' non valida" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "stringa di input %d non valida in questo locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "riferimento all'indietro %d non valido in questa espressione regolare" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' non valido per questo locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacemente' non valido in questo locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "'pattern' di lunghezza zero" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "argomento non character in tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "specificazione range decrescente ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "specificazione range decrescente ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "argomenti non validi (NA)." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "stringa multibyte non valido in 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "stringa multibyte 'new' non valida" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' pi lungo di 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "stringa input multibyte %d non valida" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "l'uso di agrep() in un locale UTF-8 pu funzionare solo per stringhe ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "non possibile allocare memoria per match approssimato" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + "non posso eseguire accoppiamenti senza tener conto delle maiuscole/minuscole" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "l'argomento deve essere un vettore character di lunghezza 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1427,45 +1427,45 @@ msgstr "" + "l'argomento deve essere un vettore di caratteri di lunghezza 1\n" + "verranno ignorati tutti tranne il primo elemento" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "l'argomento 'x' deve essere un vettore semplice" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "l'argomento 'mutiple' deve essere TRUE o FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "l'argomento 'shift' deve essere un intero piccolo" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "l'argomento 'x' deve essere un vettore di interi" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "l'argomento 'x' deve essere semplice, intero o booleano" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "l'argomento 'type' deve essere una stringa character" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "l'argomento 'x' deve essere lungo un multiplo di %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "l'argomento 'x' non deve contenere NA" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "l'argomento 'x' deve essere un vettore di interi" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strstrim() necessita di un vettore di caratteri" + +@@ -1524,7 +1524,7 @@ msgstr "environment non valido" + + #: src/main/coerce.c:1408 + msgid "argument must have length at least 1" +-msgstr "l'argometno deve avere almeno lunghezza 1" ++msgstr "l'argomento deve avere almeno lunghezza 1" + + #: src/main/coerce.c:1433 + msgid "invalid body for function" +@@ -3774,7 +3774,7 @@ msgstr "l'argumento formale \"%s\" as + #: src/main/match.c:234 src/main/match.c:273 + #, c-format + msgid "argument %d matches multiple formal arguments" +-msgstr "l'argomento %d si associa a pi argometni formali" ++msgstr "l'argomento %d si associa a pi argomenti formali" + + #: src/main/match.c:386 + #, fuzzy, c-format +@@ -5549,7 +5549,7 @@ msgstr "errore di scrittura sulla connes + msgid "no input is available" + msgstr "non esiste un meccanismo di gestione history" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6190,7 +6190,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] indice (%d) fuori limiti" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "tipo di indice non valido" + +@@ -6226,19 +6226,19 @@ msgstr "(subscript) indice logicol tropp + msgid "only 0's may be mixed with negative subscripts" + msgstr "solo gli 0 si possono usare contemporaneamente con indici negativi" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "il vettore carattere non ha un tipo CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "attributo 'dimnames' mancante per l'array" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "indici non valido" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "indicizzazione su un non vettore" + +Binary files R-2.4.0.old/po/ja.gmo and R-2.4.0/po/ja.gmo differ +diff -urp R-2.4.0.old/po/ja.po R-2.4.0/po/ja.po +--- R-2.4.0.old/po/ja.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/ja.po 2006-10-28 14:36:12.000000000 -0500 +@@ -6,7 +6,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.4.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-09-22 19:00+0900\n" + "Last-Translator: Shigeru Mase <maseshigeru(a)gmail.com>\n" + "Language-Team: R-core <R-core(a)R-project.org>\n" +@@ -85,7 +85,7 @@ msgstr "R_unlink 'names' + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -130,7 +130,7 @@ msgstr "R_unlink 'names' + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -474,7 +474,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1157,7 +1157,7 @@ msgstr " + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "NULL" + +@@ -1290,113 +1290,113 @@ msgstr " '%s' + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "ASCII " + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "'allow_' " + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "%d " + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "'%s' " + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr " %d " + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr " %d " + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' " + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' " + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "tolower " + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr " ('%lc-%lc') " + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr " ('%c-%c') " + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "(NA)" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "'old' " + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "'new' " + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' 'new' " + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr " %d " + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "UTF-8 agrep ASCII " + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1404,45 +1404,45 @@ msgstr "" + "1\n" + "" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr " 'x' raw " + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr " 'multiple' TRUE FALSE " + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr " 'shift' " + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "'x'raw, " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr " 'type' " + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr " 'x' %d " + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr " 'x' NA " + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim " + +@@ -5493,7 +5493,7 @@ msgstr " + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6124,7 +6124,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] %d" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6160,19 +6160,19 @@ msgstr " (subscript) + msgid "only 0's may be mixed with negative subscripts" + msgstr " 0 " + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr " CHARSXP " + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr " 'dimnames' " + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/ko.gmo and R-2.4.0/po/ko.gmo differ +diff -urp R-2.4.0.old/po/ko.po R-2.4.0/po/ko.po +--- R-2.4.0.old/po/ko.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/ko.po 2006-10-28 14:36:08.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2005-05-31 10:36+0900\n" + "Last-Translator: park ui-il <uiami(a)hanmail.com> \n" + "Language-Team: South Korea\n" +@@ -85,7 +85,7 @@ msgstr "R_unlink 'names' + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -130,7 +130,7 @@ msgstr "R_unlink 'names' + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -482,7 +482,7 @@ msgid "second argument must be a list" + msgstr " " + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr " " + +@@ -1161,7 +1161,7 @@ msgstr " + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1297,114 +1297,114 @@ msgstr " '%s' + msgid "the first argument must be a character vector" + msgstr " " + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "ASCII " + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr " " + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "'allow_' " + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "%d " + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr " licale " + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "'%s' " + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr " %d locale " + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr " %d " + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' locale " + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' locale " + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "zero-length " + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "tolower() " + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr " ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr " ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr " (NA)." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "'old' " + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "'new' " + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' 'new' " + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr " %d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + " UTF-8 locale agrep() ASCII " + " " + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr " matching " + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr " matching " + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr " 1 " + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1412,46 +1412,46 @@ msgstr "" + " 1 \\n\n" + " " + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr " 'x' raw " + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr " 'multiple' TRUE FALSE " + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr " 'shift' " + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr " 'x' raw, , " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr " 'type' " + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr " 'x' %d " + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr " 'x' NA " + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + #, fuzzy + msgid "argument 'x' must be an integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim " + +@@ -5545,7 +5545,7 @@ msgstr "connection + msgid "no input is available" + msgstr " machanism " + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6178,7 +6178,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] (%d) " + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr " " + +@@ -6214,19 +6214,19 @@ msgstr "(subscript) + msgid "only 0's may be mixed with negative subscripts" + msgstr " 0 " + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr " CHARSXP " + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr " 'dimnames' " + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr " " + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr " " + +Binary files R-2.4.0.old/po/pt_BR.gmo and R-2.4.0/po/pt_BR.gmo differ +diff -urp R-2.4.0.old/po/pt_BR.po R-2.4.0/po/pt_BR.po +--- R-2.4.0.old/po/pt_BR.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/pt_BR.po 2006-10-28 14:36:08.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-04-16 19:17-0300\n" + "Last-Translator: Fernando Henrique Ferraz P. da Rosa <feferraz(a)ime.usp.br>\n" + "Language-Team: Portuguese <ldp-br(a)bazar.conectiva.com.br>\n" +@@ -83,7 +83,7 @@ msgstr "'names' invlidos em 'R_unlink'" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -128,7 +128,7 @@ msgstr "'names' invlidos em 'R_unlink'" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -476,7 +476,7 @@ msgid "second argument must be a list" + msgstr "segundo argumento deve ser uma lista" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "ndice fora de limites" + +@@ -1156,7 +1156,7 @@ msgstr "tamanho de vetor especificado + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "uso do ambiente NULL no mais permitido " + +@@ -1292,114 +1292,114 @@ msgstr "padro split invlido '%s'" + msgid "the first argument must be a character vector" + msgstr "primeiro argumento deve ser um vetor de caracteres" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreaviate usado com caracteres no-ASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "nomes de modo no caractere" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "valor de 'allow_' invlido" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "string multibyte invlida %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "expresso regular invlida nesse locale" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "expresso regular invlida '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "string de entrada %d invlida nesse locale" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "auto-referncia %d invlida na expresso regular" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' invlido nesse locale" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' invlido nesse locale" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "padro de comprimento 0" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "argumento diferente de caractere para tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "especificao de intervalo decrescente ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "especificao de intervalo decrescente ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "argumentos invlidos (NA)" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "string multibyte invlida 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "string multibyte invlida 'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' maior que 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "string de entrada multibyte %d invlida" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + "uso de agrep() em um locale UTF-8 pode funcionar somente para strings ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "no foi possvel alocar memria para comparao aproximada" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + "no foi possvel fazer comparao desconsiderando mausculas/minsculas" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "argumento deve ser um vetor de caracteres de comprimento 1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1407,45 +1407,45 @@ msgstr "" + "argumento deve ser um vetor de caracteres de comprimento 1\n" + "todos menos o primeiro argumento sero ignorados" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "argumento 'x' deve ser um vetor do tipo raw" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "argumento 'multiple' deve ser TRUE ou FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "argumento 'shift' deve ser um inteiro pequeno" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "argumento 'x' deve ser um vetor inteiro" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "argumento 'x' deve ser raw, inteiro ou lgico" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "argumento 'type' deve ser uma string de caracteres" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "argumento 'x' deve ter comprimento mltiplo de %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "argumento 'x' no pode conter NAs" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "argumento 'x' deve ser um vetor inteiro" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() requer um vetor de caracteres" + +@@ -5523,7 +5523,7 @@ msgstr "erro ao escrever na conexo" + msgid "no input is available" + msgstr "nenhuma entrada disponvel" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6163,7 +6163,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "subscrito (%d) em [[ ]] fora de limites" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "tipo de subscrito invlido" + +@@ -6199,19 +6199,19 @@ msgstr "(subscript) subscrito lgico mui + msgid "only 0's may be mixed with negative subscripts" + msgstr "somente 0's podem ser usados junto com subscritos negativos" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "elemento do vetor de caracteres no tem tipo CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "array sem atributo 'dimnames'" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "subscrito invlido" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "tentativa de usar um subscrito em um objeto diferente de vetor" + +Binary files R-2.4.0.old/po/RGui-zh_CN.gmo and R-2.4.0/po/RGui-zh_CN.gmo differ +diff -urp R-2.4.0.old/po/RGui-zh_CN.po R-2.4.0/po/RGui-zh_CN.po +--- R-2.4.0.old/po/RGui-zh_CN.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/RGui-zh_CN.po 2006-10-28 14:36:10.000000000 -0500 +@@ -1,8 +1,8 @@ +-# Chinese translations for R package +-# Copyright (C) 2005 The R Foundation +-# This file is distributed under the same license as the PACKAGE package. +-# <feic(a)avaya.com>, 2006. +-# ++# Chinese translations for R package ++# Copyright (C) 2005 The R Foundation ++# This file is distributed under the same license as the PACKAGE package. ++# <feic(a)avaya.com>, 2006. ++# + msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" +@@ -18,19 +18,19 @@ msgstr "" + + #: console.c:879 console.c:919 + msgid "Not enough memory" +-msgstr "" ++msgstr "" + + #: console.c:975 console.c:979 + msgid "Insufficient memory: text not copied to the clipboard" +-msgstr ": " ++msgstr ": " + + #: console.c:1018 graphapp/clipboard.c:54 graphapp/clipboard.c:80 + msgid "Unable to open the clipboard" +-msgstr "" ++msgstr "" + + #: console.c:1620 + msgid "Insufficient memory. Please close the console" +-msgstr " " ++msgstr " " + + #: console.c:1674 console.c:1727 preferences.c:274 + #, c-format +@@ -38,121 +38,121 @@ msgid "" + "Font %s-%d-%d not found.\n" + "Using system fixed font" + msgstr "" +-"%s-%d-%d\n" +-"" ++"%s-%d-%d\n" ++"" + + #: console.c:1829 + msgid "Save selection to" +-msgstr "" ++msgstr "" + + #: console.c:1831 + msgid "Save console contents to" +-msgstr "" ++msgstr "" + + #: console.c:1929 + msgid "Scrolling.\n" +-msgstr "\n" ++msgstr "\n" + + #: console.c:1930 + msgid " Keyboard: PgUp, PgDown, Ctrl+Arrows, Ctrl+Home, Ctrl+End,\n" +-msgstr " : PgUp, PgDown, Ctrl+, Ctrl+Home, Ctrl+End,\n" ++msgstr " : PgUp, PgDown, Ctrl+, Ctrl+Home, Ctrl+End,\n" + + #: console.c:1931 + msgid "" + " Mouse: use the scrollbar(s).\n" + "\n" + msgstr "" +-" : \n" ++" : \n" + "\n" + + #: console.c:1932 + msgid "Editing.\n" +-msgstr "\n" ++msgstr "\n" + + #: console.c:1933 + msgid " Moving the cursor: \n" +-msgstr " : \n" ++msgstr " : \n" + + #: console.c:1934 + msgid " Left arrow or Ctrl+B: move backward one character;\n" +-msgstr " Ctrl+B: ;\n" ++msgstr " Ctrl+B: ;\n" + + #: console.c:1935 + msgid " Right arrow or Ctrl+F: move forward one character;\n" +-msgstr " Ctrl+F: ;\n" ++msgstr " Ctrl+F: ;\n" + + #: console.c:1936 + msgid " Home or Ctrl+A: go to beginning of line;\n" +-msgstr " HomeCtrl+A: ;\n" ++msgstr " HomeCtrl+A: ;\n" + + #: console.c:1937 + msgid " End or Ctrl+E: go to end of line;\n" +-msgstr " EndCtrl+E: ;\n" ++msgstr " EndCtrl+E: ;\n" + + #: console.c:1938 + msgid " History: Up and Down Arrows, Ctrl+P, Ctrl+N\n" +-msgstr " : , Ctrl+P, Ctrl+N\n" ++msgstr " : , Ctrl+P, Ctrl+N\n" + + #: console.c:1939 + msgid " Deleting:\n" +-msgstr " :\n" ++msgstr " :\n" + + #: console.c:1940 + msgid " Del or Ctrl+D: delete current character;\n" +-msgstr " DelCtrl+D: ;\n" ++msgstr " DelCtrl+D: ;\n" + + #: console.c:1941 + msgid " Backspace: delete preceding character;\n" +-msgstr " Backspace: ;\n" ++msgstr " Backspace: ;\n" + + #: console.c:1942 + msgid "" + " Ctrl+Del or Ctrl+K: delete text from current character to end of line.\n" +-msgstr " Ctrl+DelCtrl+K: \n" ++msgstr " Ctrl+DelCtrl+K: \n" + + #: console.c:1943 + msgid " Ctrl+U: delete all text from current line.\n" +-msgstr " Ctrl+U: \n" ++msgstr " Ctrl+U: \n" + + #: console.c:1944 + msgid " Copy and paste.\n" +-msgstr " .\n" ++msgstr " .\n" + + #: console.c:1945 + msgid "" + " Use the mouse (with the left button held down) to mark (select) text.\n" +-msgstr " () \n" ++msgstr " () \n" + + #: console.c:1946 + msgid "" + " Use Shift+Del (or Ctrl+C) to copy the marked text to the clipboard and\n" +-msgstr " Shift+Del(Ctrl+C) \n" ++msgstr " Shift+Del(Ctrl+C) \n" + + #: console.c:1947 + msgid "" + " Shift+Ins (or Ctrl+V or Ctrl+Y) to paste the content of the clipboard " + "(if any) \n" +-msgstr " Shift+Ins(Ctrl+VCtrl+Y)() \n" ++msgstr " Shift+Ins(Ctrl+VCtrl+Y)() \n" + + #: console.c:1948 + msgid " to the console, Ctrl+X first copy then paste\n" +-msgstr " , Ctrl+X\n" ++msgstr " , Ctrl+X\n" + + #: console.c:1949 + msgid " Misc:\n" +-msgstr " :\n" ++msgstr " :\n" + + #: console.c:1950 + msgid " Ctrl+L: Clear the console.\n" +-msgstr " Ctrl+L: .\n" ++msgstr " Ctrl+L: .\n" + + #: console.c:1951 + msgid " Ctrl+O: Toggle overwrite mode: initially off.\n" +-msgstr " Ctrl+O: : \n" ++msgstr " Ctrl+O: : \n" + + #: console.c:1952 + msgid " Ctrl+T: Interchange current char with one to the left.\n" +-msgstr " Ctrl+T: \n" ++msgstr " Ctrl+T: \n" + + #: console.c:1953 + msgid "" +@@ -160,14 +160,14 @@ msgid "" + "Note: Console is updated only when some input is required.\n" + msgstr "" + "\n" +-": \n" ++": \n" + + #: console.c:1954 + msgid "" + " Use Ctrl+W to toggle this feature off/on.\n" + "\n" + msgstr "" +-" Ctrl+W\n" ++" Ctrl+W\n" + "\n" + + #: console.c:1955 +@@ -175,72 +175,72 @@ msgid "" + "Use ESC to stop the interpreter.\n" + "\n" + msgstr "" +-"ESC\n" ++"ESC\n" + "\n" + + #: console.c:1956 + msgid "Standard Windows hotkeys can be used to switch to the\n" +-msgstr "Windows\n" ++msgstr "Windows\n" + + #: console.c:1957 + msgid "graphics device (Ctrl+Tab or Ctrl+F6 in MDI, Alt+Tab in SDI)" +-msgstr " (MDICtrl+TabCtrl+F6, SDIAlt+Tab)" ++msgstr " (MDICtrl+TabCtrl+F6, SDIAlt+Tab)" + + #: dataentry.c:220 + msgid "invalid argument" +-msgstr "" ++msgstr "" + + #: dataentry.c:267 + msgid "invalid type for value" +-msgstr "" ++msgstr "" + + #: dataentry.c:281 + msgid "invalid device" +-msgstr "" ++msgstr "" + + #: dataentry.c:329 + msgid "dataentry: internal memory problem" +-msgstr "dataentry: " ++msgstr "dataentry: " + + #: dataentry.c:623 dataentry.c:1117 + msgid "dataentry: internal memory error" +-msgstr "dataentry: " ++msgstr "dataentry: " + + #: dataentry.c:742 dataentry.c:755 + msgid "internal type error in dataentry" +-msgstr "dataentry" ++msgstr "dataentry" + + #: dataentry.c:922 + msgid "dataentry: expression too long" +-msgstr "dataentry: " ++msgstr "dataentry: " + + #: dataentry.c:1351 + msgid "column names cannot be blank" +-msgstr "" ++msgstr "" + + #: dataentry.c:1395 + msgid "Variable editor" +-msgstr "" ++msgstr "" + + #: dataentry.c:1400 + msgid "variable name" +-msgstr "" ++msgstr "" + + #: dataentry.c:1402 + msgid "type" +-msgstr "" ++msgstr "" + + #: dataentry.c:1506 + msgid "Cell width(s)" +-msgstr "" ++msgstr "" + + #: dataentry.c:1511 + msgid "Cell width" +-msgstr "" ++msgstr "" + + #: dataentry.c:1514 + msgid "variable" +-msgstr "" ++msgstr "" + + #: dataentry.c:1553 + msgid "" +@@ -264,282 +264,282 @@ msgid "" + " Right-click menu for copy, paste, autosize currently selected column\n" + "\n" + msgstr "" +-"\n" +-" : \n" +-"\tTab, Shift+Tab\n" +-"\tPgDnCtrl+F: \n" +-"\tPgUpCtrl+B: \n" +-"\tHome: (1,1)\n" +-"\tEnd: \n" +-" : , \n" ++"\n" ++" : \n" ++"\tTab, Shift+Tab\n" ++"\tPgDnCtrl+F: \n" ++"\tPgUpCtrl+B: \n" ++"\tHome: (1,1)\n" ++"\tEnd: \n" ++" : , \n" + "\n" +-"\n" +-" \n" +-" \n" ++"\n" ++" \n" ++" \n" + "\n" +-".\n" +-" Ctrl-L\n" +-" Ctrl-C\n" +-" Ctrl-V\n" +-" , , \n" ++".\n" ++" Ctrl-L\n" ++" Ctrl-C\n" ++" Ctrl-V\n" ++" , , \n" + "\n" + + #: dataentry.c:1559 dataentry.c:1653 editor.c:730 rui.c:1065 + msgid "Help" +-msgstr "" ++msgstr "" + + #: dataentry.c:1561 + msgid "Copy selected cell" +-msgstr "" ++msgstr "" + + #: dataentry.c:1562 + msgid "Paste to selected cell" +-msgstr "" ++msgstr "" + + #: dataentry.c:1563 + msgid "Autosize column" +-msgstr "" ++msgstr "" + + #: dataentry.c:1565 pager.c:295 rui.c:785 + #: ../library/grDevices/src/devWindows.c:1595 + msgid "Stay on top" +-msgstr "" ++msgstr "" + + #: dataentry.c:1567 dataentry.c:1645 pager.c:297 pager.c:460 + msgid "Close" +-msgstr "" ++msgstr "" + + #: dataentry.c:1617 + msgid "Data Editor" +-msgstr "" ++msgstr "" + + #: dataentry.c:1643 editor.c:676 pager.c:452 rui.c:1013 + #: ../library/grDevices/src/devWindows.c:1540 + msgid "File" +-msgstr "" ++msgstr "" + + #: dataentry.c:1647 editor.c:694 pager.c:462 rui.c:1034 + msgid "Edit" +-msgstr "" ++msgstr "" + + #: dataentry.c:1648 + msgid "Copy \tCTRL+C" +-msgstr " \tCTRL+C" ++msgstr " \tCTRL+C" + + #: dataentry.c:1649 + msgid "Paste \tCTRL+V" +-msgstr " \tCTRL+V" ++msgstr " \tCTRL+V" + + #: dataentry.c:1650 + msgid "Delete\tDEL" +-msgstr "\tDEL" ++msgstr "\tDEL" + + #: dataentry.c:1652 + msgid "Cell widths ..." +-msgstr "..." ++msgstr "..." + + #: dataentry.c:1654 + msgid "Data editor" +-msgstr "" ++msgstr "" + + #: editor.c:449 pager.c:172 pager.c:192 + msgid "No RGui console to paste to" +-msgstr "RGui" ++msgstr "RGui" + + #: editor.c:551 + msgid "R EDITOR\n" +-msgstr "R\n" ++msgstr "R\n" + + #: editor.c:553 + msgid "A standard text editor for editing and running R code.\n" +-msgstr "R\n" ++msgstr "R\n" + + #: editor.c:555 + msgid "RUNNING COMMANDS\n" +-msgstr "\n" ++msgstr "\n" + + #: editor.c:556 + msgid "To run a line or section of R code, select the code and either\n" +-msgstr "R, \n" ++msgstr "R, \n" + + #: editor.c:557 + msgid " Press Ctrl-R\n" +-msgstr " Ctrl-R\n" ++msgstr " Ctrl-R\n" + + #: editor.c:558 + msgid " Select \"Run line or selection\" from the \"Edit\" menu\n" +-msgstr " \"Edit\"\"Run line or selection\"\n" ++msgstr " \"Edit\"\"Run line or selection\"\n" + + #: editor.c:559 + msgid " Press the \"Run line or selection\" icon on the toolbar\n" +-msgstr " \"Run line or selection\"\n" ++msgstr " \"Run line or selection\"\n" + + #: editor.c:560 + msgid "" + "This will copy the selected commands to the console and evaluate them.\n" +-msgstr "\n" ++msgstr "\n" + + #: editor.c:561 + msgid "" + "If there is no selection, this will just run the current line and advance\n" +-msgstr "\n" ++msgstr "\n" + + #: editor.c:562 + msgid "the cursor by one line.\n" +-msgstr "\n" ++msgstr "\n" + + #: editor.c:574 editor.c:649 editor.c:710 + msgid "Run line or selection" +-msgstr "" ++msgstr "" + + #: editor.c:576 editor.c:695 + msgid "Undo" +-msgstr "" ++msgstr "" + + #: editor.c:578 editor.c:698 + msgid "Cut" +-msgstr "" ++msgstr "" + + #: editor.c:579 editor.c:700 pager.c:290 pager.c:463 rui.c:775 rui.c:978 + #: rui.c:1035 + msgid "Copy" +-msgstr "" ++msgstr "" + + #: editor.c:580 editor.c:702 rui.c:776 rui.c:982 rui.c:1036 + msgid "Paste" +-msgstr "" ++msgstr "" + + #: editor.c:581 editor.c:704 + msgid "Delete" +-msgstr "" ++msgstr "" + + #: editor.c:583 editor.c:706 pager.c:293 pager.c:469 rui.c:782 rui.c:1040 + msgid "Select all" +-msgstr "" ++msgstr "" + + #: editor.c:641 pager.c:416 rui.c:966 + msgid "Open script" +-msgstr "" ++msgstr "" + + #: editor.c:645 + msgid "Save script" +-msgstr "" ++msgstr "" + + #: editor.c:653 pager.c:436 ../library/grDevices/src/devWindows.c:1508 + msgid "Return focus to Console" +-msgstr "" ++msgstr "" + + #: editor.c:656 + msgid "Print script" +-msgstr "" ++msgstr "" + + #: editor.c:658 pager.c:431 rui.c:994 + #: ../library/grDevices/src/devWindows.c:1502 + msgid "Print" +-msgstr "" ++msgstr "" + + #: editor.c:677 pager.c:453 rui.c:1015 + msgid "New script" +-msgstr "" ++msgstr "" + + #: editor.c:679 pager.c:454 rui.c:1016 + msgid "Open script..." +-msgstr "..." ++msgstr "..." + + #: editor.c:681 preferences.c:788 + msgid "Save" +-msgstr "" ++msgstr "" + + #: editor.c:683 + msgid "Save as..." +-msgstr "..." ++msgstr "..." + + #: editor.c:686 pager.c:455 rui.c:1029 + #: ../library/grDevices/src/devWindows.c:1598 + msgid "Print..." +-msgstr "..." ++msgstr "..." + + #: editor.c:689 + msgid "Close script" +-msgstr "" ++msgstr "" + + #: editor.c:708 rui.c:1041 + msgid "Clear console" +-msgstr "" ++msgstr "" + + #: editor.c:712 + msgid "Run all" +-msgstr "" ++msgstr "" + + #: editor.c:715 + msgid "Find..." +-msgstr "..." ++msgstr "..." + + #: editor.c:717 + msgid "Replace..." +-msgstr "..." ++msgstr "..." + + #: editor.c:720 rui.c:1045 + msgid "GUI preferences..." +-msgstr "GUI..." ++msgstr "GUI..." + + #: editor.c:731 + msgid "Editor" +-msgstr "" ++msgstr "" + + #: editor.c:788 + msgid "Maximum number of editors reached" +-msgstr "" ++msgstr "" + + #: editor.c:793 + msgid "Unable to create editor window" +-msgstr "" ++msgstr "" + + #: editor.c:802 + msgid "Untitled" +-msgstr "" ++msgstr "" + + #: extra.c:804 preferences.c:790 graphapp/dialogs.c:505 graphapp/dialogs.c:600 + msgid "OK" +-msgstr "" ++msgstr "" + + #: extra.c:805 preferences.c:791 graphapp/dialogs.c:479 graphapp/dialogs.c:503 + #: graphapp/dialogs.c:509 graphapp/dialogs.c:584 graphapp/dialogs.c:598 + #: graphapp/dialogs.c:604 + msgid "Cancel" +-msgstr "" ++msgstr "" + + #: pager.c:78 + msgid "Error opening file" +-msgstr "" ++msgstr "" + + #: pager.c:85 + msgid "Insufficient memory to display file in internal pager" +-msgstr "" ++msgstr "" + + #: pager.c:164 pager.c:176 pager.c:196 rui.c:225 rui.c:252 + msgid "No selection" +-msgstr "" ++msgstr "" + + #: pager.c:291 pager.c:421 pager.c:465 + msgid "Paste to console" +-msgstr "" ++msgstr "" + + #: pager.c:292 pager.c:426 pager.c:467 + msgid "Paste commands to console" +-msgstr "" ++msgstr "" + + #: pager.c:457 rui.c:1030 + msgid "Save to File..." +-msgstr "..." ++msgstr "..." + + #: pager.c:472 + msgid "View" +-msgstr "" ++msgstr "" + + #: pager.c:501 + msgid "Unable to create pager window" +-msgstr "" ++msgstr "" + + #: preferences.c:243 + msgid "" +@@ -548,9 +548,9 @@ msgid "" + "\n" + "Save the preferences and restart Rgui to apply them.\n" + msgstr "" +-"\n" ++"\n" + "\n" +-"Rgui\n" ++"Rgui\n" + + #: preferences.c:247 + msgid "" +@@ -559,418 +559,417 @@ msgid "" + "\n" + "Save the preferences and restart Rgui to apply to menus.\n" + msgstr "" +-"\n" ++"\n" + "\n" +-"Rgui\n" ++"Rgui\n" + + #: preferences.c:316 + msgid "Changes in pager size will not apply to any open pagers" +-msgstr "" ++msgstr "" + + #: preferences.c:322 + msgid "" + "Do not change pager type if any pager is open\n" + "Proceed?" +-msgstr "" +-"\n" +-"" ++msgstr "\n" ++"" + + #: preferences.c:349 + msgid "Select directory for file 'Rconsole'" +-msgstr "Rconsole" ++msgstr "Rconsole" + + #: preferences.c:440 + msgid "Select 'Rconsole' file" +-msgstr "'Rconsole'" ++msgstr "'Rconsole'" + + #: preferences.c:635 + #, c-format + msgid "Error at line %d of file %s" +-msgstr "%2$s%1$d" ++msgstr "%2$s%1$d" + + #: preferences.c:678 + msgid "Rgui Configuration Editor" +-msgstr "Rgui" ++msgstr "Rgui" + + #: preferences.c:787 + msgid "Apply" +-msgstr "" ++msgstr "" + + #: preferences.c:789 + msgid "Load" +-msgstr "" ++msgstr "" + + #: rui.c:124 + msgid "Select file to source" +-msgstr "" ++msgstr "" + + #: rui.c:145 + msgid "Select image to load" +-msgstr "" ++msgstr "" + + #: rui.c:160 + msgid "Save image in" +-msgstr "" ++msgstr "" + + #: rui.c:175 + msgid "Load history from" +-msgstr "" ++msgstr "" + + #: rui.c:184 + msgid "Save history in" +-msgstr "" ++msgstr "" + + #: rui.c:234 rui.c:243 + msgid "No text available" +-msgstr "" ++msgstr "" + + #: rui.c:292 + msgid "Name of data frame or matrix" +-msgstr "" ++msgstr "" + + #: rui.c:299 + #, c-format + msgid "'%s' cannot be found" +-msgstr "'%s'" ++msgstr "'%s'" + + #: rui.c:365 + msgid "Are you sure?" +-msgstr "?" ++msgstr "?" + + #: rui.c:446 + msgid "Help on" +-msgstr "" ++msgstr "" + + #: rui.c:497 + msgid "Search help" +-msgstr "" ++msgstr "" + + #: rui.c:512 + msgid "Search for words in help list archives and documentation" +-msgstr "" ++msgstr "" + + #: rui.c:527 + msgid "Apropos" +-msgstr "" ++msgstr "" + + #: rui.c:771 + msgid "Can only drag-and-drop .R, .RData and .rda files" +-msgstr "-.R.RData.rda" ++msgstr "-.R.RData.rda" + + #: rui.c:777 rui.c:1037 + msgid "Paste commands only" +-msgstr "" ++msgstr "" + + #: rui.c:778 rui.c:986 + msgid "Copy and paste" +-msgstr "" ++msgstr "" + + #: rui.c:780 + msgid "Clear window" +-msgstr "" ++msgstr "" + + #: rui.c:784 rui.c:1054 + msgid "Buffered output" +-msgstr "" ++msgstr "" + + #: rui.c:824 + msgid "Packages" +-msgstr "" ++msgstr "" + + #: rui.c:825 + msgid "Load package..." +-msgstr "..." ++msgstr "..." + + #: rui.c:827 + msgid "Set CRAN mirror..." +-msgstr "CRAN..." ++msgstr "CRAN..." + + #: rui.c:829 + msgid "Select repositories..." +-msgstr "..." ++msgstr "..." + + #: rui.c:831 + msgid "Install package(s)..." +-msgstr "..." ++msgstr "..." + + #: rui.c:833 + msgid "Update packages..." +-msgstr "..." ++msgstr "..." + + #: rui.c:836 + msgid "Install package(s) from local zip files..." +-msgstr "zip..." ++msgstr "zip..." + + #: rui.c:864 + msgid "FAQ on R" +-msgstr "RFAQ" ++msgstr "RFAQ" + + #: rui.c:866 + msgid "FAQ on R for &Windows" +-msgstr "WindowsRFAQ" ++msgstr "WindowsRFAQ" + + #: rui.c:872 rui.c:875 + msgid "Manuals (in PDF)" +-msgstr "(PDF)" ++msgstr "(PDF)" + + #: rui.c:902 + msgid "R functions (text)..." +-msgstr "R()..." ++msgstr "R()..." + + #: rui.c:904 + msgid "Html help" +-msgstr "Html" ++msgstr "Html" + + #: rui.c:906 + msgid "Search help..." +-msgstr "..." ++msgstr "..." + + #: rui.c:911 + msgid "Apropos..." +-msgstr "..." ++msgstr "..." + + #: rui.c:913 + msgid "R Project home page" +-msgstr "R" ++msgstr "R" + + #: rui.c:914 + msgid "CRAN home page" +-msgstr "CRAN" ++msgstr "CRAN" + + #: rui.c:916 + msgid "About" +-msgstr "" ++msgstr "" + + #: rui.c:970 + msgid "Load image" +-msgstr "" ++msgstr "" + + #: rui.c:974 + msgid "Save image" +-msgstr "" ++msgstr "" + + #: rui.c:990 + msgid "Stop current computation" +-msgstr "" ++msgstr "" + + #: rui.c:1014 + msgid "Source R code..." +-msgstr "R..." ++msgstr "R..." + + #: rui.c:1017 + msgid "Display file(s)..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1019 + msgid "Load Workspace..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1020 + msgid "Save Workspace..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1022 + msgid "Load History..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1024 + msgid "Save History..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1027 + msgid "Change dir..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1032 + msgid "Exit" +-msgstr "" ++msgstr "" + + #: rui.c:1039 + msgid "Copy and Paste" +-msgstr "" ++msgstr "" + + #: rui.c:1043 + msgid "Data editor..." +-msgstr "..." ++msgstr "..." + + #: rui.c:1047 + msgid "Misc" +-msgstr "" ++msgstr "" + + #: rui.c:1048 + msgid "Stop current computation \tESC" +-msgstr " \tESC" ++msgstr " \tESC" + + #: rui.c:1050 + msgid "Stop all computations" +-msgstr "" ++msgstr "" + + #: rui.c:1052 + msgid "Break to debugger" +-msgstr "" ++msgstr "" + + #: rui.c:1056 + msgid "List objects" +-msgstr "" ++msgstr "" + + #: rui.c:1057 + msgid "Remove all objects" +-msgstr "" ++msgstr "" + + #: rui.c:1058 + msgid "List &search path" +-msgstr "" ++msgstr "" + + #: rui.c:1066 + msgid "Console" +-msgstr "" ++msgstr "" + + #: rui.c:1103 + msgid "Select file" +-msgstr "" ++msgstr "" + + #: rui.c:1146 + msgid "'mname' is limited to 1000 bytes" +-msgstr "'mname'1000" ++msgstr "'mname'1000" + + #: rui.c:1188 + #, c-format + msgid "menu %s does not exist" +-msgstr "%s" ++msgstr "%s" + + #: rui.c:1242 + msgid "'menu' is limited to 500 bytes" +-msgstr "'menu'500" ++msgstr "'menu'500" + + #: rui.c:1252 + msgid "base menu does not exist" +-msgstr "" ++msgstr "" + + #: rui.c:1267 + msgid "failed to allocate menu" +-msgstr "" ++msgstr "" + + #: rui.c:1283 rui.c:1404 + msgid "menu + item is limited to 1000 bytes" +-msgstr "?1000" ++msgstr "1000" + + #: rui.c:1291 rui.c:1373 + msgid "menu does not exist" +-msgstr "" ++msgstr "" + + #: rui.c:1309 rui.c:1332 rui.c:1337 + msgid "failed to allocate char storage" +-msgstr "" ++msgstr "" + + #: rui.c:1345 + msgid "failed to allocate menuitem" +-msgstr "" ++msgstr "" + + #: rui.c:1394 + msgid "menu not found" +-msgstr "" ++msgstr "" + + #: rui.c:1412 + msgid "menu or item does not exist" +-msgstr "" ++msgstr "" + + #: system.c:400 + msgid "Save workspace image?" +-msgstr "?" ++msgstr "?" + + #: graphapp/clipboard.c:70 graphapp/clipboard.c:74 + msgid "Insufficient memory: cell not copied to the clipboard" +-msgstr ": " ++msgstr ": " + + #: graphapp/dialogs.c:135 graphapp/dialogs.c:152 graphapp/dialogs.c:169 + msgid "Question" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:189 + msgid " Change working directory to:" +-msgstr " " ++msgstr " " + + #: graphapp/dialogs.c:192 + #, c-format + msgid "Unable to set '%s' as working directory" +-msgstr "'%s'" ++msgstr "'%s'" + + #: graphapp/dialogs.c:400 + msgid "Choose a folder" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:492 graphapp/dialogs.c:494 + msgid "Browse" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:592 + msgid "User" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:593 + msgid "Password" +-msgstr "" ++msgstr "" + + #: graphapp/dialogs.c:754 graphapp/dialogs.c:760 + #, c-format + msgid "\"%s\" not found" +-msgstr "\"%s\"" ++msgstr "\"%s\"" + + #: graphapp/gmenus.c:48 + msgid "Windows" +-msgstr "" ++msgstr "" + + #: graphapp/gmenus.c:49 + msgid "Cascade" +-msgstr "" ++msgstr "" + + #: graphapp/gmenus.c:50 + msgid "Tile" +-msgstr "" ++msgstr "" + + #: graphapp/gmenus.c:51 + msgid "Arrange Icons" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:848 + msgid "Png files (*.png)" +-msgstr "Png(*.png)" ++msgstr "Png(*.png)" + + #: ../library/grDevices/src/devWindows.c:849 + msgid "Portable network graphics file" +-msgstr "Portable network graphics" ++msgstr "Portable network graphics" + + #: ../library/grDevices/src/devWindows.c:851 + msgid "Windows bitmap files (*.bmp)" +-msgstr "Windows bitmap(*.bmp)" ++msgstr "Windows bitmap(*.bmp)" + + #: ../library/grDevices/src/devWindows.c:852 + msgid "Windows bitmap file" +-msgstr "Windows bitmap" ++msgstr "Windows bitmap" + + #: ../library/grDevices/src/devWindows.c:854 + msgid "Jpeg files (*.jpeg,*jpg)" +-msgstr "Jpeg(*.jpeg,*jpg)" ++msgstr "Jpeg(*.jpeg,*jpg)" + + #: ../library/grDevices/src/devWindows.c:855 + msgid "Jpeg file" +-msgstr "Jpeg" ++msgstr "Jpeg" + + #: ../library/grDevices/src/devWindows.c:875 + msgid "Postscript files (*.ps)" +-msgstr "Postscript(*.ps)" ++msgstr "Postscript(*.ps)" + + #: ../library/grDevices/src/devWindows.c:876 + msgid "Postscript file" +-msgstr "Postscript" ++msgstr "Postscript" + + #: ../library/grDevices/src/devWindows.c:887 + msgid "PDF files (*.pdf)" +-msgstr "PDF(*.pdf)" ++msgstr "PDF(*.pdf)" + + #: ../library/grDevices/src/devWindows.c:888 + msgid "PDF file" +-msgstr "PDF" ++msgstr "PDF" + + #: ../library/grDevices/src/devWindows.c:899 + msgid "Enhanced metafiles (*.emf)" +@@ -983,53 +982,53 @@ msgstr "Enhanced metafiles" + #: ../library/grDevices/src/devWindows.c:903 + #: ../library/grDevices/src/devWindows.c:2721 + msgid "file path selected is too long: only 512 bytes are allowed" +-msgstr "512" ++msgstr "512" + + #: ../library/grDevices/src/devWindows.c:1119 + msgid "No plot to replace!" +-msgstr "!" ++msgstr "!" + + #: ../library/grDevices/src/devWindows.c:1165 + msgid "Variable name" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1172 + msgid "Variable doesn't exist or doesn't contain any plots!" +-msgstr "!" ++msgstr "!" + + #: ../library/grDevices/src/devWindows.c:1188 + msgid "Name of variable to save to" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1496 + msgid "Copy to the clipboard as a metafile" +-msgstr "metafile" ++msgstr "metafile" + + #: ../library/grDevices/src/devWindows.c:1514 + #: ../library/grDevices/src/devWindows.c:1525 + msgid "Stop locator" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1524 + #: ../library/grDevices/src/devWindows.c:1528 + msgid "Stop" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1530 + msgid "Continue" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1534 + msgid "Next" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1535 + msgid "Next plot" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1541 + msgid "Save as" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1542 + msgid "Metafile..." +@@ -1057,115 +1056,116 @@ msgstr "Jpeg" + + #: ../library/grDevices/src/devWindows.c:1548 + msgid "50% quality..." +-msgstr "50% ..." ++msgstr "50% ..." + + #: ../library/grDevices/src/devWindows.c:1549 + msgid "75% quality..." +-msgstr "75% ..." ++msgstr "75% ..." + + #: ../library/grDevices/src/devWindows.c:1550 + msgid "100% quality..." +-msgstr "100% ..." ++msgstr "100% ..." + + #: ../library/grDevices/src/devWindows.c:1551 + msgid "Copy to the clipboard" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1552 + msgid "as a Bitmap\tCTRL+C" +-msgstr "Bitmap\tCTRL+C" ++msgstr "Bitmap\tCTRL+C" + + #: ../library/grDevices/src/devWindows.c:1553 + msgid "as a Metafile\tCTRL+W" +-msgstr "Metafile\tCTRL+W" ++msgstr "Metafile\tCTRL+W" + + #: ../library/grDevices/src/devWindows.c:1556 + msgid "Print...\tCTRL+P" +-msgstr "...\tCTRL+P" ++msgstr "...\tCTRL+P" + + #: ../library/grDevices/src/devWindows.c:1558 + msgid "close Device" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1559 + msgid "History" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1560 + msgid "Recording" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1563 + msgid "Add\tINS" +-msgstr "\tINS" ++msgstr "\tINS" + + #: ../library/grDevices/src/devWindows.c:1564 + msgid "Replace" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1566 + msgid "Previous\tPgUp" +-msgstr "\tPgUp" ++msgstr "\tPgUp" + + #: ../library/grDevices/src/devWindows.c:1567 + msgid "Next\tPgDown" +-msgstr "\tPgDown" ++msgstr "\tPgDown" + + #: ../library/grDevices/src/devWindows.c:1569 + msgid "Save to variable..." +-msgstr "..." ++msgstr "..." + + #: ../library/grDevices/src/devWindows.c:1570 + msgid "Get from variable..." +-msgstr "..." ++msgstr "..." + + #: ../library/grDevices/src/devWindows.c:1572 + msgid "Clear history" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1573 + msgid "Resize" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1574 + msgid "R mode" +-msgstr "R" ++msgstr "R" + + #: ../library/grDevices/src/devWindows.c:1576 + msgid "Fit to window" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1578 + msgid "Fixed size" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:1585 + msgid "Copy as metafile" +-msgstr "metafile" ++msgstr "metafile" + + #: ../library/grDevices/src/devWindows.c:1587 + msgid "Copy as bitmap" +-msgstr "bitmap" ++msgstr "bitmap" + + #: ../library/grDevices/src/devWindows.c:1590 + msgid "Save as metafile..." +-msgstr "metafile..." ++msgstr "metafile..." + + #: ../library/grDevices/src/devWindows.c:1592 + msgid "Save as postscript..." +-msgstr "postscript..." ++msgstr "postscript..." + + #: ../library/grDevices/src/devWindows.c:2456 + msgid "Locator is active" +-msgstr "" ++msgstr "" + + #: ../library/grDevices/src/devWindows.c:3032 + msgid "Waiting to confirm page change..." +-msgstr "..." ++msgstr "..." + + #: ../library/grDevices/src/devWindows.c:3044 + msgid "Click or hit ENTER for next page" +-msgstr "ENTER" ++msgstr "ENTER" + + #~ msgid "Select working directory" +-#~ msgstr "" ++#~ msgstr "" ++ +diff -urp R-2.4.0.old/po/R.pot R-2.4.0/po/R.pot +--- R-2.4.0.old/po/R.pot 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/R.pot 2006-10-28 14:36:11.000000000 -0500 +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" + "Language-Team: LANGUAGE <LL(a)li.org>\n" +@@ -83,7 +83,7 @@ msgstr "" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -128,7 +128,7 @@ msgstr "" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -472,7 +472,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1134,7 +1134,7 @@ msgstr "" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "" + +@@ -1267,156 +1267,156 @@ msgstr "" + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "" + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr "" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "" + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "" + +@@ -5407,7 +5407,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6017,7 +6017,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6053,19 +6053,19 @@ msgstr "" + msgid "only 0's may be mixed with negative subscripts" + msgstr "" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/ru.gmo and R-2.4.0/po/ru.gmo differ +diff -urp R-2.4.0.old/po/ru.po R-2.4.0/po/ru.po +--- R-2.4.0.old/po/ru.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/ru.po 2006-10-28 14:36:09.000000000 -0500 +@@ -10,7 +10,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.4.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-09-25 03:23-0800\n" + "Last-Translator: Alexey Shipunov <iit512(a)yandex.ru>\n" + "Language-Team: Russian\n" +@@ -87,7 +87,7 @@ msgstr " 'names' R_unlink" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -132,7 +132,7 @@ msgstr " 'names' R_unlink" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -478,7 +478,7 @@ msgid "second argument must be a list" + msgstr " " + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr " " + +@@ -1154,7 +1154,7 @@ msgstr " + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr " NULL " + +@@ -1287,113 +1287,113 @@ msgstr " + msgid "the first argument must be a character vector" + msgstr " " + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "'abbreviate' -ASCII " + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "- " + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr " 'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr " %d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr " " + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr " '%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr " %d " + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr " %d " + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr " 'pattern' " + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr " 'replacement' " + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr " " + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "- tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr " ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr " ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr " (NA) ." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr " 'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr " 'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' 'new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr " %d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "" + " agrep() UTF-8 ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr " " + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr " , " + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr " a " + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" +@@ -1401,45 +1401,45 @@ msgstr "" + " \n" + " , , " + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr " 'x' " + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr " 'multiple' TRUE FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr " 'shift' " + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr " 'x' , " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr " '' " + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr " 'x' %d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr " 'x' NA" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() " + +@@ -5494,7 +5494,7 @@ msgstr " " + msgid "no input is available" + msgstr " " + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6123,7 +6123,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] (%d) " + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr " " + +@@ -6159,19 +6159,19 @@ msgstr "(subscript) + msgid "only 0's may be mixed with negative subscripts" + msgstr " " + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr " 'CHARSXP'" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr " 'dimnames'" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr " " + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr " -" + +Binary files R-2.4.0.old/po/zh_CN.gmo and R-2.4.0/po/zh_CN.gmo differ +diff -urp R-2.4.0.old/po/zh_CN.po R-2.4.0/po/zh_CN.po +--- R-2.4.0.old/po/zh_CN.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/zh_CN.po 2006-10-28 14:36:12.000000000 -0500 +@@ -7,7 +7,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.1.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2005-05-20 18:26+0800\n" + "Last-Translator: ronggui\n" + "Language-Team: Chinese\n" +@@ -82,7 +82,7 @@ msgstr "'R_unlink''names" + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -127,7 +127,7 @@ msgstr "'R_unlink''names" + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -471,7 +471,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1135,7 +1135,7 @@ msgstr "size" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "NULL" + +@@ -1268,156 +1268,156 @@ msgstr "split'%s'" + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviateASCII" + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "'allow_'" + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr "%d" + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "%s'" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr "%d" + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr "%d" + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern'" + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement'" + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "0" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr "tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr "('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr "('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "(NA)." + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr "'old'" + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr "'new'" + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old''new'" + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr "%d" + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr "UTF-8agrep()ASCII" + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr "1" + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr "1" + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr "'x'" + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr "'multiple'TRUEFALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr "'shift'" + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr "'x'" + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr "'x', " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "type" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr "'x'%d" + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr "'x'NA" + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr "'x'" + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim()" + +@@ -5417,7 +5417,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6039,7 +6039,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] (%d)" + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6075,19 +6075,19 @@ msgstr "()" + msgid "only 0's may be mixed with negative subscripts" + msgstr "0" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr "CHARSXP" + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr "'dimnames'" + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +Binary files R-2.4.0.old/po/zh_TW.gmo and R-2.4.0/po/zh_TW.gmo differ +diff -urp R-2.4.0.old/po/zh_TW.po R-2.4.0/po/zh_TW.po +--- R-2.4.0.old/po/zh_TW.po 2006-09-26 21:05:18.000000000 -0500 ++++ R-2.4.0/po/zh_TW.po 2006-10-28 14:36:12.000000000 -0500 +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: R 2.3.0\n" + "Report-Msgid-Bugs-To: bugs(a)R-project.org\n" +-"POT-Creation-Date: 2006-09-26 14:32+0100\n" ++"POT-Creation-Date: 2006-10-24 15:53+0100\n" + "PO-Revision-Date: 2006-04-14 22:49+0800\n" + "Last-Translator: Wei-Lun Chao <chaoweilun(a)pcmail.com.tw>\n" + "Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" +@@ -84,7 +84,7 @@ msgstr "R_unlink 'names' " + #: src/gnuwin32/extra.c:758 src/gnuwin32/extra.c:761 src/gnuwin32/extra.c:766 + #: src/main/builtin.c:127 src/main/builtin.c:385 src/main/builtin.c:401 + #: src/main/character.c:116 src/main/character.c:119 src/main/character.c:158 +-#: src/main/character.c:2432 src/main/character.c:2436 ++#: src/main/character.c:2434 src/main/character.c:2438 + #: src/main/connections.c:822 src/main/connections.c:828 + #: src/main/connections.c:831 src/main/connections.c:835 + #: src/main/connections.c:958 src/main/connections.c:964 +@@ -129,7 +129,7 @@ msgstr "R_unlink 'names' " + #: src/main/print.c:176 src/main/print.c:182 src/main/print.c:204 + #: src/main/print.c:210 src/main/random.c:465 src/main/random.c:469 + #: src/main/random.c:471 src/main/random.c:473 src/main/saveload.c:2076 +-#: src/main/saveload.c:2341 src/main/saveload.c:2390 src/main/seq.c:346 ++#: src/main/saveload.c:2341 src/main/saveload.c:2391 src/main/seq.c:346 + #: src/main/seq.c:350 src/main/seq.c:368 src/main/seq.c:375 + #: src/main/sysutils.c:396 src/main/sysutils.c:398 src/main/sysutils.c:400 + #: src/main/unique.c:576 src/main/util.c:527 src/main/util.c:530 +@@ -476,7 +476,7 @@ msgid "second argument must be a list" + msgstr "" + + #: src/include/Errormsg.h:42 src/main/eval.c:2715 src/main/subscript.c:228 +-#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:436 ++#: src/main/subscript.c:333 src/main/subscript.c:336 src/main/subscript.c:437 + msgid "subscript out of bounds" + msgstr "" + +@@ -1142,7 +1142,7 @@ msgstr "" + #: src/main/envir.c:2729 src/main/envir.c:2763 src/main/envir.c:2783 + #: src/main/envir.c:3107 src/main/envir.c:3111 src/main/eval.c:3498 + #: src/main/objects.c:175 src/main/objects.c:181 src/main/saveload.c:2072 +-#: src/main/saveload.c:2338 src/main/saveload.c:2387 src/main/serialize.c:2175 ++#: src/main/saveload.c:2338 src/main/saveload.c:2388 src/main/serialize.c:2175 + msgid "use of NULL environment is defunct" + msgstr "NULL " + +@@ -1276,156 +1276,156 @@ msgstr "split '%s' " + msgid "the first argument must be a character vector" + msgstr "" + +-#: src/main/character.c:725 ++#: src/main/character.c:727 + msgid "abbreviate used with non-ASCII chars" + msgstr "abbreviate ASCII " + +-#: src/main/character.c:743 ++#: src/main/character.c:745 + msgid "non-character names" + msgstr "" + +-#: src/main/character.c:747 ++#: src/main/character.c:749 + msgid "invalid value of 'allow_'" + msgstr "'allow_' " + +-#: src/main/character.c:808 src/main/character.c:1586 ++#: src/main/character.c:810 src/main/character.c:1588 + #, c-format + msgid "invalid multibyte string %d" + msgstr " %d " + +-#: src/main/character.c:889 src/main/character.c:1221 +-#: src/main/character.c:1510 src/main/pcre.c:110 src/main/pcre.c:487 ++#: src/main/character.c:891 src/main/character.c:1223 ++#: src/main/character.c:1512 src/main/pcre.c:110 src/main/pcre.c:487 + #: src/main/pcre.c:582 + msgid "regular expression is invalid in this locale" + msgstr "" + +-#: src/main/character.c:911 src/main/character.c:1063 +-#: src/main/character.c:1224 src/main/character.c:1513 src/main/pcre.c:117 ++#: src/main/character.c:913 src/main/character.c:1065 ++#: src/main/character.c:1226 src/main/character.c:1515 src/main/pcre.c:117 + #: src/main/pcre.c:332 src/main/pcre.c:492 src/main/pcre.c:587 + #, c-format + msgid "invalid regular expression '%s'" + msgstr "%s" + +-#: src/main/character.c:921 src/main/character.c:1239 +-#: src/main/character.c:1530 src/main/pcre.c:132 src/main/pcre.c:365 ++#: src/main/character.c:923 src/main/character.c:1241 ++#: src/main/character.c:1532 src/main/pcre.c:132 src/main/pcre.c:365 + #: src/main/pcre.c:507 src/main/pcre.c:610 + #, c-format + msgid "input string %d is invalid in this locale" + msgstr " %d " + +-#: src/main/character.c:976 src/main/pcre.c:187 ++#: src/main/character.c:978 src/main/pcre.c:187 + #, c-format + msgid "invalid backreference %d in regular expression" + msgstr " %d " + +-#: src/main/character.c:1058 src/main/pcre.c:319 ++#: src/main/character.c:1060 src/main/pcre.c:319 + msgid "'pattern' is invalid in this locale" + msgstr "'pattern' " + +-#: src/main/character.c:1060 src/main/pcre.c:321 ++#: src/main/character.c:1062 src/main/pcre.c:321 + msgid "'replacement' is invalid in this locale" + msgstr "'replacement' " + +-#: src/main/character.c:1069 ++#: src/main/character.c:1071 + msgid "zero-length pattern" + msgstr "" + +-#: src/main/character.c:1561 ++#: src/main/character.c:1563 + msgid "non-character argument to tolower()" + msgstr " tolower()" + +-#: src/main/character.c:1639 ++#: src/main/character.c:1641 + #, c-format + msgid "decreasing range specification ('%lc-%lc')" + msgstr " ('%lc-%lc')" + +-#: src/main/character.c:1725 ++#: src/main/character.c:1727 + #, c-format + msgid "decreasing range specification ('%c-%c')" + msgstr " ('%c-%c')" + +-#: src/main/character.c:1802 ++#: src/main/character.c:1804 + msgid "invalid (NA) arguments." + msgstr "(NA) " + +-#: src/main/character.c:1824 ++#: src/main/character.c:1826 + msgid "invalid multibyte string 'old'" + msgstr " 'old' " + +-#: src/main/character.c:1831 ++#: src/main/character.c:1833 + msgid "invalid multibyte string 'new'" + msgstr " 'new' " + +-#: src/main/character.c:1850 src/main/character.c:1912 ++#: src/main/character.c:1852 src/main/character.c:1914 + msgid "'old' is longer than 'new'" + msgstr "'old' 'new' " + +-#: src/main/character.c:1868 ++#: src/main/character.c:1870 + #, c-format + msgid "invalid input multibyte string %d" + msgstr " %d " + +-#: src/main/character.c:2013 ++#: src/main/character.c:2015 + msgid "use of agrep() in a UTF-8 locale may only work for ASCII strings" + msgstr " UTF-8 agrep() ASCII " + +-#: src/main/character.c:2022 ++#: src/main/character.c:2024 + msgid "could not allocate memory for approximate matching" + msgstr "" + +-#: src/main/character.c:2046 ++#: src/main/character.c:2048 + msgid "could not perform case insensitive matching" + msgstr "" + +-#: src/main/character.c:2098 src/main/character.c:2333 ++#: src/main/character.c:2100 src/main/character.c:2335 + msgid "argument must be a character vector of length 1" + msgstr " 1 " + +-#: src/main/character.c:2100 src/main/character.c:2335 ++#: src/main/character.c:2102 src/main/character.c:2337 + msgid "" + "argument should be a character vector of length 1\n" + "all but the first element will be ignored" + msgstr " 1 " + +-#: src/main/character.c:2116 src/main/character.c:2148 +-#: src/main/character.c:2169 ++#: src/main/character.c:2118 src/main/character.c:2150 ++#: src/main/character.c:2171 + msgid "argument 'x' must be a raw vector" + msgstr " 'x' " + +-#: src/main/character.c:2119 src/main/character.c:2385 ++#: src/main/character.c:2121 src/main/character.c:2387 + msgid "argument 'multiple' must be TRUE or FALSE" + msgstr " 'multiple' TRUE FALSE" + +-#: src/main/character.c:2150 ++#: src/main/character.c:2152 + msgid "argument 'shift' must be a small integer" + msgstr " 'shift' " + +-#: src/main/character.c:2187 ++#: src/main/character.c:2189 + msgid "argument 'x' must be a integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2207 ++#: src/main/character.c:2209 + msgid "argument 'x' must be raw, integer or logical" + msgstr " 'x' " + +-#: src/main/character.c:2209 ++#: src/main/character.c:2211 + msgid "argument 'type' must be a character string" + msgstr "type" + +-#: src/main/character.c:2213 ++#: src/main/character.c:2215 + #, c-format + msgid "argument 'x' must be a multiple of %d long" + msgstr " 'x' %d " + +-#: src/main/character.c:2227 src/main/character.c:2242 ++#: src/main/character.c:2229 src/main/character.c:2244 + msgid "argument 'x' must not contain NAs" + msgstr " 'x' NA " + +-#: src/main/character.c:2382 ++#: src/main/character.c:2384 + msgid "argument 'x' must be an integer vector" + msgstr " 'x' " + +-#: src/main/character.c:2427 ++#: src/main/character.c:2429 + msgid "strtrim() requires a character vector" + msgstr "strtrim() " + +@@ -5442,7 +5442,7 @@ msgstr "" + msgid "no input is available" + msgstr "" + +-#: src/main/saveload.c:2365 ++#: src/main/saveload.c:2366 + msgid "" + "the input does not start with a magic number compatible with loading from a " + "connection" +@@ -6073,7 +6073,7 @@ msgid "[[ ]] subscript (%d) out of bound + msgstr "[[ ]] (%d) " + + #: src/main/subassign.c:1769 src/main/subscript.c:111 src/main/subscript.c:188 +-#: src/main/subscript.c:588 src/main/subset.c:923 ++#: src/main/subscript.c:589 src/main/subset.c:923 + msgid "invalid subscript type" + msgstr "" + +@@ -6109,19 +6109,19 @@ msgstr "() " + msgid "only 0's may be mixed with negative subscripts" + msgstr " 0" + +-#: src/main/subscript.c:410 ++#: src/main/subscript.c:411 + msgid "character vector element does not have type CHARSXP" + msgstr " CHARSXP " + +-#: src/main/subscript.c:487 ++#: src/main/subscript.c:488 + msgid "no 'dimnames' attribute for array" + msgstr " 'dimnames' " + +-#: src/main/subscript.c:494 ++#: src/main/subscript.c:495 + msgid "invalid subscript" + msgstr "" + +-#: src/main/subscript.c:527 ++#: src/main/subscript.c:528 + msgid "subscripting on non-vector" + msgstr "" + +diff -urp R-2.4.0.old/share/make/tests.mk R-2.4.0/share/make/tests.mk +--- R-2.4.0.old/share/make/tests.mk 2006-04-09 17:20:04.000000000 -0500 ++++ R-2.4.0/share/make/tests.mk 2006-10-03 19:41:11.000000000 -0500 +@@ -1,6 +1,6 @@ + ## ${R_HOME}/share/make/tests.mk + +-include $(R_HOME)/etc/Makeconf ++include $(R_HOME)/etc${R_ARCH}/Makeconf + + makevars = + srcdir = . +diff -urp R-2.4.0.old/src/appl/lowess.c R-2.4.0/src/appl/lowess.c +--- R-2.4.0.old/src/appl/lowess.c 2006-04-09 17:19:58.000000000 -0500 ++++ R-2.4.0/src/appl/lowess.c 2006-10-28 14:35:58.000000000 -0500 +@@ -1,7 +1,7 @@ + /* + * R : A Computer Langage for Statistical Data Analysis + * Copyright (C) 1996 Robert Gentleman and Ross Ihaka +- * Copyright (C) 1999-2002 Robert Gentleman, Ross Ihaka and the ++ * Copyright (C) 1999-2006 Robert Gentleman, Ross Ihaka and the + * R Development Core Team + * + * This program is free software; you can redistribute it and/or modify +@@ -132,7 +132,7 @@ void clowess(double *x, double *y, int n + { + int i, iter, j, last, m1, m2, nleft, nright, ns; + Rboolean ok; +- double alpha, c1, c9, cmad, cut, d1, d2, denom, r; ++ double alpha, c1, c9, cmad, cut, d1, d2, denom, r, sc; + + if (n < 2) { + ys[0] = y[0]; return; +@@ -223,9 +223,14 @@ void clowess(double *x, double *y, int n + break; + } + /* residuals */ +- for(i=0; i < n; i++) ++ for(i = 0; i < n; i++) + res[i] = y[i+1] - ys[i+1]; + ++ /* overall scale estimate */ ++ sc = 0.; ++ for(i = 0; i < n; i++) sc += fabs(res[i]); ++ sc /= n; ++ + /* compute robustness weights */ + /* except last time */ + +@@ -234,7 +239,7 @@ void clowess(double *x, double *y, int n + /* Note: The following code, biweight_{6 MAD|Ri|} + is also used in stl(), loess and several other places. + --> should provide API here (MM) */ +- for(i=0 ; i<n ; i++) ++ for(i = 0 ; i < n ; i++) + rw[i] = fabs(res[i]); + + /* Compute cmad := 6 * median(rw[], n) ---- */ +@@ -253,9 +258,11 @@ void clowess(double *x, double *y, int n + #ifdef DEBUG_lowess + REprintf(" cmad = %12g\n", cmad); + #endif ++ if(cmad < 1e-7 * sc) /* effectively zero */ ++ break; + c9 = 0.999*cmad; + c1 = 0.001*cmad; +- for(i=0 ; i<n ; i++) { ++ for(i = 0 ; i < n ; i++) { + r = fabs(res[i]); + if (r <= c1) + rw[i] = 1.; +diff -urp R-2.4.0.old/src/gnuwin32/CHANGES R-2.4.0/src/gnuwin32/CHANGES +--- R-2.4.0.old/src/gnuwin32/CHANGES 2006-09-26 21:05:12.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/CHANGES 2006-11-02 10:45:46.000000000 -0600 +@@ -4,6 +4,30 @@ + See the file NEWS for changes that affect all versions of R. + + ++R 2.4.0 patched ++=============== ++ ++Inno Setup >= 5.1.7 is now required to build the installer. ++ ++Reverted 2.4.0 change that required case-sensitive specification of ++commands to R CMD. ++ ++The Simplified Chinese messages were in the wrong format, causing ++R to crash on startup. (PR#9277) ++ ++The pointsize of fonts in the windows() graphics device may now be set to ++any positive integer. ++ ++Building customized installers failed because the startup options ++weren't being handled properly. ++ ++If Rconsole settings were such that R could not start properly, it ++crashed. It now suggests starting with the --vanilla option, which now ++does not load Rconsole. Additionally, an option --no-Rconsole has ++been added for completeness and debugging. ++ ++ ++ + R 2.4.0 + ======= + +@@ -15,7 +39,7 @@ file and (for future sessions) from the + + The installer can set defaults for MDI/SDI display, help style, and + use of the --internet2 startup option. Custom builds of R can change +-these defaults. ++these defaults. The standard build now defaults to CHM help. + + If CHM help is selected, but is not present (e.g. a package was cross- + compiled on Unix), the help system defaults to text help. +diff -urp R-2.4.0.old/src/gnuwin32/fixed/bin/INSTALL R-2.4.0/src/gnuwin32/fixed/bin/INSTALL +--- R-2.4.0.old/src/gnuwin32/fixed/bin/INSTALL 2006-09-04 09:41:36.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/fixed/bin/INSTALL 2006-10-28 14:35:59.000000000 -0500 +@@ -26,7 +26,7 @@ use R::Dcf; + use R::Utils; + + +-my $revision = ' $Rev: 37712 $ '; ++my $revision = ' $Rev: 39671 $ '; + my $version; + my $name; + $revision =~ / ([\d\.]*) /; +@@ -250,7 +250,11 @@ foreach $pkg (@ARGV){ + if (open pkgdescin, "< $pkg/$ppkg/DESCRIPTION.in") { + ## the Unix version of INSTALL does discard blank lines, + ## although ?read.dcf does not allow them. +- while(<pkgdescin>) { print pkgdesc $_ if $_ =~ /\S/; } ++ while(<pkgdescin>) { ++ ## this is to cope with possibly missing final NL ++ chomp; ++ print pkgdesc "$_\n" if $_ =~ /\S/; ++ } + close pkgdescin; + } else { + print "no DESCRIPTION.in found for package $ppkg\n"; +Only in R-2.4.0.old/src/gnuwin32/fixed: dobundle.pl +diff -urp R-2.4.0.old/src/gnuwin32/front-ends/rcmdfn.c R-2.4.0/src/gnuwin32/front-ends/rcmdfn.c +--- R-2.4.0.old/src/gnuwin32/front-ends/rcmdfn.c 2006-09-07 21:05:22.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/front-ends/rcmdfn.c 2006-10-28 14:35:59.000000000 -0500 +@@ -291,20 +291,6 @@ int rcmdfn (int cmdarg, int argc, char * + } else if (!strcmp(".bat", p + strlen(p) - 4)) strcpy(cmd, ""); + else if (!strcmp(".exe", p + strlen(p) - 4)) strcpy(cmd, ""); + else { +- WIN32_FIND_DATA find_data; +- HANDLE fh; +- char tmp[MAX_PATH]; +- strcpy(tmp, RHome); strcat(tmp, "/bin/"); strcat(tmp, p); +- fh = FindFirstFile(tmp, &find_data); +- if (fh == INVALID_HANDLE_VALUE) { +- fprintf(stderr, "no Perl script '%s'\n", p); +- return(28); +- } +- if(strcmp(p, find_data.cFileName)) { +- fprintf(stderr, "no Perl script '%s'\n", p); +- return(28); +- } +- FindClose(fh); + strcpy(cmd, "perl "); + strcat(cmd, RHome); strcat(cmd, "/bin/"); + } +diff -urp R-2.4.0.old/src/gnuwin32/front-ends/rgui.c R-2.4.0/src/gnuwin32/front-ends/rgui.c +--- R-2.4.0.old/src/gnuwin32/front-ends/rgui.c 2006-09-04 09:41:35.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/front-ends/rgui.c 2006-10-29 10:45:44.000000000 -0600 +@@ -29,6 +29,7 @@ extern void cmdlineoptions(int, char **) + extern int setupui(void); + extern void Rf_mainloop(void); + __declspec(dllimport) extern UImode CharacterMode; ++extern void GA_exitapp(void); + + extern char *getDLLVersion(); + +@@ -48,7 +49,11 @@ int AppMain (int argc, char **argv) + exit(1); + } + cmdlineoptions(argc, argv); +- setupui(); ++ if (!setupui()) { ++ MessageBox(0, "Error setting up console. Try --vanilla option.", ++ "Terminating", MB_TASKMODAL | MB_ICONSTOP | MB_OK); ++ GA_exitapp(); ++ } + Rf_mainloop(); + /* NOTREACHED */ + return 0; +diff -urp R-2.4.0.old/src/gnuwin32/installer/JRins.pl R-2.4.0/src/gnuwin32/installer/JRins.pl +--- R-2.4.0.old/src/gnuwin32/installer/JRins.pl 2006-09-21 21:05:08.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/installer/JRins.pl 2006-10-03 19:41:11.000000000 -0500 +@@ -78,6 +78,7 @@ Name: br; MessagesFile: "compiler:Langua + Name: ca; MessagesFile: "compiler:Languages\\Catalan.isl" + Name: cz; MessagesFile: "compiler:Languages\\Czech.isl" + Name: dk; MessagesFile: "compiler:Languages\\Danish.isl" ++Name: es; MessagesFile: "compiler:Languages\\Spanish.isl" + Name: nl; MessagesFile: "compiler:Languages\\Dutch.isl" + Name: fr; MessagesFile: "compiler:Languages\\French.isl" + Name: fi; MessagesFile: "compiler:Languages\\Finnish.isl" +@@ -93,7 +94,6 @@ Name: chs; MessagesFile: "ChineseSimp.is + Name: cht; MessagesFile: "ChineseTrad.isl" + Name: ja; MessagesFile: "Japanese.isl" + Name: ko; MessagesFile: "Korean.isl" +-Name: es; MessagesFile: "SpanishStd.isl" + + #include "CustomMsg.txt" + +diff -urp R-2.4.0.old/src/gnuwin32/installer/Makefile R-2.4.0/src/gnuwin32/installer/Makefile +--- R-2.4.0.old/src/gnuwin32/installer/Makefile 2006-09-04 09:41:38.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/installer/Makefile 2006-10-28 14:35:59.000000000 -0500 +@@ -79,12 +79,11 @@ endif + # + # files to make source packages + $(MKDIR) -p $(RPREFIX)/share \ +- $(RPREFIX)/src/library $(RPREFIX)/src/gnuwin32/fixed ++ $(RPREFIX)/src/library $(RPREFIX)/src/gnuwin32 + $(CP) $(R_HOME)/doc/html/logo.jpg $(RPREFIX)/doc/html + $(CP) $(R_HOME)/doc/KEYWORDS* $(RPREFIX)/doc + $(CP) -p $(foreach i,$(GW32_FILES),../$i) $(RPREFIX)/src/gnuwin32 + $(SED) -e s/@RVER@/$(RVER)/g ../Makefile.packages > $(RPREFIX)/src/gnuwin32/Makefile +- $(CP) ../fixed/dobundle.pl $(RPREFIX)/src/gnuwin32/fixed + $(CP) -pr ../help ../check $(RPREFIX)/src/gnuwin32 + $(RM) $(RPREFIX)/src/gnuwin32/help/*.c \ + $(RPREFIX)/src/gnuwin32/help/MkChmDll +@@ -155,5 +154,5 @@ myR: + @(cd $(IMAGEDIR); echo "tools:::.installMD5sums(\".\")" | \ + R_DEFAULT_PACKAGES=NULL LC_COLLATE=C R_OSTYPE=windows \ + bin/Rterm.exe --vanilla --slave) +- perl JRins.pl $(RPREFIX) $(IMAGEDIR) ++ perl JRins.pl $(RPREFIX) $(IMAGEDIR) $(MDISDI) $(HelpStyle) $(Internet) + "$(ISDIR)/iscc" R.iss > myR.log +Only in R-2.4.0.old/src/gnuwin32/installer: SpanishStd.isl +diff -urp R-2.4.0.old/src/gnuwin32/Makefile R-2.4.0/src/gnuwin32/Makefile +--- R-2.4.0.old/src/gnuwin32/Makefile 2006-09-06 21:05:05.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/Makefile 2006-10-28 14:36:00.000000000 -0500 +@@ -421,9 +421,10 @@ distclean: clean clean-recommended + $(RM) ../../doc/html/search/index.txt ../../doc/html/index.html \ + ../../doc/html/packages.html ../../doc/html/rwin.html \ + ../../doc/html/rw-FAQ.html ../../doc/html/search/SearchEngine.html +- $(RM) ../../etc/Rconsole ../../etc/Rdevga ../../etc/Rprofile.site \ +- ../../etc/rgb.txt ../../share/make/wintests.mk \ +- ../include/Platform.h ../../tests/*.Rout ../../tests/*.Rout.fail ++ $(RM) ../../etc/Makeconf ../../etc/Rconsole ../../etc/Rdevga \ ++ ../../etc/Rprofile.site ../../etc/rgb.txt \ ++ ../../share/make/wintests.mk \ ++ ../../tests/*.Rout ../../tests/*.Rout.fail + $(MAKE) -C fixed distclean + $(MAKE) -C ../include -f Makefile.win distclean + -$(MAKE) -C installer distclean +diff -urp R-2.4.0.old/src/gnuwin32/preferences.c R-2.4.0/src/gnuwin32/preferences.c +--- R-2.4.0.old/src/gnuwin32/preferences.c 2006-09-16 21:05:15.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/preferences.c 2006-10-29 10:45:44.000000000 -0600 +@@ -785,8 +785,8 @@ static void showDialog(Gui gui) + setlistitem(highlightcol, rgbtonum(gui->hlt)); + + bApply = newbutton(G_("Apply"), rect(50, 410, 70, 25), apply); +- bSave = newbutton(G_("Save"), rect(130, 410, 70, 25), save); +- bLoad = newbutton(G_("Load"), rect(210, 410, 70, 25), load); ++ bSave = newbutton(G_("Save..."), rect(130, 410, 70, 25), save); ++ bLoad = newbutton(G_("Load..."), rect(210, 410, 70, 25), load); + bOK = newbutton(G_("OK"), rect(350, 410, 70, 25), ok); + bCancel = newbutton(G_("Cancel"), rect(430, 410, 70, 25), cancel); + show(wconfig); +diff -urp R-2.4.0.old/src/gnuwin32/rui.c R-2.4.0/src/gnuwin32/rui.c +--- R-2.4.0.old/src/gnuwin32/rui.c 2006-09-21 21:05:08.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/rui.c 2006-10-29 10:45:44.000000000 -0600 +@@ -54,6 +54,7 @@ console RConsole = NULL; + #ifdef USE_MDI + int RguiMDI = RW_MDI | RW_TOOLBAR | RW_STATUSBAR; + int MDIset = 0; ++int R_LoadRconsole = 1; + window RFrame; + rect MDIsize; + #endif +@@ -664,25 +665,25 @@ void readconsolecfg() + + struct structGUI gui; + +- gui.crows = 32; +- gui.ccols = 90; ++ gui.crows = 25; ++ gui.ccols = 80; + gui.cx = gui.cy = 0; + gui.grx = Rwin_graphicsx; + gui.gry = Rwin_graphicsy; + gui.bg = White; +- gui.fg = Black; ++ gui.fg = DarkBlue; + gui.user = gaRed; + gui.hlt = DarkRed; + gui.prows = 25; + gui.pcols = 80; + gui.pagerMultiple = 0; +- gui.cbb = 64*1024; +- gui.cbl = 8*1024; ++ gui.cbb = 65000; ++ gui.cbl = 8000; + gui.setWidthOnResize = 1; +- strcpy(gui.font, "FixedFont"); ++ strcpy(gui.font, "Courier New"); + strcpy(gui.style, "normal"); +- gui.tt_font = 0; +- gui.pointsize = 12; ++ gui.tt_font = 1; ++ gui.pointsize = 10; + strcpy(gui.language, ""); + gui.buffered = 1; + +@@ -693,13 +694,15 @@ void readconsolecfg() + + gui.MDIsize = rect(0, 0, 0, 0); + #endif +- sprintf(optf, "%s/Rconsole", getenv("R_USER")); +- if (!loadRconsole(&gui, optf)) { +- sprintf(optf, "%s/etc/Rconsole", getenv("R_HOME")); ++ if (R_LoadRconsole) { ++ sprintf(optf, "%s/Rconsole", getenv("R_USER")); + if (!loadRconsole(&gui, optf)) { +- app_cleanup(); +- RConsole = NULL; +- exit(10); ++ sprintf(optf, "%s/etc/Rconsole", getenv("R_HOME")); ++ if (!loadRconsole(&gui, optf)) { ++ app_cleanup(); ++ RConsole = NULL; ++ exit(10); ++ } + } + } + if (gui.tt_font) { +diff -urp R-2.4.0.old/src/gnuwin32/rui.h R-2.4.0/src/gnuwin32/rui.h +--- R-2.4.0.old/src/gnuwin32/rui.h 2006-09-04 21:05:03.000000000 -0500 ++++ R-2.4.0/src/gnuwin32/rui.h 2006-10-29 10:45:44.000000000 -0600 +@@ -24,6 +24,7 @@ + #define RW_LARGEICONS 0x1000 + + extern int MDIset; ++extern int R_LoadRconsole; + + #include <R_ext/Boolean.h> + #include <R_ext/libextern.h> +diff -urp R-2.4.0.old/src/include/Makefile.win R-2.4.0/src/include/Makefile.win +--- R-2.4.0.old/src/include/Makefile.win 2006-09-04 09:40:59.000000000 -0500 ++++ R-2.4.0/src/include/Makefile.win 2006-10-28 14:35:50.000000000 -0500 +@@ -78,7 +78,8 @@ Rmath.h: Rmath.h0 + + ## If we do not have svn, get the old file from SVN-REVISION.bak (if poss). + ## This needs to be copy-on-change. +-## We don't get the date from svn info as it is not in GMT. ++## The date from svn info is not in GMT, but we have decided to live ++## with that as they changed the format in svn 1.4.x + ## <FIXME> USE_SVNVERSION does not work if there is no 'svnversion' + FORCE: + $(R_HOME)/SVN-REVISION: FORCE +@@ -95,9 +96,10 @@ else + rm svn-tmp; \ + fi + endif +- @if test -f svn-tmp && test -f "../../.svn/entries" ; then \ +- cdate=`grep committed-date "../../.svn/entries" | sed -n 1p | sed -e 's/^ *committed-date=\"//' -e 's/T.*//'` ; \ +- echo "Last Changed Date: $${cdate}" >> svn-tmp ; \ ++ @if test -f svn-tmp ; then \ ++ (cd ../..; LC_ALL=C TZ=GMT svn info || echo "Last Changed Date: unknown") 2> /dev/null \ ++ | sed -n '/^Last Changed Date:/p' | sed 's/[0-9][0-9]:.*//' \ ++ >> svn-tmp ; \ + else \ + rm -f svn-tmp ; \ + fi +@@ -108,7 +110,7 @@ endif + else \ + cp -p $(R_HOME)/SVN-REVISION.bak $@ 2> /dev/null || \ + (echo "Revision: 00000" > $@; \ +- echo "Last Changed Date: 2005-00-00" >> $@) ; \ ++ echo "Last Changed Date: 2006-00-00" >> $@) ; \ + fi + @rm -f svn-tmp $(R_HOME)/SVN-REVISION.bak + +diff -urp R-2.4.0.old/src/library/base/man/abbreviate.Rd R-2.4.0/src/library/base/man/abbreviate.Rd +--- R-2.4.0.old/src/library/base/man/abbreviate.Rd 2006-09-04 09:41:21.000000000 -0500 ++++ R-2.4.0/src/library/base/man/abbreviate.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -35,6 +35,9 @@ abbreviate(names.arg, minlength = 4, use + + If \code{use.classes} is \code{FALSE} then the only distinction is to + be between letters and space. This has NOT been implemented. ++ ++ There is a limit on 8191 bytes on the elements of \code{names.arg} ++ (after possible coercion). + } + \value{ + A character vector containing abbreviations for the strings in its +diff -urp R-2.4.0.old/src/library/base/man/connections.Rd R-2.4.0/src/library/base/man/connections.Rd +--- R-2.4.0.old/src/library/base/man/connections.Rd 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/base/man/connections.Rd 2006-11-01 19:41:41.000000000 -0600 +@@ -2,6 +2,7 @@ + \alias{connections} + \alias{connection} + \alias{file} ++\alias{clipboard} + \alias{pipe} + \alias{fifo} + \alias{gzfile} +@@ -254,12 +255,13 @@ isIncomplete(con) + in modes \code{"r"} and \code{"w"} only. + #endif + #ifdef unix +- in mode \code{"r"} only. It reads the X11 primary selection, which +- can also be specified as \code{"X11_primary"} and the secondary ++ in mode \code{"r"} only. It reads the X11 primary selection (see ++ \url{http://standards.freedesktop.org/clipboards-spec/clipboards-latest.txt}), ++ which can also be specified as \code{"X11_primary"} and the secondary + selection as \code{"X11_secondary"}. + #endif + +- When the clipboard is opened for reading, the contents are immediately ++ When a clipboard is opened for reading, the contents are immediately + copied to internal storage in the connection. + + #ifdef windows +diff -urp R-2.4.0.old/src/library/base/man/grep.Rd R-2.4.0/src/library/base/man/grep.Rd +--- R-2.4.0.old/src/library/base/man/grep.Rd 2006-09-24 21:05:08.000000000 -0500 ++++ R-2.4.0/src/library/base/man/grep.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -54,11 +54,12 @@ gregexpr(pattern, text, extended = TRUE, + \item{useBytes}{logical. If \code{TRUE} the matching is done + byte-by-byte rather than character-by-character. See Details.} + \item{replacement}{a replacement for matched pattern in \code{sub} and +- \code{gsub}. Coerced to character if possible. This can include +- backreferences \code{"\\1"} to \code{"\\9"} to parenthesized +- subexpressions of \code{pattern}. For \code{perl = TRUE} only, it +- can also contain \code{"\\U"} or \code{"\\L"} to convert the rest of +- the replacement to upper or lower case. ++ \code{gsub}. Coerced to character if possible. For \code{fixed = ++ FALSE} this can include backreferences \code{"\\1"} to ++ \code{"\\9"} to parenthesized subexpressions of \code{pattern}. For ++ \code{perl = TRUE} only, it can also contain \code{"\\U"} or ++ \code{"\\L"} to convert the rest of the replacement to upper or ++ lower case. + } + } + \details{ +diff -urp R-2.4.0.old/src/library/base/man/groupGeneric.Rd R-2.4.0/src/library/base/man/groupGeneric.Rd +--- R-2.4.0.old/src/library/base/man/groupGeneric.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/groupGeneric.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -7,8 +7,6 @@ + \alias{Ops.data.frame} + \alias{Summary} + \alias{Summary.data.frame} +-\alias{Arith} +-\alias{Compare} + \alias{Complex} + \alias{group generic} % used in class.Rd + \concept{group generic} +@@ -120,7 +118,7 @@ Summary(\dots, na.rm = FALSE) + } + This group dispatches on the first argument supplied. + +- \item Group \code{Complex}: ++ \item Group \code{"Complex"}: + \itemize{ + \item \code{Arg}, \code{Conj}, \code{Im}, \code{Mod}, \code{Re} + % do_cmathfuns() [complex.c:267]: if(DispatchGroup("Complex",...)) +diff -urp R-2.4.0.old/src/library/base/man/merge.Rd R-2.4.0/src/library/base/man/merge.Rd +--- R-2.4.0.old/src/library/base/man/merge.Rd 2006-09-27 21:05:07.000000000 -0500 ++++ R-2.4.0/src/library/base/man/merge.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -18,8 +18,7 @@ merge(x, y, \dots) + sort = TRUE, suffixes = c(".x",".y"), \dots) + } + \arguments{ +- \item{x, y}{data frames, or objects to be coerced to one. Neither is +- currently allowed to have zero rows.} ++ \item{x, y}{data frames, or objects to be coerced to one.} + \item{by, by.x, by.y}{specifications of the common columns. See Details.} + \item{all}{logical; \code{all = L} is shorthand for \code{all.x = L} and + \code{all.y = L}.} +diff -urp R-2.4.0.old/src/library/base/man/ns-internal.Rd R-2.4.0/src/library/base/man/ns-internal.Rd +--- R-2.4.0.old/src/library/base/man/ns-internal.Rd 2006-09-07 21:05:19.000000000 -0500 ++++ R-2.4.0/src/library/base/man/ns-internal.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -27,7 +27,7 @@ importIntoEnv(impenv, impnames, expenv, + isBaseNamespace(ns) + namespaceExport(ns, vars) + namespaceImport(self, \dots) +-namespaceImportFrom(self, ns, vars, generics) ++namespaceImportFrom(self, ns, vars, generics, packages) + namespaceImportClasses(self, ns, vars) + namespaceImportMethods(self, ns, vars) + packageHasNamespace(package, package.lib) +@@ -49,6 +49,7 @@ setNamespaceInfo(ns, which, val) + \item{generics}{optional character vector.} + \item{self}{name space environment.} + \item{package}{string naming the package/name space to load.} ++ \item{packages}{vector of package names parallel to \code{generics}.} + \item{package.lib}{character vector specifying library.} + \item{mustExist}{logical.} + \item{genname}{character.} +diff -urp R-2.4.0.old/src/library/base/man/parse.Rd R-2.4.0/src/library/base/man/parse.Rd +--- R-2.4.0.old/src/library/base/man/parse.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/parse.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -36,7 +36,8 @@ parse(file = "", n = NULL, text = NULL, + that is missing the final EOL marker. + + See \code{\link{source}} for the limits on the size of functions +- that can be parsed (by default). ++ that can be parsed (by default). There is also a limit of 8192 bytes ++ on the size of strings which can be parsed. + + When input is taken from the console, \code{n = NULL} is equivalent to + \code{n = 1}, and \code{n < 0} will read until an EOF character is read. +diff -urp R-2.4.0.old/src/library/base/man/regex.Rd R-2.4.0/src/library/base/man/regex.Rd +--- R-2.4.0.old/src/library/base/man/regex.Rd 2006-09-24 21:05:08.000000000 -0500 ++++ R-2.4.0/src/library/base/man/regex.Rd 2006-10-30 10:45:47.000000000 -0600 +@@ -56,7 +56,7 @@ + + The precise way character ranges are interpreted depends on the values + of \code{perl} and \code{ignore.case}. For basic and extended regular +- expressions the the collation order is taken from the OS's ++ expressions the collation order is taken from the OS's + implementation of the setting of the locale category + \code{LC_COLLATE}, so \code{[W-Z]} may include \code{x} and if it + does may or may not include \code{w}. (In most English locales the +diff -urp R-2.4.0.old/src/library/base/man/Rhome.Rd R-2.4.0/src/library/base/man/Rhome.Rd +--- R-2.4.0.old/src/library/base/man/Rhome.Rd 2006-04-09 17:19:27.000000000 -0500 ++++ R-2.4.0/src/library/base/man/Rhome.Rd 2006-10-28 14:35:54.000000000 -0500 +@@ -1,8 +1,9 @@ + \name{R.home} + \alias{R.home} ++\alias{R_HOME} + \title{Return the R Home Directory} + \description{ +- Return the \R home directory. ++ Return the \R home directory. + } + \usage{ + R.home(component="home") +@@ -13,8 +14,19 @@ R.home(component="home") + \code{"etc"} and \code{"share"} giving the paths to the + corresponding parts of an \R installation.} + } ++\details{ ++ The \R home directory is the top-level directory of the \R ++ installation being run. ++ ++ The \R home directory is often referred to as \code{R_HOME}, ++ and is the value of an environment variable of that name in an \R ++ session. ++#ifdef unix ++ It can be found outside an \R session by \code{R \link{RHOME}}. ++#endif ++} + \value{ +- A character string giving the current \R home directory or path to a ++ A character string giving the \R home directory or path to a + particular component. Normally the components are all subdirectories + of the \R home directory, but this may not be the case in a Unix-like + installation. +diff -urp R-2.4.0.old/src/library/base/man/row.names.Rd R-2.4.0/src/library/base/man/row.names.Rd +--- R-2.4.0.old/src/library/base/man/row.names.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/row.names.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -34,10 +34,10 @@ row.names(x) <- value + Prior to \R 2.4.0, row names were character. As from \R 2.4.0, they + are allowed to be integer or character, but for backwards + compatibility \code{row.names} will always return a character vector. +- (Use \code{attr(x, "row.names")} if you need the internal value.) ++ (Use \code{attr(x, "row.names")} if you need the actual value.) + + Using \code{NULL} for the value resets the row names to +- \code{seq(len=nrow(x))}. ++ \code{seq_len(nrow(x))}. + } + \value{ + \code{row.names} returns a character vector. +@@ -49,9 +49,9 @@ row.names(x) <- value + it has a method that calls \code{rownames} for an array argument. + + Row names of the form \code{1:n} for \code{n > 2} are stored +- internally in a compact form, which might be seen by calling +- \code{\link{attributes}} but never via \code{row.names} or +- \code{attr(x, "row.names")}. ++ internally in a compact form, which might be seen from C code or by ++ deparsing but never via \code{row.names} or ++ \code{\link{attr}(x, "row.names")}. + } + \references{ + Chambers, J. M. (1992) +diff -urp R-2.4.0.old/src/library/base/man/source.Rd R-2.4.0/src/library/base/man/source.Rd +--- R-2.4.0.old/src/library/base/man/source.Rd 2006-09-04 09:41:21.000000000 -0500 ++++ R-2.4.0/src/library/base/man/source.Rd 2006-10-28 14:35:55.000000000 -0500 +@@ -49,7 +49,7 @@ source(file, local = FALSE, echo = verbo + + If \code{\link{options}}("keep.source") is true (the default), the + source of functions is kept so they can be listed exactly as input. +- This imposes a limit of 128K chars on the function size and a nesting ++ This imposes a limit of 128K bytes on the function size and a nesting + limit of 265. Use \code{option(keep.source = FALSE)} when these + limits might take effect: if exceeded they generate an error. + +@@ -61,7 +61,8 @@ source(file, local = FALSE, echo = verbo + trial encoding. + + Unlike input from a console, lines in the file or on a connection can +- contain an unlimited number of characters. ++ contain an unlimited number of characters. However, there is a limit ++ of 8192 bytes on the size of character strings. + } + \references{ + Becker, R. A., Chambers, J. M. and Wilks, A. R. (1988) +diff -urp R-2.4.0.old/src/library/base/man/Startup.Rd R-2.4.0/src/library/base/man/Startup.Rd +--- R-2.4.0.old/src/library/base/man/Startup.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/Startup.Rd 2006-10-29 10:45:43.000000000 -0600 +@@ -77,6 +77,10 @@ + The command-line flag \option{--vanilla} implies + \option{--no-site-file}, \option{--no-init-file}, + \option{--no-restore} and \option{--no-environ}. ++#ifdef windows ++ In Windows, it also implies \option{--no-Rconsole}, which ++ prevents loading the \code{\link{Rconsole}} file. ++#endif + } + \details{ + Note that there are two sorts of files used in startup: +diff -urp R-2.4.0.old/src/library/base/man/strsplit.Rd R-2.4.0/src/library/base/man/strsplit.Rd +--- R-2.4.0.old/src/library/base/man/strsplit.Rd 2006-09-07 21:05:19.000000000 -0500 ++++ R-2.4.0/src/library/base/man/strsplit.Rd 2006-10-30 10:45:47.000000000 -0600 +@@ -52,7 +52,7 @@ strsplit(x, split, extended = TRUE, fixe + character} (almost always a Unicode point). + + +- A missing value of \code{split} does not split the the corresponding ++ A missing value of \code{split} does not split the corresponding + element(s) of \code{x} at all. + + The algorithm applied to each input string is +diff -urp R-2.4.0.old/src/library/base/man/unlist.Rd R-2.4.0/src/library/base/man/unlist.Rd +--- R-2.4.0.old/src/library/base/man/unlist.Rd 2006-09-04 09:41:20.000000000 -0500 ++++ R-2.4.0/src/library/base/man/unlist.Rd 2006-10-31 10:45:45.000000000 -0600 +@@ -20,7 +20,7 @@ unlist(x, recursive = TRUE, use.names = + specific classes of objects, see \link{InternalMethods}. + + If \code{x} has length zero the result is \code{NULL}. +- ++ + If \code{recursive = FALSE}, the function will not recurse beyond the + first level items in \code{x}. + +@@ -40,7 +40,7 @@ unlist(x, recursive = TRUE, use.names = + + Where possible the list elements are coerced to a common mode during + the unlisting, and so the result often ends up as a character +- vector. Vectors will be corced to the highest type of the components ++ vector. Vectors will be coerced to the highest type of the components + in the hierarchy NULL < raw < logical < integer < real < complex < character + < list < expression: pairlists are treated as lists. + +@@ -54,7 +54,7 @@ unlist(x, recursive = TRUE, use.names = + \value{ + \code{NULL} or an expression or a vector of an appropriate mode to + hold the list components. +- ++ + The output type is determined from the highest type + of the components in the hierarchy raw < logical < integer < real < + complex < character < list < expression, after coercion of pairlists +diff -urp R-2.4.0.old/src/library/base/R/merge.R R-2.4.0/src/library/base/R/merge.R +--- R-2.4.0.old/src/library/base/R/merge.R 2006-09-04 09:41:13.000000000 -0500 ++++ R-2.4.0/src/library/base/R/merge.R 2006-10-28 14:35:54.000000000 -0500 +@@ -28,7 +28,6 @@ merge.data.frame <- + } + + nx <- nrow(x <- as.data.frame(x)); ny <- nrow(y <- as.data.frame(y)) +- if (nx == 0 || ny == 0) stop("no rows to match") + by.x <- fix.by(by.x, x) + by.y <- fix.by(by.y, y) + if((l.b <- length(by.x)) != length(by.y)) +@@ -44,7 +43,7 @@ merge.data.frame <- + cnm <- nm.y %in% nm + names(y)[cnm] <- paste(nm.y[cnm], suffixes[2], sep="") + } +- ij <- expand.grid(1:nx, 1:ny) ++ ij <- expand.grid(seq_len(nx), seq_len(ny)) + res <- cbind(x[ij[,1], , drop = FALSE], y[ij[,2], , drop = FALSE]) + } + else { +@@ -56,8 +55,8 @@ merge.data.frame <- + y <- cbind(Row.names = I(row.names(y)), y) + by.y <- by.y + 1 + } +- row.names(x) <- 1:nx +- row.names(y) <- 1:ny ++ row.names(x) <- seq_len(nx) ++ row.names(y) <- seq_len(ny) + ## create keys from 'by' columns: + if(l.b == 1) { # (be faster) + bx <- x[, by.x]; if(is.factor(bx)) bx <- as.character(bx) +@@ -68,17 +67,18 @@ merge.data.frame <- + bx <- x[, by.x, drop=FALSE]; by <- y[, by.y, drop=FALSE] + names(bx) <- names(by) <- paste("V", 1:ncol(bx), sep="") + bz <- do.call("paste", c(rbind(bx, by), sep = "\r")) +- bx <- bz[1:nx] +- by <- bz[nx + (1:ny)] ++ bx <- bz[seq_len(nx)] ++ by <- bz[nx + seq_len(ny)] + } + comm <- match(bx, by, 0) + bxy <- bx[comm > 0] # the keys which are in both + xinds <- match(bx, bxy, 0) + yinds <- match(by, bxy, 0) +- ## R-only solution {when !all.x && !all.y} : +- ## o <- outer(xinds, yinds, function(x, y) (x > 0) & x==y) +- ## m <- list(xi = row(o)[o], yi = col(o)[o]) +- m <- .Internal(merge(xinds, yinds, all.x, all.y)) ++ if(nx > 0 && ny > 0) ++ m <- .Internal(merge(xinds, yinds, all.x, all.y)) ++ else ++ m <- list(xi=integer(0), yi=integer(0), ++ x.alone=seq_len(nx), y.alone=seq_len(ny)) + nm <- nm.x <- names(x)[-by.x] + nm.by <- names(x)[by.x] + nm.y <- names(y)[-by.y] +diff -urp R-2.4.0.old/src/library/base/R/namespace.R R-2.4.0/src/library/base/R/namespace.R +--- R-2.4.0.old/src/library/base/R/namespace.R 2006-09-22 21:05:06.000000000 -0500 ++++ R-2.4.0/src/library/base/R/namespace.R 2006-10-28 14:35:54.000000000 -0500 +@@ -657,7 +657,7 @@ namespaceImport <- function(self, ...) { + namespaceImportFrom(self, asNamespace(ns)) + } + +-namespaceImportFrom <- function(self, ns, vars, generics) { ++namespaceImportFrom <- function(self, ns, vars, generics, packages) { + addImports <- function(ns, from, what) { + imp <- structure(list(what), names = getNamespaceName(from)) + imports <- getNamespaceImports(ns) +@@ -726,7 +726,8 @@ namespaceImportFrom <- function(self, ns + delete <- c(delete, ii) + if(!missing(generics)) { + genName <- generics[[i]] +- fdef <- methods:::getGeneric(genName, where = impenv) ++ fdef <- methods:::getGeneric(genName, ++ where = impenv, package = packages[[i]]) + if(is.null(fdef)) + warning(gettextf( + "Found methods to import for function \"%s\" but not the generic itself", +@@ -784,7 +785,7 @@ namespaceImportMethods <- function(self, + methods:::is(get(g, envir = ns), "genericFunction")) + allVars <- c(allVars, g) + } +- namespaceImportFrom(self, asNamespace(ns), allVars, allFuns) ++ namespaceImportFrom(self, asNamespace(ns), allVars, allFuns, packages) + } + + importIntoEnv <- function(impenv, impnames, expenv, expnames) { +diff -urp R-2.4.0.old/src/library/base/R/stop.R R-2.4.0/src/library/base/R/stop.R +--- R-2.4.0.old/src/library/base/R/stop.R 2006-09-04 09:41:13.000000000 -0500 ++++ R-2.4.0/src/library/base/R/stop.R 2006-10-28 14:35:54.000000000 -0500 +@@ -45,7 +45,7 @@ warning <- function(..., call. = TRUE, i + call = conditionCall(cond) + withRestarts({ + .Internal(.signalCondition(cond, message, call)) +- .Internal(.dfltStop(message, call)) ++ .Internal(.dfltWarn(message, call)) + }, muffleWarning = function() NULL) #**** allow simpler form?? + invisible(message) + } +diff -urp R-2.4.0.old/src/library/graphics/man/plotdefault.Rd R-2.4.0/src/library/graphics/man/plotdefault.Rd +--- R-2.4.0.old/src/library/graphics/man/plotdefault.Rd 2006-05-23 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/graphics/man/plotdefault.Rd 2006-10-28 14:35:51.000000000 -0500 +@@ -24,7 +24,7 @@ + \code{"s"} and \code{"S"} for stair steps and + \code{"h"} for histogram-like vertical lines. Finally, + \code{"n"} does not produce any points or lines.} +- \item{xlim}{the x limits (x1,x2) of the plot. Note that \code{x1 > x2} ++ \item{xlim}{the x limits (x1, x2) of the plot. Note that \code{x1 > x2} + is allowed and leads to a \dQuote{reversed axis}.} + \item{ylim}{the y limits of the plot.} + \item{log}{a character string which contains \code{"x"} if the x axis +diff -urp R-2.4.0.old/src/library/graphics/man/plot.window.Rd R-2.4.0/src/library/graphics/man/plot.window.Rd +--- R-2.4.0.old/src/library/graphics/man/plot.window.Rd 2006-09-04 09:41:01.000000000 -0500 ++++ R-2.4.0/src/library/graphics/man/plot.window.Rd 2006-10-28 14:35:51.000000000 -0500 +@@ -12,8 +12,8 @@ + plot.window(xlim, ylim, log = "", asp = NA, \dots) + } + \arguments{ +- \item{xlim, ylim}{numeric of length 2, giving the x and y coordinates +- ranges.} ++ \item{xlim, ylim}{numeric vectors of length 2, giving the x and y ++ coordinates ranges.} + \item{log}{character; indicating which axes should be in log scale.} + \item{asp}{numeric, giving the \bold{asp}ect ratio y/x.} + \item{\dots}{further graphical parameters as in \code{\link{par}}. +@@ -30,6 +30,9 @@ plot.window(xlim, ylim, log = "", asp = + \code{asp > 1} can be used to produce more accurate maps when using + latitude and longitude. + ++ To reverse an axis, use \code{xlim} or \code{ylim} of the form ++ \code{c(hi, lo)}. ++ + The function attempts to produce a plausible set of scales if one or + both of \code{xlim} and \code{ylim} is of length one or the two values + given are identical, but it is better to avoid that case. +diff -urp R-2.4.0.old/src/library/graphics/man/stripchart.Rd R-2.4.0/src/library/graphics/man/stripchart.Rd +--- R-2.4.0.old/src/library/graphics/man/stripchart.Rd 2006-09-12 21:05:02.000000000 -0500 ++++ R-2.4.0/src/library/graphics/man/stripchart.Rd 2006-10-30 10:45:46.000000000 -0600 +@@ -18,7 +18,7 @@ stripchart(x, method = "overplot", jitte + can be specified as a single numeric vector, or as list of numeric + vectors, each corresponding to a component plot. Alternatively a + symbolic specification of the form \code{x ~ g} can be given, +- indicating the the observations in the vector \code{x} are to be ++ indicating the observations in the vector \code{x} are to be + grouped according to the levels of the factor \code{g}. \code{NA}s + are allowed in the data.} + \item{method}{the method to be used to separate coincident points. +diff -urp R-2.4.0.old/src/library/graphics/man/symbols.Rd R-2.4.0/src/library/graphics/man/symbols.Rd +--- R-2.4.0.old/src/library/graphics/man/symbols.Rd 2006-09-04 09:41:01.000000000 -0500 ++++ R-2.4.0/src/library/graphics/man/symbols.Rd 2006-10-30 10:45:46.000000000 -0600 +@@ -72,7 +72,7 @@ symbols(x, y = NULL, circles, squares, r + to zero. + + Argument \code{inches} controls the sizes of the symbols. If +- \code{TRUE} (the default), the the symbols are scaled so that the ++ \code{TRUE} (the default), the symbols are scaled so that the + largest dimension of any symbol is one inch. If a positive number is + given the symbols are scaled to make largest dimension this size in + inches (so \code{TRUE} and \code{1} are equivalent). If \code{inches} +diff -urp R-2.4.0.old/src/library/graphics/R/datetime.R R-2.4.0/src/library/graphics/R/datetime.R +--- R-2.4.0.old/src/library/graphics/R/datetime.R 2006-09-04 09:41:00.000000000 -0500 ++++ R-2.4.0/src/library/graphics/R/datetime.R 2006-10-28 14:35:50.000000000 -0500 +@@ -23,13 +23,13 @@ axis.POSIXct <- function(side, x, at, fo + if(missing(format)) format <- "%a" + } else { # days, up to a couple of months + sc <- 60*60*24 +- if(missing(format)) format <- "%b %d" + } + if(d < 60*60*24*50) { + zz <- pretty(z/sc) + z <- zz*sc + class(z) <- c("POSIXt", "POSIXct") + if(sc == 60*60*24) z <- as.POSIXct(round(z, "days")) ++ if(missing(format)) format <- "%b %d" + } else if(d < 1.1*60*60*24*365) { # months + class(z) <- c("POSIXt", "POSIXct") + zz <- as.POSIXlt(z) +diff -urp R-2.4.0.old/src/library/graphics/R/dotchart.R R-2.4.0/src/library/graphics/R/dotchart.R +--- R-2.4.0.old/src/library/graphics/R/dotchart.R 2006-09-12 21:05:02.000000000 -0500 ++++ R-2.4.0/src/library/graphics/R/dotchart.R 2006-10-28 14:35:50.000000000 -0500 +@@ -5,7 +5,9 @@ function(x, labels = NULL, groups = NULL + xlim = range(x[is.finite(x)]), + main = NULL, xlab = NULL, ylab = NULL, ...) + { +- opar <- par("mai", "cex", "yaxs") ++ ## opar <- par(no.readonly=TRUE) ## slightly more efficient: ++ opar <- par("cex", "yaxs", "mai", ## needed too: ++ "mar", "usr", "xaxp", "yaxp") + on.exit(par(opar)) + par(cex = cex, yaxs = "i") + +diff -urp R-2.4.0.old/src/library/graphics/R/mosaicplot.R R-2.4.0/src/library/graphics/R/mosaicplot.R +--- R-2.4.0.old/src/library/graphics/R/mosaicplot.R 2006-09-04 09:41:00.000000000 -0500 ++++ R-2.4.0/src/library/graphics/R/mosaicplot.R 2006-10-28 14:35:51.000000000 -0500 +@@ -12,6 +12,9 @@ mosaicplot <- function(x, ...) UseMethod + ### Changes by W. Fischer and U. Ligges: + ## - Deparsing x in for main title. New arguments: sub, las, cex.axis + ## - made to work by BDR ++### Changes by John W. Emerson (JWE): ++## - Fixed xlab and ylab to reflect changes in variables and/or ++## orientation (e.g. use of sort and dir options). + + mosaicplot.default <- + function(x, main = deparse(substitute(x)), sub = NULL, xlab = NULL, +@@ -215,11 +218,13 @@ function(x, main = deparse(substitute(x) + as.numeric(cut(residuals, breaks))) + } + +- ## The next four may all be NULL: +- label <- dimnames(x) +- nam.dn <- names(label) +- if(is.null(xlab)) xlab <- nam.dn[1] +- if(is.null(ylab)) ylab <- nam.dn[2] ++ ############################################################## ++ ## The next four may all be NULL: ### MOVED by JWE to below. ++ ## label <- dimnames(x) ++ ## nam.dn <- names(label) ++ ## if(is.null(xlab)) xlab <- nam.dn[1] ++ ## if(is.null(ylab)) ylab <- nam.dn[2] ++ ############################################################## + + ## Initialize spacing. + if(is.null(off)) +@@ -242,6 +247,24 @@ function(x, main = deparse(substitute(x) + label <- label[sort] + } + ++ ## ################################################################# ++ ## MOVED and modified by JWE, from above, 10/16/2006 to fix dir= and ++ ## sort= bug with respect to xlab= and ylab= options. ++ ++ ## The next four may all be NULL: ++ label <- dimnames(x) ++ nam.dn <- names(label) ++ ## Here, we need to identify the first "h" and first "v" splits, and ++ ## use their names for xlab= and ylab=, if they are NULL. ++ ++ if(is.null(xlab) && any(dir == "v")) ++ xlab <- nam.dn[min(which(dir == "v"))] ++ if(is.null(ylab) && any(dir == "h")) ++ ylab <- nam.dn[min(which(dir == "h"))] ++ ++ ## END MODIFICATIONS by JWE ++ ## ################################################################# ++ + ncolors <- length(tabulate(Ind[,dimd])) + if(!extended && ((is.null(color) || length(color) != ncolors))) { + color <- +@@ -370,3 +393,5 @@ function(formula, data = NULL, ..., + mosaicplot(table(mf), main = main, ...) + } + } ++ ++ +diff -urp R-2.4.0.old/src/library/graphics/R/rect.R R-2.4.0/src/library/graphics/R/rect.R +--- R-2.4.0.old/src/library/graphics/R/rect.R 2006-04-09 17:19:00.000000000 -0500 ++++ R-2.4.0/src/library/graphics/R/rect.R 2006-10-28 14:35:50.000000000 -0500 +@@ -5,7 +5,7 @@ rect <- + if (is.numeric(density) && all(is.na(density) | density < 0)) + density <- NULL + if (!is.null(density) && !is.null(angle)) { +- if (is.logical(border)) { ++ if (is.logical(border) && !is.na(border)) { + if (border) border <- col + else border <- NA + } +diff -urp R-2.4.0.old/src/library/grDevices/man/palettes.Rd R-2.4.0/src/library/grDevices/man/palettes.Rd +--- R-2.4.0.old/src/library/grDevices/man/palettes.Rd 2006-04-09 17:19:30.000000000 -0500 ++++ R-2.4.0/src/library/grDevices/man/palettes.Rd 2006-10-28 14:35:56.000000000 -0500 +@@ -9,11 +9,12 @@ + Create a vector of \code{n} \dQuote{contiguous} colors. + } + \usage{ +-rainbow(n, s = 1, v = 1, start = 0, end = max(1,n - 1)/n, gamma = 1) +-heat.colors(n) +-terrain.colors(n) +-topo.colors(n) +-cm.colors(n) ++rainbow(n, s = 1, v = 1, start = 0, end = max(1,n - 1)/n, ++ gamma = 1, alpha = 1) ++heat.colors(n, alpha = 1) ++terrain.colors(n, alpha = 1) ++topo.colors(n, alpha = 1) ++cm.colors(n, alpha = 1) + } + \arguments{ + \item{n}{the number of colors (\eqn{\ge 1}{>= 1}) to be in the +@@ -25,6 +26,8 @@ cm.colors(n) + \item{end}{the (corrected) hue in [0,1] at which the rainbow ends.} + \item{gamma}{the gamma correction, see argument \code{gamma} in + \code{\link{hsv}}.} ++ \item{alpha}{the alpha transparency, a number in [0,1], see argument ++ \code{alpha} in \code{\link{hsv}}.} + } + \details{ + Conceptually, all of these functions actually use (parts of) a line +diff -urp R-2.4.0.old/src/library/grDevices/man/windows/windows.Rd R-2.4.0/src/library/grDevices/man/windows/windows.Rd +--- R-2.4.0.old/src/library/grDevices/man/windows/windows.Rd 2006-04-09 17:19:30.000000000 -0500 ++++ R-2.4.0/src/library/grDevices/man/windows/windows.Rd 2006-10-28 14:35:56.000000000 -0500 +@@ -34,8 +34,9 @@ win.print(width = 7, height = 7, pointsi + \arguments{ + \item{width, height}{the (nominal) width and height of the canvas of + the plotting window in inches.} +- \item{pointsize}{the default pointsize of plotted text. The allowed +- range is \code{[6, 48]}: values outside that range are reset to 12.} ++ \item{pointsize}{the default pointsize of plotted text. Values are ++ rounded to the nearest integer: values less than or equal to zero ++ are reset to 12.} + \item{record}{logical: sets the initial state of the flag for + recording plots.} + \item{rescale}{controls the action for resizing plots.} +diff -urp R-2.4.0.old/src/library/grDevices/R/colorstuff.R R-2.4.0/src/library/grDevices/R/colorstuff.R +--- R-2.4.0.old/src/library/grDevices/R/colorstuff.R 2006-09-04 09:41:22.000000000 -0500 ++++ R-2.4.0/src/library/grDevices/R/colorstuff.R 2006-10-28 14:35:55.000000000 -0500 +@@ -7,19 +7,17 @@ col2rgb <- function(col, alpha=FALSE) { + result + } + ++## FIXME: gray() should also allow alpha; ditto for gray.colors() below + gray <- function(level) .Internal(gray(level)) + grey <- gray + + rgb <- function(red, green, blue, alpha, names = NULL, maxColorValue = 1) + { +- if (missing(alpha)) { +- alphaspec <- FALSE +- alpha <- maxColorValue +- } else { +- alphaspec <- TRUE +- } ++ alphaspec <- !missing(alpha) ++ if(!alphaspec) ++ alpha <- maxColorValue + ## in the first case, (r,g,b) are (coerced to) integer, otherwise +- ## double. ++ ## double : + if(maxColorValue == 255) + result <- .Internal(rgb256(red, green, blue, alpha, names)) + else +@@ -30,14 +28,9 @@ rgb <- function(red, green, blue, alpha, + else result + } + +-hsv <- function(h=1, s=1, v=1, gamma=1, alpha) ++hsv <- function(h=1, s=1, v=1, gamma = 1, alpha = 1) + { +- if (missing(alpha)) { +- alphaspec <- FALSE +- alpha <- 1 +- } else { +- alphaspec <- TRUE +- } ++ alphaspec <- !missing(alpha) + result <- .Internal(hsv(h, s, v, gamma, alpha)) + ## If alpha not specified only return #RRGGBB + if (!alphaspec) +@@ -46,14 +39,9 @@ hsv <- function(h=1, s=1, v=1, gamma=1, + } + + hcl <- +-function (h = 0, c = 35, l = 85, alpha, fixup = TRUE) ++function (h = 0, c = 35, l = 85, alpha = 1, fixup = TRUE) + { +- if (missing(alpha)) { +- alphaspec <- FALSE +- alpha <- 1 +- } else { +- alphaspec <- TRUE +- } ++ alphaspec <- !missing(alpha) + result <- .Internal(hcl(h, c, l, alpha, fixup)) + if (!alphaspec) + structure(substr(result, 1, 7), names=names(result)) +@@ -90,30 +78,30 @@ palette <- function(value) + ## A quick little ''rainbow'' function -- improved by MM + ## doc in ../man/palettes.Rd + rainbow <- +- function (n, s = 1, v = 1, start = 0, end = max(1,n - 1)/n, gamma = 1) ++ function (n, s = 1, v = 1, start = 0, end = max(1,n - 1)/n, gamma = 1, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + if(start == end || any(c(start,end) < 0)|| any(c(start,end) > 1)) + stop("'start' and 'end' must be distinct and in [0, 1].") + hsv(h = seq.int(start, ifelse(start > end, 1, 0) + end, length= n) %% 1, +- s, v, gamma) ++ s, v, gamma, alpha) + } else character(0) + } + +-topo.colors <- function (n) ++topo.colors <- function (n, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + j <- n %/% 3 + k <- n %/% 3 + i <- n - j - k +- c(if(i > 0) hsv(h= seq.int(from = 43/60, to = 31/60, length = i)), +- if(j > 0) hsv(h= seq.int(from = 23/60, to = 11/60, length = j)), +- if(k > 0) hsv(h= seq.int(from = 10/60, to = 6/60, length = k), +- s= seq.int(from = 1, to = 0.3, length = k), v = 1)) ++ c(if(i > 0) hsv(h= seq.int(from= 43/60, to= 31/60, length = i), alpha=alpha), ++ if(j > 0) hsv(h= seq.int(from= 23/60, to= 11/60, length = j), alpha=alpha), ++ if(k > 0) hsv(h= seq.int(from= 10/60, to= 6/60, length = k), alpha=alpha, ++ s= seq.int(from= 1, to= 0.3, length = k), v = 1)) + } else character(0) + } + +-terrain.colors <- function (n) ++terrain.colors <- function (n, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + k <- n%/%2 +@@ -122,26 +110,26 @@ terrain.colors <- function (n) + v <- c(0.65, 0.9, 0.95) + c(hsv(h = seq.int(h[1], h[2], length = k), + s = seq.int(s[1], s[2], length = k), +- v = seq.int(v[1], v[2], length = k)), ++ v = seq.int(v[1], v[2], length = k), alpha = alpha), + hsv(h = seq.int(h[2], h[3], length = n - k + 1)[-1], + s = seq.int(s[2], s[3], length = n - k + 1)[-1], +- v = seq.int(v[2], v[3], length = n - k + 1)[-1])) ++ v = seq.int(v[2], v[3], length = n - k + 1)[-1], alpha = alpha)) + } else character(0) + } + +-heat.colors <- function (n) ++heat.colors <- function (n, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + j <- n %/% 4 + i <- n - j +- c(rainbow(i, start = 0, end = 1/6), ++ c(rainbow(i, start = 0, end = 1/6, alpha = alpha), + if (j > 0) + hsv(h = 1/6, s = seq.int(from= 1-1/(2*j), to= 1/(2*j), length = j), +- v = 1)) ++ v = 1, alpha = alpha)) + } else character(0) + } + +-cm.colors <- function (n) ++cm.colors <- function (n, alpha = 1) + { + if ((n <- as.integer(n[1])) > 0) { + even.n <- n %% 2 == 0 +@@ -149,13 +137,15 @@ cm.colors <- function (n) + l1 <- k + 1 - even.n + l2 <- n - k + even.n + c(if(l1 > 0) +- hsv(h = 6/12, s= seq.int(.5, ifelse(even.n,.5/k,0), length = l1), v = 1), ++ hsv(h = 6/12, s = seq.int(.5, ifelse(even.n,.5/k,0), length = l1), ++ v = 1, alpha = alpha), + if(l2 > 1) +- hsv(h = 10/12, s= seq.int(0, 0.5, length = l2)[-1], v = 1)) ++ hsv(h = 10/12, s = seq.int(0, 0.5, length = l2)[-1], ++ v = 1, alpha = alpha)) + } else character(0) + } + +-gray.colors <- ++gray.colors <- ## FIXME: add 'alpha = 1' + function(n, start = 0.3, end = 0.9, gamma = 2.2) + gray(seq.int(from = start^gamma, to = end^gamma, length = n)^(1/gamma)) + grey.colors <- gray.colors +diff -urp R-2.4.0.old/src/library/grDevices/src/devWindows.c R-2.4.0/src/library/grDevices/src/devWindows.c +--- R-2.4.0.old/src/library/grDevices/src/devWindows.c 2006-09-04 09:41:23.000000000 -0500 ++++ R-2.4.0/src/library/grDevices/src/devWindows.c 2006-10-28 14:35:56.000000000 -0500 +@@ -578,8 +578,7 @@ static char* translateFontFamily(char* f + /* 0 = plain text, 1 = bold */ + /* 2 = oblique, 3 = bold-oblique */ + +-#define SMALLEST 2 +-#define LARGEST 100 ++#define SMALLEST 1 + + static void SetFont(char *family, int face, int size, double rot, + NewDevDesc *dd) +@@ -590,7 +589,6 @@ static void SetFont(char *family, int fa + if (face < 1 || face > fontnum) + face = 1; + if (size < SMALLEST) size = SMALLEST; +- if (size > LARGEST) size = LARGEST; + if (!xd->usefixed && + (size != xd->fontsize || face != xd->fontface || + rot != xd->fontangle || strcmp(family, xd->fontfamily))) { +@@ -2564,9 +2562,8 @@ Rboolean GADeviceDriver(NewDevDesc *dd, + /* Font will load at first use */ + + ps = pointsize; +- if (ps < 6 || ps > 48) ++ if (ps < 1) + ps = 12; +- ps = 2 * (ps / 2); + xd->fontface = -1; + xd->fontsize = -1; + xd->basefontsize = ps ; +Binary files R-2.4.0.old/src/library/grid/inst/doc/displaylist.pdf and R-2.4.0/src/library/grid/inst/doc/displaylist.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/frame.pdf and R-2.4.0/src/library/grid/inst/doc/frame.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/grid.pdf and R-2.4.0/src/library/grid/inst/doc/grid.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/grobs.pdf and R-2.4.0/src/library/grid/inst/doc/grobs.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/interactive.pdf and R-2.4.0/src/library/grid/inst/doc/interactive.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/locndimn.pdf and R-2.4.0/src/library/grid/inst/doc/locndimn.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/moveline.pdf and R-2.4.0/src/library/grid/inst/doc/moveline.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/nonfinite.pdf and R-2.4.0/src/library/grid/inst/doc/nonfinite.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/plotexample.pdf and R-2.4.0/src/library/grid/inst/doc/plotexample.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/rotated.pdf and R-2.4.0/src/library/grid/inst/doc/rotated.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/saveload.pdf and R-2.4.0/src/library/grid/inst/doc/saveload.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/sharing.pdf and R-2.4.0/src/library/grid/inst/doc/sharing.pdf differ +Binary files R-2.4.0.old/src/library/grid/inst/doc/viewports.pdf and R-2.4.0/src/library/grid/inst/doc/viewports.pdf differ +diff -urp R-2.4.0.old/src/library/grid/man/viewport.Rd R-2.4.0/src/library/grid/man/viewport.Rd +--- R-2.4.0.old/src/library/grid/man/viewport.Rd 2006-04-09 17:19:12.000000000 -0500 ++++ R-2.4.0/src/library/grid/man/viewport.Rd 2006-10-28 14:35:53.000000000 -0500 +@@ -5,7 +5,7 @@ + \alias{vpTree} + \title{Create a Grid Viewport} + \description{ +- These functions create viewports, which describe a rectangular regions ++ These functions create viewports, which describe rectangular regions + on a graphics device and define a number of coordinate systems within + those regions. + } +diff -urp R-2.4.0.old/src/library/methods/man/MethodSupport.Rd R-2.4.0/src/library/methods/man/MethodSupport.Rd +--- R-2.4.0.old/src/library/methods/man/MethodSupport.Rd 2006-04-09 17:19:10.000000000 -0500 ++++ R-2.4.0/src/library/methods/man/MethodSupport.Rd 2006-11-02 19:41:45.000000000 -0600 +@@ -11,7 +11,7 @@ + \usage{ + getMethodsForDispatch(f, fdef) + +-cacheMethod(f, sig, def, args, fdef) ++cacheMethod(f, sig, def, args, fdef, inherited = FALSE) + + resetGeneric(f, fdef, mlist, where, deflt) + } +@@ -29,7 +29,8 @@ resetGeneric(f, fdef, mlist, where, defl + \item{\code{cacheMethod}:}{ + Store the definition for this function and signature in the method + metadata for the function. Used to store extensions of coerce +- methods found through inheritance. ++ methods found through inheritance, and to cache methods with ++ \code{\link{callNextMethod}} information. + + No persistent effect, since the method metadata is session-scope + only. +diff -urp R-2.4.0.old/src/library/methods/man/seemsS4Object.Rd R-2.4.0/src/library/methods/man/seemsS4Object.Rd +--- R-2.4.0.old/src/library/methods/man/seemsS4Object.Rd 2006-09-04 09:41:08.000000000 -0500 ++++ R-2.4.0/src/library/methods/man/seemsS4Object.Rd 2006-11-02 19:41:45.000000000 -0600 +@@ -2,8 +2,8 @@ + \alias{seemsS4Object} + \title{Heuristic test for an object from an S4 class} + \description{ +- Returns \code{TRUE} if \code{object} seems to have been generated from +- a formally defined (\dQuote{S4}) class. ++ Returns \code{TRUE} if \code{object} has been generated from ++ a formally defined (\dQuote{S4}) class. DEPRECATED: use isS4(object) instead. + } + \usage{ + seemsS4Object(object) +@@ -13,9 +13,13 @@ seemsS4Object(object) + } + \details{ + The \code{\link{class}} of the object is examined for the \code{"package"} +- attribute included when objects are generated from an S4 class. ++ attribute included when objects are generated from an S4 class. The ++ test in this function has been superseded by an internal bit set ++ when S4 objects are generated. + +- This test can be fooled in at least two ways: ++ The \code{seemsS4Object} function is deprecated and will be removed. ++ ++ The test can be fooled in at least two ways: + \enumerate{ + \item It will give \code{TRUE} incorrectly if someone puts a + \code{"package"} string attribute on the class of an S3 object. +diff -urp R-2.4.0.old/src/library/methods/R/as.R R-2.4.0/src/library/methods/R/as.R +--- R-2.4.0.old/src/library/methods/R/as.R 2006-09-09 21:05:02.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/as.R 2006-11-02 19:41:45.000000000 -0600 +@@ -25,6 +25,7 @@ as <- + fdef = coerceFun, mlist = coerceMethods) + if(is.null(asMethod)) { + canCache <- TRUE ++ inherited <- FALSE + if(is(object, Class)) { + ClassDef <- getClassDef(Class, where) + ## use the ext information, computed or supplied +@@ -47,13 +48,17 @@ as <- + } + ## if none of these applies, look for an inherited method + ## but only on the from argument +- if(is.null(asMethod)) ++ if(is.null(asMethod)) { + asMethod <- selectMethod("coerce", sig, TRUE, + c(from = TRUE, to = FALSE), +- fdef = coerceFun, mlist = coerceMethods) ++ fdef = coerceFun, mlist = ++ coerceMethods) ++ inherited <- TRUE ++ } + ## cache in the coerce function's environment + if(canCache && !is.null(asMethod)) { +- cacheMethod("coerce", sig, asMethod, fdef = coerceFun) ++ cacheMethod("coerce", sig, asMethod, fdef = coerceFun, ++ inherited = inherited) + } + } + } +@@ -129,32 +134,36 @@ as <- + coerceMethods <- getMethodsForDispatch("coerce<-", coerceFun) + asMethod <- .quickCoerceSelect(thisClass, Class, coerceFun, coerceMethods) + if(is.null(asMethod)) { +- sig <- c(from=thisClass, to = Class) +- canCache <- TRUE +- asMethod <- selectMethod("coerce<-", sig, TRUE, FALSE, #optional, no inheritance +- fdef = coerceFun, mlist = coerceMethods) +- if(is.null(asMethod)) { +- if(is(object, Class)) { +- asMethod <- possibleExtends(thisClass, Class) +- if(identical(asMethod, TRUE)) {# trivial, probably identical classes +- class(value) <- class(object) +- return(value) +- } +- else { +- test <- asMethod@test +- asMethod <- asMethod@replace +- canCache <- (!is(test, "function")) || identical(body(test), TRUE) +- if(canCache) { ##the replace code is a bare function +- asMethod <- .asCoerceMethod(asMethod, sig, TRUE) ++ sig <- c(from=thisClass, to = Class) ++ canCache <- TRUE ++ inherited <- FALSE ++ asMethod <- selectMethod("coerce<-", sig, TRUE, FALSE, #optional, no inheritance ++ fdef = coerceFun, mlist = coerceMethods) ++ if(is.null(asMethod)) { ++ if(is(object, Class)) { ++ asMethod <- possibleExtends(thisClass, Class) ++ if(identical(asMethod, TRUE)) {# trivial, probably identical classes ++ class(value) <- class(object) ++ return(value) + } +- } +- } +- else +- asMethod <- selectMethod("coerce<-", sig, TRUE, c(from = TRUE, to = FALSE)) +- } ++ else { ++ test <- asMethod@test ++ asMethod <- asMethod@replace ++ canCache <- (!is(test, "function")) || identical(body(test), TRUE) ++ if(canCache) { ##the replace code is a bare function ++ asMethod <- .asCoerceMethod(asMethod, sig, TRUE) ++ } ++ } ++ } ++ else { # search for inherited method ++ asMethod <- selectMethod("coerce<-", sig, TRUE, c(from = TRUE, to = FALSE)) ++ inherited <- TRUE ++ } ++ } + ## cache for next call + if(canCache && !is.null(asMethod)) +- cacheMethod("coerce<-", sig, asMethod, fdef = coerceFun) ++ cacheMethod("coerce<-", sig, asMethod, fdef = coerceFun, ++ inherited = inherited) + } + if(is.null(asMethod)) + stop(gettextf("no method or default for as() replacement of \"%s\" with Class=\"%s\"", thisClass, Class), domain = NA) +diff -urp R-2.4.0.old/src/library/methods/R/is.R R-2.4.0/src/library/methods/R/is.R +--- R-2.4.0.old/src/library/methods/R/is.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/is.R 2006-10-28 14:35:53.000000000 -0500 +@@ -116,33 +116,25 @@ setIs <- + obj <- extensionObject + ## revise the superclass/subclass info in the stored class definition + .validExtends(class1, class2, classDef, classDef2, obj@simple) +- if(!classDef@sealed) { +- where1 <- findClass(class1, where)[[1]] +- if(!bindingIsLocked(m1, where1)) { +- ## the direct contains information +- elNamed(classDef@contains, class2) <- obj +- if(doComplete) +- classDef@contains <- completeExtends(classDef, class2, obj, where = where) +- assignClassDef(class1, classDef, where1) +- } +- } +- if(!classDef2@sealed) { +- where2 <- findClass(classDef2) +- if(length(where2) > 0) { +- where2 <- where2[[1]] +- if(!bindingIsLocked(m2, where2)) { +- elNamed(classDef2@subclasses, class1) <- obj +- if(doComplete) +- classDef2@subclasses <- completeSubclasses(classDef2, class1, obj, where) +- assignClassDef(class2, classDef2, where2) +- } +- .removePreviousCoerce(class1, class2, where, prevIs) +- } +- else +- stop(gettextf("Unable to find package environment for class \"%s\" to revise subclass information", class2)) ++ where2 <- findClass(classDef2) ++ if(length(where2) > 0) { ++ where2 <- where2[[1]] ++ elNamed(classDef2@subclasses, class1) <- obj ++ if(doComplete) ++ classDef2@subclasses <- completeSubclasses(classDef2, class1, obj, where) ++ assignClassDef(class2, classDef2, where2, TRUE) ++ .removePreviousCoerce(class1, class2, where, prevIs) + } ++ else ++ stop(gettextf("Unable to find package environment for class \"%s\" to revise subclass information", class2)) ++ where1 <- findClass(class1, where)[[1]] ++ ## the direct contains information ++ elNamed(classDef@contains, class2) <- obj ++ if(doComplete) ++ classDef@contains <- completeExtends(classDef, class2, obj, where = where) ++ assignClassDef(class1, classDef, where1, TRUE) + invisible(classDef) +-} ++ } + + .validExtends <- function(class1, class2, classDef1, classDef2, slotTests) { + .msg <- function(class1, class2) gettextf("class \"%s\" cannot extend class \"%s\"", class1, class2) +diff -urp R-2.4.0.old/src/library/methods/R/Methods.R R-2.4.0/src/library/methods/R/Methods.R +--- R-2.4.0.old/src/library/methods/R/Methods.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/Methods.R 2006-11-02 19:41:45.000000000 -0600 +@@ -81,6 +81,16 @@ setGeneric <- + } + if(doUncache) + .uncacheGeneric(name, oldDef) ++ groups = fdef@group ++ for(group in groups) { # add as member of group generic(s) if not there ++ gdef <- getGeneric(group) ++ if(is(gdef, "groupGenericFunction") && ++ is.na(match(fdef@generic, as.character(gdef@groupMembers)))) { ++ gwhere <- .genEnv(group, where) ++ gdef@groupMembers <- c(gdef@groupMembers, list(fdef@generic)) ++ assign(group, gdef, gwhere) ++ } ++ } + assign(name, fdef, where) + .cacheGeneric(name, fdef) + if(!.UsingMethodsTables() && +@@ -265,10 +275,18 @@ getMethodsForDispatch <- function(f, fde + cacheMethod <- + ## cache the given definition in the method metadata for f + ## Support function: DON'T USE DIRECTLY (does no checking) +- function(f, sig, def, args = names(sig), fdef) { ++ function(f, sig, def, args = names(sig), fdef, inherited = FALSE) { + ev <- environment(fdef) +- if(.UsingMethodsTables()) +- .cacheMethodInTable(fdef, sig, def, .getMethodsTable(fdef, ev)) ++ if(.UsingMethodsTables()) { ++ .cacheMethodInTable(fdef, sig, def, ++ .getMethodsTable(fdef, ev, inherited = inherited)) ++ ## if this is not an inherited method, update the inherited table as well ++ ## TODO: in this case, should uncache inherited methods, though the callin ++ ## function will normally have done this. ++ if(!inherited) ++ .cacheMethodInTable(fdef, sig, def, ++ .getMethodsTable(fdef, ev, inherited = TRUE)) ++ } + else { + methods <- get(".Methods", envir = ev) + methods <- insertMethod(methods, sig, args, def, TRUE) +@@ -280,6 +298,9 @@ cacheMethod <- + } + } + ++.removeCachedMethod <- function(f, sig, fdef = getGeneric(f)) ++ cacheMethod(f, sig, NULL, names(sig), fdef) ++ + + setMethod <- + ## Define a method for the specified combination of generic function and signature. +diff -urp R-2.4.0.old/src/library/methods/R/methodsTable.R R-2.4.0/src/library/methods/R/methodsTable.R +--- R-2.4.0.old/src/library/methods/R/methodsTable.R 2006-09-13 21:05:02.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/methodsTable.R 2006-11-02 19:41:45.000000000 -0600 +@@ -1,5 +1,3 @@ +-options(error=traceback, warn = 1) +- + ### merge version called from namespace imports code. Hope to avoid using generic + .mergeMethodsTable2 <- function(table, newtable, envir, metaname) { + old <- objects(table, all=TRUE) +@@ -138,7 +136,7 @@ options(error=traceback, warn = 1) + ## also Called from cacheMethod (from as(), + ## as<-()) + fenv <- environment(fdef) +- if(!exists(".AllMTable", envir = fenv, inherits = TRUE)) ++ if(!exists(".AllMTable", envir = fenv, inherits = FALSE)) + .setupMethodsTables(fdef) + sig <- .matchSigLength(sig, fdef, fenv, TRUE) + label <- .sigLabel(sig) +@@ -407,15 +405,31 @@ options(error=traceback, warn = 1) + mlist <- generic@default + else + mlist <- get(".Methods", envir = env, inherits = FALSE) +- if(initialize || !exists(".SigLength", envir = env, inherits = FALSE)) +- assign(".SigLength", 1, envir = env) +- ## check that groups of generics agree on .SigLength; otherwise +- ## labels won't match ++ if(initialize || !exists(".SigLength", envir = env, inherits = FALSE)) { ++ nsig <- 1 ++ ## check that groups of generics agree on .SigLength; otherwise ++ ## labels won't match ++ for(gp in generic@group) { ++ gpDef <- getGeneric(gp) ++ if(is(gpDef, "genericFunction")) { ++ .getMethodsTable(gpDef) # force initialization ++ nsig <- max(nsig, get(".SigLength", envir = environment(gpDef))) ++ } ++ } ++ assign(".SigLength", nsig, envir = env) ++ } + argSyms <- lapply(generic@signature, as.name) + assign(".SigArgs", argSyms, envir = env) + mtable <- .mlistAddToTable(generic, mlist) + assign(".MTable", mtable, envir = env) + .resetInheritedMethods(env, mtable) ++ if(is(generic, "groupGenericFunction")) { ++ for(gp in generic@groupMembers) { ++ gpDef <- getGeneric(gp) ++ if(is(gpDef, "genericFunction")) ++ .getMethodsTable(gpDef) # force initialization w. group methods ++ } ++ } + } + + .updateMethodsInTable <- function(generic, where, attach) { +diff -urp R-2.4.0.old/src/library/methods/R/NextMethod.R R-2.4.0/src/library/methods/R/NextMethod.R +--- R-2.4.0.old/src/library/methods/R/NextMethod.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/NextMethod.R 2006-11-02 19:41:45.000000000 -0600 +@@ -96,7 +96,7 @@ callNextMethod <- function(...) { + method <- addNextMethod(method, f, envir=methodEnv) + ## cache the method with the nextMethod included, + ## so later calls will load this information. +- cacheMethod(f, method@target, method, fdef = getGeneric(f)) ++ cacheMethod(f, method@target, method, fdef = getGeneric(f), inherited = TRUE) + } + nextMethod <- method@nextMethod + assign(".nextMethod", nextMethod, envir = callEnv) +diff -urp R-2.4.0.old/src/library/methods/R/RClassUtils.R R-2.4.0/src/library/methods/R/RClassUtils.R +--- R-2.4.0.old/src/library/methods/R/RClassUtils.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/RClassUtils.R 2006-10-28 14:35:53.000000000 -0500 +@@ -412,7 +412,7 @@ isVirtualClass <- + + assignClassDef <- + ## assign the definition of the class to the specially named object +- function(Class, def, where = .GlobalEnv) { ++ function(Class, def, where = .GlobalEnv, force = FALSE) { + if(!is(def,"classRepresentation")) + stop(gettextf("trying to assign an object of class \"%s\" as the definition of class \"%s\": must supply a \"classRepresentation\" object", + class(def), Class), domain = NA) +@@ -420,8 +420,18 @@ assignClassDef <- + if(!.identC(Class, clName)) + stop(gettextf("assigning as \"%s\" a class representation with internal name \"%s\"", + Class, def@className), domain = NA) ++ where <- as.environment(where) ++ mname <- classMetaName(Class) ++ if(exists(mname, envir = where, inherits = FALSE) && bindingIsLocked(mname, where)) { ++ if(force) ++ .assignOverBinding(mname, def, where, FALSE) ++ else ++ stop(gettextf("Class \"%s\" has a locked definition in package \"%s\"", ++ Class, getPackageName(where))) ++ } ++ else ++ assign(mname, def, where) + .cacheClass(clName, def) +- assign(classMetaName(Class), def, where) + } + + +@@ -1445,13 +1455,13 @@ substituteFunctionArgs <- function(def, + + ## bootstrap version: all classes and methods must be in the version of the methods + ## package being built in the toplevel environment: MUST avoid require("methods") ! +-.requirePackage <- function(package) ++.requirePackage <- function(package, mustFind = TRUE) + topenv(parent.frame()) + + .PackageEnvironments <- new.env(hash=TRUE) # caching for required packages + + ## real version of .requirePackage +-..requirePackage <- function(package) { ++..requirePackage <- function(package, mustFind = TRUE) { + value <- package + if(is.character(package)) { + if(package %in% loadedNamespaces()) +@@ -1473,9 +1483,13 @@ substituteFunctionArgs <- function(def, + if(exists(".packageName", topEnv, inherits=TRUE) && + .identC(package, get(".packageName", topEnv))) + return(topEnv) # kludge for source'ing package code +- if(!require(package, character.only = TRUE)) +- stop(gettextf("unable to find required package \"%s\"", package), +- domain = NA) ++ if(!require(package, character.only = TRUE)) { ++ if(mustFind) ++ stop(gettextf("unable to find required package \"%s\"", package), ++ domain = NA) ++ else ++ return(NULL) ++ } + value <- .asEnvironmentPackage(package) + assign(package, value, envir = .PackageEnvironments) + value +@@ -1662,3 +1676,27 @@ substituteFunctionArgs <- function(def, + } + } + ++.removeSubClass <- function(class, subclass, where) { ++ mname <- classMetaName(class) ++ where <- as.environment(where) ++ if(exists(mname, envir = where, inherits = FALSE)) { ++ cdef <- get(mname, envir = where) ++ subclasses <- cdef@subclasses ++ ii <- match(subclass, names(subclasses), 0) ++ ## the subclass may not be there, e.g., if an error occured in ++ ## setClass, or (in 2.4.0) if class is sealed ++ if(ii > 0) { ++ cdef@subclasses <- subclasses[-ii] ++ assign(mname, cdef, envir = where) ++ } ++ sig <- signature(from=subclass, to=class) ++ if(existsMethod("coerce", sig)) ++ .removeCachedMethod("coerce", sig) ++ if(existsMethod("coerce<-", sig)) ++ .removeCachedMethod("coerce<-", sig) ++ .uncacheClass(class, cdef) ++ } ++ else ++ warning(gettextf("No class \"%s\" found as expected in removing subclass \"%s\"", ++ class, subclass)) ++} +diff -urp R-2.4.0.old/src/library/methods/R/RMethodUtils.R R-2.4.0/src/library/methods/R/RMethodUtils.R +--- R-2.4.0.old/src/library/methods/R/RMethodUtils.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/RMethodUtils.R 2006-10-28 14:35:53.000000000 -0500 +@@ -392,6 +392,7 @@ rematchDefinition <- function(definition + newCall <- as.call(newCall) + newBody <- substitute({.local <- DEF; NEWCALL}, + list(DEF = definition, NEWCALL = newCall)) ++ generic <- .copyMethodDefaults(generic, definition) + body(generic, envir = environment(definition)) <- newBody + generic + } +@@ -464,6 +465,12 @@ getGeneric <- + .cacheGeneric(f, value) + } + } ++ if(is.null(value) && nchar(package)>0 && !identical(package, "base")) { ++ env <- .requirePackage(package, FALSE) ++ if(is.environment(env)) ++ value <- .Call("R_getGeneric", f, FALSE, env, package, ++ PACKAGE = "methods") ++ } + value + } + +@@ -1375,3 +1382,25 @@ deletePrimMethods <- function(f, env) { + + .primname <- function(object) + .Call("R_get_primname", object, PACKAGE = "base") ++ ++.copyMethodDefaults <- function(generic, method) { ++ emptyDefault <- function(value) missing(value) || (is.name(value) && (nchar(as.character(value))>0)) ++ fg <- formals(generic) ++ mg <- formals(method) ++ mgn <- names(mg) ++ changed <- FALSE ++ for(what in names(fg)) { ++ i <- match(what, mgn, 0) ++ if(i> 0) { ++ deflt <- mg[[i]] ++ if(!(emptyDefault(deflt) || identical(deflt, fg[[what]]))) { ++ fg[[what]] <- deflt ++ changed <- TRUE ++ } ++ } ++ } ++ if(changed) ++ formals(generic) <- fg ++ generic ++} ++ +diff -urp R-2.4.0.old/src/library/methods/R/SClasses.R R-2.4.0/src/library/methods/R/SClasses.R +--- R-2.4.0.old/src/library/methods/R/SClasses.R 2006-09-17 21:05:04.000000000 -0500 ++++ R-2.4.0/src/library/methods/R/SClasses.R 2006-10-28 14:35:53.000000000 -0500 +@@ -309,6 +309,19 @@ removeClass <- function(Class, where = + "\") has defined subclasses that should also be removed: (", + paste(as.character(subclasses[found]), collapse = ", "), ")") + } ++ if(length(classDef@contains)>0) { ++ superclasses <- names(classDef@contains) ++ for(what in superclasses) { ++ superWhere <- findClass(what, classWhere) ++ if(length(superWhere)>0) { ++ superWhere <- superWhere[[1]] ++ .removeSubClass(what, Class, superWhere) ++ } ++ else ++ warning(gettextf("Couldn't find superclass \"%s\" to clean up when removing class \"%s\"", ++ what, Class)) ++ } ++ } + .uncacheClass(Class, classDef) + .undefineMethod("initialize", Class, classWhere) + what <- classMetaName(Class) +Only in R-2.4.0/src/library/Recommended: lattice_0.14-12.tar.gz +Only in R-2.4.0.old/src/library/Recommended: lattice_0.14-9.tar.gz +Binary files R-2.4.0.old/src/library/Recommended/lattice.tgz and R-2.4.0/src/library/Recommended/lattice.tgz differ +Only in R-2.4.0.old/src/library/Recommended: mgcv_1.3-19.tar.gz +Only in R-2.4.0/src/library/Recommended: mgcv_1.3-20.tar.gz +Binary files R-2.4.0.old/src/library/Recommended/mgcv.tgz and R-2.4.0/src/library/Recommended/mgcv.tgz differ +diff -urp R-2.4.0.old/src/library/stats/man/lowess.Rd R-2.4.0/src/library/stats/man/lowess.Rd +--- R-2.4.0.old/src/library/stats/man/lowess.Rd 2006-04-09 17:19:48.000000000 -0500 ++++ R-2.4.0/src/library/stats/man/lowess.Rd 2006-10-28 14:35:57.000000000 -0500 +@@ -1,5 +1,10 @@ + \name{lowess} + \title{Scatter Plot Smoothing} ++\description{ ++ This function performs the computations for the ++ \emph{LOWESS} smoother which uses locally-weighted polynomial ++ regression (see the references). ++} + \usage{ + lowess(x, y = NULL, f = 2/3, iter = 3, + delta = 0.01 * diff(range(xy$x[o]))) +@@ -11,20 +16,40 @@ lowess(x, y = NULL, f = 2/3, iter = 3, + \item{f}{the smoother span. This gives the proportion of points in + the plot which influence the smooth at each value. + Larger values give more smoothness.} +- \item{iter}{the number of robustifying iterations which should be ++ \item{iter}{the number of \sQuote{robustifying} iterations which should be + performed. + Using smaller values of \code{iter} will make \code{lowess} run faster.} +- \item{delta}{values of \code{x} which lie within \code{delta} +- of each other are replaced by a single value in the output from +- \code{lowess}. Defaults to 1/100th of the range of \code{x}.} ++ \item{delta}{See Details. Defaults to 1/100th of the range of \code{x}.} + } +-\description{ +- This function performs the computations for the +- \emph{LOWESS} smoother (see the reference below). ++\details{ ++ \code{lowess} is defined by a complex algorithm, the Ratfor original ++ of which (by W. S. Cleveland) can be found in the \R sources as file ++ \file{src/appl/lowess.doc}. Normally a local linear polynomial fit is ++ used, but under some circumstances (see the file) a local constant fit ++ can be used. \sQuote{Local} is defined by the distance to the ++ \code{floor(f*n)}th nearest neighbour, and tricubic weighting is used ++ for \code{x} which fall within the neighbourhood. ++ ++ The initial fit is done using weighted least squares. If ++ \code{iter > 0}, further weighted fits are done using the product of ++ the weights from the proximity of the \code{x} values and case weights ++ derived from the residuals at the previous iteration. Specifically, ++ the case weight is Tukey's biweight, with cutoff 6 times the MAD of the ++ residuals. (The current \R implementation differs from the original ++ in stopping iteration if the MAD is effectively zero since the ++ algorithm is highly unstable in that case.) ++ ++ \code{delta} is used to speed up computation: instead of computing the ++ local polynomial fit at each data point it is not computed for points ++ within \code{delta} of the last computed point, and linear ++ interpolation is used to fill in the fitted values for the skipped ++ points. ++} ++\value{ + \code{lowess} returns a list containing components + \code{x} and \code{y} which give the coordinates of the smooth. +- The smooth should be added to a plot of the original +- points with the function \code{lines}. ++ The smooth can be added to a plot of the original ++ points with the function \code{lines}: see the examples. + } + \references{ + Becker, R. A., Chambers, J. M. and Wilks, A. R. (1988) +diff -urp R-2.4.0.old/src/library/stats/man/prcomp.Rd R-2.4.0/src/library/stats/man/prcomp.Rd +--- R-2.4.0.old/src/library/stats/man/prcomp.Rd 2006-05-18 04:13:52.000000000 -0500 ++++ R-2.4.0/src/library/stats/man/prcomp.Rd 2006-10-30 10:45:48.000000000 -0600 +@@ -91,7 +91,7 @@ prcomp(x, \dots) + (centered and possibly scaled) data matrix, not by using + \code{eigen} on the covariance matrix. This + is generally the preferred method for numerical accuracy. The +- \code{print} method for the these objects prints the results in a nice ++ \code{print} method for these objects prints the results in a nice + format and the \code{plot} method produces a scree plot. + + Note that \code{scale = TRUE} cannot be used if there are zero or +diff -urp R-2.4.0.old/src/library/stats/man/princomp.Rd R-2.4.0/src/library/stats/man/princomp.Rd +--- R-2.4.0.old/src/library/stats/man/princomp.Rd 2006-05-18 04:13:52.000000000 -0500 ++++ R-2.4.0/src/library/stats/man/princomp.Rd 2006-10-30 10:45:48.000000000 -0600 +@@ -91,7 +91,7 @@ princomp(x, \dots) + Note that the default calculation uses divisor \code{N} for the + covariance matrix. + +- The \code{\link{print}} method for the these objects prints the ++ The \code{\link{print}} method for these objects prints the + results in a nice format and the \code{\link{plot}} method produces + a scree plot (\code{\link{screeplot}}). There is also a + \code{\link{biplot}} method. +diff -urp R-2.4.0.old/src/library/stats/man/ts.Rd R-2.4.0/src/library/stats/man/ts.Rd +--- R-2.4.0.old/src/library/stats/man/ts.Rd 2006-09-04 09:41:28.000000000 -0500 ++++ R-2.4.0/src/library/stats/man/ts.Rd 2006-10-28 14:35:57.000000000 -0500 +@@ -53,7 +53,7 @@ is.ts(x) + attributes) which represent data which has been sampled at equispaced + points in time. In the matrix case, each column of the matrix + \code{data} is assumed to contain a single (univariate) time series. +- Time series must have an least one observation, and although they need ++ Time series must have at least one observation, and although they need + not be numeric there is very limited support for non-numeric series. + + Class \code{"ts"} has a number of methods. In particular arithmetic +diff -urp R-2.4.0.old/src/library/stats/R/add.R R-2.4.0/src/library/stats/R/add.R +--- R-2.4.0.old/src/library/stats/R/add.R 2006-09-06 21:05:05.000000000 -0500 ++++ R-2.4.0/src/library/stats/R/add.R 2006-10-28 14:35:56.000000000 -0500 +@@ -112,7 +112,8 @@ add1.lm <- function(object, scope, scale + z <- if(iswt) lm.wfit(X, y, wt, offset=offset) + else lm.fit(X, y, offset=offset) + dfs[1] <- z$rank +- RSS[1] <- deviance.lm(z) ++ class(z) <- "lm" # needed as deviance.lm calls generic residuals() ++ RSS[1] <- deviance(z) + ## workaround for PR#7842. terms.formula may have flipped interactions + sTerms <- sapply(strsplit(Terms, ":", fixed=TRUE), + function(x) paste(sort(x), collapse=":")) +@@ -122,8 +123,9 @@ add1.lm <- function(object, scope, scale + X <- x[, usex|ousex, drop = FALSE] + z <- if(iswt) lm.wfit(X, y, wt, offset=offset) + else lm.fit(X, y, offset=offset) ++ class(z) <- "lm" # needed as deviance.lm calls generic residuals() + dfs[tt] <- z$rank +- RSS[tt] <- deviance.lm(z) ++ RSS[tt] <- deviance(z) + } + if(scale > 0) aic <- RSS/scale - n + k*dfs + else aic <- n * log(RSS/n) + k*dfs +diff -urp R-2.4.0.old/src/library/stats4/R/mle.R R-2.4.0/src/library/stats4/R/mle.R +--- R-2.4.0.old/src/library/stats4/R/mle.R 2006-04-09 17:19:08.000000000 -0500 ++++ R-2.4.0/src/library/stats4/R/mle.R 2006-10-28 14:35:52.000000000 -0500 +@@ -33,6 +33,7 @@ mle <- function(minuslogl, start=formals + if (any(is.na(oo))) + stop("some named arguments in 'start' are not arguments to the supplied log-likelihood") + start <- start[order(oo)] ++ nm <- names(start) ## reordered names needed + f <- function(p){ + l <- as.list(p) + names(l) <- nm +diff -urp R-2.4.0.old/src/library/tcltk/man/tcltk-package.Rd R-2.4.0/src/library/tcltk/man/tcltk-package.Rd +--- R-2.4.0.old/src/library/tcltk/man/tcltk-package.Rd 2006-04-09 17:19:08.000000000 -0500 ++++ R-2.4.0/src/library/tcltk/man/tcltk-package.Rd 2006-10-28 14:35:52.000000000 -0500 +@@ -16,7 +16,7 @@ and references in those files for more. + + The Tcl/Tk documentation is in + #ifdef windows +-\code{R_HOME/Tcl/doc}. ++\file{\link{R_HOME}/Tcl/doc}. + #endif + #ifdef unix + the system man pages. +@@ -27,7 +27,7 @@ For a complete list of functions, use \c + #ifdef unix + Note that Tk will not be initialized if there is no \code{DISPLAY} + variable set, but Tcl can still be used. This is most useful to allow +-the loading of a package which depends on \pkg{TclTk} in a session that ++the loading of a package which depends on \pkg{tcltk} in a session that + does not actually use it (e.g. during installation). + #endif + } +diff -urp R-2.4.0.old/src/library/utils/man/unix/RHOME.Rd R-2.4.0/src/library/utils/man/unix/RHOME.Rd +--- R-2.4.0.old/src/library/utils/man/unix/RHOME.Rd 2006-04-09 17:19:06.000000000 -0500 ++++ R-2.4.0/src/library/utils/man/unix/RHOME.Rd 2006-10-28 14:35:52.000000000 -0500 +@@ -1,6 +1,5 @@ + \name{RHOME} + \alias{RHOME} +-\alias{R_HOME} + \title{R Home Directory} + \description{ + Returns the location of the \R home directory, which is the root of +diff -urp R-2.4.0.old/src/library/utils/man/windows/clipboard.Rd R-2.4.0/src/library/utils/man/windows/clipboard.Rd +--- R-2.4.0.old/src/library/utils/man/windows/clipboard.Rd 2006-04-09 17:19:05.000000000 -0500 ++++ R-2.4.0/src/library/utils/man/windows/clipboard.Rd 2006-11-01 19:41:41.000000000 -0600 +@@ -2,6 +2,7 @@ + \alias{getClipboardFormats} + \alias{readClipboard} + \alias{writeClipboard} ++\alias{clipboard} + \title{Read/Write to/from the Windows Clipboard} + \description{ + Transfer text between a character vector and the Windows clipboard. +@@ -18,8 +19,10 @@ writeClipboard(str, format = 1) + } + \value{ + For \code{getClipboardFormats}, an integer vector of available formats. ++ + For \code{readClipboard}, a character vector by default, a raw vector if \code{raw} is + \code{TRUE}, or \code{NULL}, if the format is unavailable. ++ + For \code{writeClipboard} an invisible logical indicating success or failure. + } + \details{ +diff -urp R-2.4.0.old/src/library/utils/R/question.R R-2.4.0/src/library/utils/R/question.R +--- R-2.4.0.old/src/library/utils/R/question.R 2006-04-09 17:19:05.000000000 -0500 ++++ R-2.4.0/src/library/utils/R/question.R 2006-10-28 14:35:51.000000000 -0500 +@@ -79,12 +79,10 @@ topicName <- function(type, topic) + stop(gettextf("error in trying to evaluate the expression for argument '%s' (%s)", + arg, deparse(argExpr)), + domain = NA) +- methods::"elNamed<-"(sigClasses, arg, +- class(argVal)) ++ sigClasses[[arg]] <- class(argVal) + } + else +- methods::"elNamed<-"(sigClasses, arg, +- as.character(argExpr)) ++ sigClasses[[arg]] <- as.character(argExpr) + } + } + method <- methods::selectMethod(f, sigClasses, optional=TRUE, +diff -urp R-2.4.0.old/src/library/utils/R/str.R R-2.4.0/src/library/utils/R/str.R +--- R-2.4.0.old/src/library/utils/R/str.R 2006-09-18 21:05:14.000000000 -0500 ++++ R-2.4.0/src/library/utils/R/str.R 2006-11-03 19:41:46.000000000 -0600 +@@ -103,14 +103,11 @@ str.default <- + mod <- ""; char.like <- FALSE + if(give.attr) a <- attributes(object)#-- save for later... + +- if(is.function(object)) { +- cat(if(is.null(ao <- args(object))) deparse(object) +- else { dp <- deparse(ao); paste(dp[-length(dp)], collapse="\n") },"\n") +- } else if (is.null(object)) ++ if (is.null(object)) + cat(" NULL\n") + else if(S4) { + a <- sapply(methods::.slotNames(object), methods::slot, +- object=object, simplify = FALSE) ++ object=object, simplify = FALSE) + cat("Formal class", " '", paste(cl, collapse = "', '"), + "' [package \"", attr(cl,"package"), "\"] with ", + length(a)," slots\n", sep="") +@@ -120,7 +117,10 @@ str.default <- + nchar.max = nchar.max, give.attr = give.attr, width=width) + return(invisible()) + } +- else if(is.list(object)) { ++ else if(is.function(object)) { ++ cat(if(is.null(ao <- args(object))) deparse(object) ++ else { dp <- deparse(ao); paste(dp[-length(dp)], collapse="\n") },"\n") ++ } else if(is.list(object)) { + i.pl <- is.pairlist(object) + is.d.f <- is.data.frame(object) + ##?if(is.d.f) std.attr <- c(std.attr, "class", if(is.d.f) "row.names") +diff -urp R-2.4.0.old/src/main/character.c R-2.4.0/src/main/character.c +--- R-2.4.0.old/src/main/character.c 2006-09-04 09:41:33.000000000 -0500 ++++ R-2.4.0/src/main/character.c 2006-10-28 14:35:58.000000000 -0500 +@@ -718,6 +718,8 @@ SEXP attribute_hidden do_abbrev(SEXP cal + SET_STRING_ELT(ans, i, NA_STRING); + else { + warn = warn | !utf8strIsASCII(CHAR(STRING_ELT(x, i))); ++ if(strlen(CHAR(STRING_ELT(x, i))) >= MAXELTSIZE) ++ errorcall(call, "element %d is too long", i+1); + SET_STRING_ELT(ans, i, + stripchars(STRING_ELT(x, i), minlen)); + } +diff -urp R-2.4.0.old/src/main/CommandLineArgs.c R-2.4.0/src/main/CommandLineArgs.c +--- R-2.4.0.old/src/main/CommandLineArgs.c 2006-09-04 09:41:33.000000000 -0500 ++++ R-2.4.0/src/main/CommandLineArgs.c 2006-10-29 10:45:43.000000000 -0600 +@@ -85,6 +85,10 @@ do_commandArgs(SEXP call, SEXP op, SEXP + return vals; + } + ++#ifdef Win32 ++extern int R_LoadRconsole; ++#endif ++ + void + R_common_command_line(int *pac, char **argv, Rstart Rp) + { +@@ -141,6 +145,9 @@ R_common_command_line(int *pac, char **a + Rp->LoadInitFile = FALSE; /* --no-init-file */ + R_RestoreHistory = 0; /* --no-restore-history */ + Rp->NoRenviron = TRUE; ++#ifdef Win32 ++ R_LoadRconsole = 0; ++#endif + } + else if (!strcmp(*av, "--no-environ")) { + Rp->NoRenviron = TRUE; +@@ -174,6 +181,11 @@ R_common_command_line(int *pac, char **a + R_StdinEnc[30] = '\0'; + } + } ++#ifdef Win32 ++ else if (!strcmp(*av, "--no-Rconsole")) { ++ R_LoadRconsole = 0; ++ } ++#endif + else if (!strcmp(*av, "-save") || + !strcmp(*av, "-nosave") || + !strcmp(*av, "-restore") || +diff -urp R-2.4.0.old/src/main/connections.c R-2.4.0/src/main/connections.c +--- R-2.4.0.old/src/main/connections.c 2006-09-13 21:05:06.000000000 -0500 ++++ R-2.4.0/src/main/connections.c 2006-10-28 14:35:57.000000000 -0500 +@@ -1177,7 +1177,7 @@ SEXP attribute_hidden do_gzfile(SEXP cal + PROTECT(ans = allocVector(INTSXP, 1)); + INTEGER(ans)[0] = ncon; + PROTECT(class = allocVector(STRSXP, 2)); +- SET_STRING_ELT(class, 0, mkChar("file")); ++ SET_STRING_ELT(class, 0, mkChar("gzfile")); + SET_STRING_ELT(class, 1, mkChar("connection")); + classgets(ans, class); + UNPROTECT(2); +diff -urp R-2.4.0.old/src/main/deparse.c R-2.4.0/src/main/deparse.c +--- R-2.4.0.old/src/main/deparse.c 2006-09-11 21:05:02.000000000 -0500 ++++ R-2.4.0/src/main/deparse.c 2006-11-03 19:41:47.000000000 -0600 +@@ -245,6 +245,7 @@ static SEXP deparse1WithCutoff(SEXP call + if (abbrev) { + char data[14]; + strncpy(data, CHAR(STRING_ELT(svec, 0)), 10); ++ data[10] = '\0'; + if (strlen(CHAR(STRING_ELT(svec, 0))) > 10) strcat(data, "..."); + svec = mkString(data); + } else if(R_BrowseLines > 0 && +diff -urp R-2.4.0.old/src/main/plot3d.c R-2.4.0/src/main/plot3d.c +--- R-2.4.0.old/src/main/plot3d.c 2006-09-07 21:05:22.000000000 -0500 ++++ R-2.4.0/src/main/plot3d.c 2006-10-28 14:35:58.000000000 -0500 +@@ -1475,6 +1475,7 @@ SEXP attribute_hidden do_contour(SEXP ca + warning(_("all z values are equal")); + else + warning(_("all z values are NA")); ++ UNPROTECT(4); + return R_NilValue; + } + +diff -urp R-2.4.0.old/src/main/saveload.c R-2.4.0/src/main/saveload.c +--- R-2.4.0.old/src/main/saveload.c 2006-09-25 21:05:07.000000000 -0500 ++++ R-2.4.0/src/main/saveload.c 2006-10-28 14:35:58.000000000 -0500 +@@ -2358,6 +2358,7 @@ SEXP attribute_hidden do_loadFromConn2(S + PROTECT(res = RestoreToEnv(R_Unserialize(&in), aenv)); + if (wasopen) { + endcontext(&cntxt); ++ } else { + con->close(con); + } + UNPROTECT(1); +diff -urp R-2.4.0.old/src/main/subscript.c R-2.4.0/src/main/subscript.c +--- R-2.4.0.old/src/main/subscript.c 2006-09-04 09:41:33.000000000 -0500 ++++ R-2.4.0/src/main/subscript.c 2006-10-28 14:35:58.000000000 -0500 +@@ -369,7 +369,8 @@ static SEXP stringSubscript(SEXP s, int + int i, j, nnames, sub, extra; + int canstretch = *stretch; + #ifdef USE_HASHING +- Rboolean usehashing = in && (ns * nx > 1000); ++ /* product may overflow, so check factors as well. */ ++ Rboolean usehashing = in && ( (ns > 1000 && nx) || (nx > 1000 && ns) || (ns * nx > 1000) ); + #else + Rboolean usehashing = FALSE; + #endif +diff -urp R-2.4.0.old/src/main/sysutils.c R-2.4.0/src/main/sysutils.c +--- R-2.4.0.old/src/main/sysutils.c 2006-09-07 21:05:22.000000000 -0500 ++++ R-2.4.0/src/main/sysutils.c 2006-10-31 19:41:45.000000000 -0600 +@@ -170,6 +170,7 @@ FILE *R_popen(char *command, char *type) + #ifdef __APPLE_CC__ + /* Luke recommends this to fix PR#1140 */ + sigset_t ss; ++ sigemptyset(&ss); + sigaddset(&ss, SIGPROF); + sigprocmask(SIG_BLOCK, &ss, NULL); + fp = popen(command, type); +@@ -187,6 +188,7 @@ int R_system(char *command) + #ifdef __APPLE_CC__ + /* Luke recommends this to fix PR#1140 */ + sigset_t ss; ++ sigemptyset(&ss); + sigaddset(&ss, SIGPROF); + sigprocmask(SIG_BLOCK, &ss, NULL); + #ifdef HAVE_AQUA +diff -urp R-2.4.0.old/src/modules/X11/dataentry.c R-2.4.0/src/modules/X11/dataentry.c +--- R-2.4.0.old/src/modules/X11/dataentry.c 2006-09-04 09:41:34.000000000 -0500 ++++ R-2.4.0/src/modules/X11/dataentry.c 2006-10-28 14:35:58.000000000 -0500 +@@ -1046,7 +1046,7 @@ static void printstring(char *ibuf, int + for(j=0;*(wcspc+j)!=L'\0';j++)wcs[j]=*(wcspc+j); + wcs[j]=L'\0'; + w_p=wcs; +- cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(wcs),NULL); ++ cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(s)-1,NULL); + s[cnt]='\0'; + if (textwidth(s, strlen(s)) < (bw - text_offset)) break; + *(++wcspc) = L'<'; +@@ -1056,7 +1056,7 @@ static void printstring(char *ibuf, int + for(j=0;*(wcspc+j)!=L'\0';j++)wcs[j]=*(wcspc+j); + wcs[j]=L'\0'; + w_p=wcs; +- cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(wcs),NULL); ++ cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(s)-1,NULL); + s[cnt]='\0'; + if (textwidth(s, strlen(s)) < (bw - text_offset)) break; + *(wcspbuf + i - 2) = L'>'; +@@ -1066,7 +1066,7 @@ static void printstring(char *ibuf, int + for(j=0;*(wcspc+j)!=L'\0';j++) wcs[j]=*(wcspc+j); + wcs[j]=L'\0'; + w_p=wcs; +- cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(wcs),NULL); ++ cnt=wcsrtombs(s,(const wchar_t **)&w_p,sizeof(s)-1,NULL); + + drawtext(x_pos + text_offset, y_pos + box_h - text_offset, s, cnt); + +@@ -2398,6 +2398,7 @@ static int last_wchar_bytes(char *str) + int cnt; + char last_mbs[8]; + char *mbs; ++ size_t bytes; + + mbs = (str == NULL) ? buf : str; + +@@ -2411,8 +2412,8 @@ static int last_wchar_bytes(char *str) + if(wcs[0] == L'\0') return 0; + + memset(last_mbs, 0, sizeof(last_mbs)); +- wcrtomb(last_mbs, wcs[cnt-1], &mb_st); +- return(strlen(last_mbs)); ++ bytes=wcrtomb(last_mbs, wcs[cnt-1], &mb_st); /* -Wall */ ++ return(bytes); + #else + return(1); + #endif +diff -urp R-2.4.0.old/src/modules/X11/rotated.c R-2.4.0/src/modules/X11/rotated.c +--- R-2.4.0.old/src/modules/X11/rotated.c 2006-04-09 17:19:54.000000000 -0500 ++++ R-2.4.0/src/modules/X11/rotated.c 2006-10-28 14:35:58.000000000 -0500 +@@ -2285,7 +2285,8 @@ static RotatedTextItem + /* where abouts does text actually lie in rotated image? */ + /* check angle within 0.5 degrees (0.008 radians) */ + if(fabs((double)angle)<0.008 || fabs((double)angle-M_PI/2)<0.008 || +- fabs((double)angle-M_PI)<0.008 || fabs((double)angle-3*M_PI/2)<0.008) { ++ fabs((double)angle-M_PI)<0.008 || fabs((double)angle-3*M_PI/2)<0.008 || ++ fabs((double)angle-2*M_PI)<0.008) { + xl=0; + xr=(double)item->cols_out; + xinc=0; +diff -urp R-2.4.0.old/src/scripts/texi2dvi R-2.4.0/src/scripts/texi2dvi +--- R-2.4.0.old/src/scripts/texi2dvi 2006-05-18 04:13:54.000000000 -0500 ++++ R-2.4.0/src/scripts/texi2dvi 2006-10-03 07:18:04.000000000 -0500 +@@ -27,7 +27,7 @@ + # the `--debug' option when making a bug report. + + # This string is expanded by rcs automatically when this file is checked out. +-rcs_revision='$Revision: 1.1 $' ++rcs_revision='$Revision: 1.1 $' + rcs_version=`set - $rcs_revision; echo $2` + program=`echo $0 | sed -e 's!.*/!!'` + version="texi2dvi (GNU Texinfo 4.8) $rcs_version +diff -urp R-2.4.0.old/SVN-REVISION R-2.4.0/SVN-REVISION +--- R-2.4.0.old/SVN-REVISION 2006-10-03 05:02:46.000000000 -0500 ++++ R-2.4.0/SVN-REVISION 2006-11-03 19:54:14.000000000 -0600 +@@ -1,2 +1,2 @@ +-Revision: 39566 +-Last Changed Date: 2006-10-03 ++Revision: 39789 ++Last Changed Date: 2006-11-03 +diff -urp R-2.4.0.old/tests/no-segfault.Rin R-2.4.0/tests/no-segfault.Rin +--- R-2.4.0.old/tests/no-segfault.Rin 2006-05-18 04:38:21.000000000 -0500 ++++ R-2.4.0/tests/no-segfault.Rin 2006-10-28 14:36:01.000000000 -0500 +@@ -41,7 +41,7 @@ dev.int <- c("X11", "x11", "pdf", "posts + misc.2 <- c("help.start", "browseEnv", + "gctorture", "q", "quit", "restart", "try", + "read.fwf", "source",## << MM thinks "FIXME" +- "data.entry", "dataentry", "de", apropos("^de\."), ++ "data.entry", "dataentry", "de", apropos("^de\\."), + "chooseCRANmirror", "setRepositories", "select.list") + if(.Platform$OS.type == "windows") { + dev.int <- c(dev.int, "bmp", "windows", "win.graph", "win.print", +diff -urp R-2.4.0.old/tests/reg-plot.ps.save R-2.4.0/tests/reg-plot.ps.save +--- R-2.4.0.old/tests/reg-plot.ps.save 2006-04-09 17:20:05.000000000 -0500 ++++ R-2.4.0/tests/reg-plot.ps.save 2006-10-28 14:36:01.000000000 -0500 +@@ -768,31 +768,31 @@ o + ep + %%Page: 4 4 + bp +-77.04 91.44 793.65 518.24 cl ++106.56 128.16 778.53 488.72 cl + 18.00 18.00 823.89 577.28 cl + /ps 18 def /Font1 findfont 18 s + 0 0 0 rgb +-111.19 100.22 (50-54) 0 0 0 t +-111.19 115.46 (55-59) 0 0 0 t +-111.19 130.71 (60-64) 0 0 0 t +-111.19 145.95 (65-69) 0 0 0 t +-111.19 161.19 (70-74) 0 0 0 t +-111.19 206.92 (50-54) 0 0 0 t +-111.19 222.16 (55-59) 0 0 0 t +-111.19 237.40 (60-64) 0 0 0 t +-111.19 252.65 (65-69) 0 0 0 t +-111.19 267.89 (70-74) 0 0 0 t +-111.19 313.62 (50-54) 0 0 0 t +-111.19 328.86 (55-59) 0 0 0 t +-111.19 344.10 (60-64) 0 0 0 t +-111.19 359.35 (65-69) 0 0 0 t +-111.19 374.59 (70-74) 0 0 0 t +-111.19 420.32 (50-54) 0 0 0 t +-111.19 435.56 (55-59) 0 0 0 t +-111.19 450.80 (60-64) 0 0 0 t +-111.19 466.05 (65-69) 0 0 0 t +-111.19 481.29 (70-74) 0 0 0 t +-168.93 91.44 793.65 518.24 cl ++126.31 134.57 (50-54) 0 0 0 t ++126.31 147.45 (55-59) 0 0 0 t ++126.31 160.33 (60-64) 0 0 0 t ++126.31 173.21 (65-69) 0 0 0 t ++126.31 186.08 (70-74) 0 0 0 t ++126.31 224.71 (50-54) 0 0 0 t ++126.31 237.59 (55-59) 0 0 0 t ++126.31 250.47 (60-64) 0 0 0 t ++126.31 263.34 (65-69) 0 0 0 t ++126.31 276.22 (70-74) 0 0 0 t ++126.31 314.85 (50-54) 0 0 0 t ++126.31 327.73 (55-59) 0 0 0 t ++126.31 340.61 (60-64) 0 0 0 t ++126.31 353.48 (65-69) 0 0 0 t ++126.31 366.36 (70-74) 0 0 0 t ++126.31 404.99 (50-54) 0 0 0 t ++126.31 417.87 (55-59) 0 0 0 t ++126.31 430.75 (60-64) 0 0 0 t ++126.31 443.62 (65-69) 0 0 0 t ++126.31 456.50 (70-74) 0 0 0 t ++184.05 128.16 778.53 488.72 cl + 0.7451 0.7451 0.7451 rgb + 0.75 setlinewidth + [ 0.00 4.00] 0 setdash +@@ -800,170 +800,170 @@ bp + 1 setlinejoin + 10.00 setmiterlimit + np +-168.93 106.68 m +-624.72 0 l ++184.05 141.04 m ++594.48 0 l + o + np +-168.93 121.93 m +-624.72 0 l ++184.05 153.91 m ++594.48 0 l + o + np +-168.93 137.17 m +-624.72 0 l ++184.05 166.79 m ++594.48 0 l + o + np +-168.93 152.41 m +-624.72 0 l ++184.05 179.67 m ++594.48 0 l + o + np +-168.93 167.65 m +-624.72 0 l ++184.05 192.54 m ++594.48 0 l + o + np +-168.93 213.38 m +-624.72 0 l ++184.05 231.18 m ++594.48 0 l + o + np +-168.93 228.62 m +-624.72 0 l ++184.05 244.05 m ++594.48 0 l + o + np +-168.93 243.87 m +-624.72 0 l ++184.05 256.93 m ++594.48 0 l + o + np +-168.93 259.11 m +-624.72 0 l ++184.05 269.81 m ++594.48 0 l + o + np +-168.93 274.35 m +-624.72 0 l ++184.05 282.68 m ++594.48 0 l + o + np +-168.93 320.08 m +-624.72 0 l ++184.05 321.31 m ++594.48 0 l + o + np +-168.93 335.32 m +-624.72 0 l ++184.05 334.19 m ++594.48 0 l + o + np +-168.93 350.57 m +-624.72 0 l ++184.05 347.07 m ++594.48 0 l + o + np +-168.93 365.81 m +-624.72 0 l ++184.05 359.95 m ++594.48 0 l + o + np +-168.93 381.05 m +-624.72 0 l ++184.05 372.82 m ++594.48 0 l + o + np +-168.93 426.78 m +-624.72 0 l ++184.05 411.45 m ++594.48 0 l + o + np +-168.93 442.02 m +-624.72 0 l ++184.05 424.33 m ++594.48 0 l + o + np +-168.93 457.26 m +-624.72 0 l ++184.05 437.21 m ++594.48 0 l + o + np +-168.93 472.51 m +-624.72 0 l ++184.05 450.08 m ++594.48 0 l + o + np +-168.93 487.75 m +-624.72 0 l ++184.05 462.96 m ++594.48 0 l + o + 0 0 0 rgb + 0.75 setlinewidth + [] 0 setdash +-192.07 106.68 4.05 c p1 +-240.04 121.93 4.05 c p1 +-292.63 137.17 4.05 c p1 +-438.39 152.41 4.05 c p1 +-575.85 167.65 4.05 c p1 +-256.65 213.38 4.05 c p1 +-338.75 228.62 4.05 c p1 +-455.92 243.87 4.05 c p1 +-618.29 259.11 4.05 c p1 +-770.51 274.35 4.05 c p1 +-194.84 320.08 4.05 c p1 +-222.51 335.32 4.05 c p1 +-301.85 350.57 4.05 c p1 +-399.64 365.81 4.05 c p1 +-615.52 381.05 4.05 c p1 +-222.51 426.78 4.05 c p1 +-281.56 442.02 4.05 c p1 +-362.74 457.26 4.05 c p1 +-492.82 472.51 4.05 c p1 +-723.46 487.75 4.05 c p1 ++206.07 141.04 4.05 c p1 ++251.72 153.91 4.05 c p1 ++301.76 166.79 4.05 c p1 ++440.47 179.67 4.05 c p1 ++571.27 192.54 4.05 c p1 ++267.52 231.18 4.05 c p1 ++345.65 244.05 4.05 c p1 ++457.15 256.93 4.05 c p1 ++611.66 269.81 4.05 c p1 ++756.51 282.68 4.05 c p1 ++208.70 321.31 4.05 c p1 ++235.04 334.19 4.05 c p1 ++310.54 347.07 4.05 c p1 ++403.60 359.95 4.05 c p1 ++609.02 372.82 4.05 c p1 ++235.04 411.45 4.05 c p1 ++291.22 424.33 4.05 c p1 ++368.48 437.21 4.05 c p1 ++492.26 450.08 4.05 c p1 ++711.74 462.96 4.05 c p1 + 18.00 18.00 823.89 577.28 cl + /ps 18 def /Font1 findfont 18 s + 0 0 0 rgb +-48.24 496.53 (Rural Male) 0 0 0 t +-48.24 389.83 (Rural Female) 0 0 0 t +-48.24 283.13 (Urban Male) 0 0 0 t +-48.24 176.43 (Urban Female) 0 0 0 t ++63.36 469.38 (Rural Male) 0 0 0 t ++63.36 379.24 (Rural Female) 0 0 0 t ++63.36 289.10 (Urban Male) 0 0 0 t ++63.36 198.96 (Urban Female) 0 0 0 t + 0.75 setlinewidth + [] 0 setdash + 1 setlinecap + 1 setlinejoin + 10.00 setmiterlimit + np +-206.83 91.44 m +-553.53 0 l ++220.11 128.16 m ++526.75 0 l + o + np +-206.83 91.44 m ++220.11 128.16 m + 0 -10.80 l + o + np +-299.08 91.44 m ++307.90 128.16 m + 0 -10.80 l + o + np +-391.34 91.44 m ++395.69 128.16 m + 0 -10.80 l + o + np +-483.60 91.44 m ++483.48 128.16 m + 0 -10.80 l + o + np +-575.85 91.44 m ++571.27 128.16 m + 0 -10.80 l + o + np +-668.11 91.44 m ++659.06 128.16 m + 0 -10.80 l + o + np +-760.36 91.44 m ++746.86 128.16 m + 0 -10.80 l + o +-206.83 52.56 (10) .5 0 0 t +-299.08 52.56 (20) .5 0 0 t +-391.34 52.56 (30) .5 0 0 t +-483.60 52.56 (40) .5 0 0 t +-575.85 52.56 (50) .5 0 0 t +-668.11 52.56 (60) .5 0 0 t +-760.36 52.56 (70) .5 0 0 t +-np +-168.93 91.44 m +-624.72 0 l +-0 426.80 l +--624.72 0 l +-0 -426.80 l ++220.11 89.28 (10) .5 0 0 t ++307.90 89.28 (20) .5 0 0 t ++395.69 89.28 (30) .5 0 0 t ++483.48 89.28 (40) .5 0 0 t ++571.27 89.28 (50) .5 0 0 t ++659.06 89.28 (60) .5 0 0 t ++746.86 89.28 (70) .5 0 0 t ++np ++184.05 128.16 m ++594.48 0 l ++0 360.56 l ++-594.48 0 l ++0 -360.56 l + o + 18.00 18.00 823.89 577.28 cl + /ps 22 def /Font2 findfont 22 s + 0 0 0 rgb +-481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t ++481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t + ep + %%Page: 5 5 + bp +@@ -3771,8 +3771,8 @@ np + 0 -7.20 l + o + /ps 12 def /Font1 findfont 12 s +-78.70 65.52 (1 e-11) .5 0 0 t +-222.02 65.52 (1 e+53) .5 0 0 t ++78.70 65.52 (1e-11) .5 0 0 t ++222.02 65.52 (1e+53) .5 0 0 t + 365.35 65.52 (1e+117) .5 0 0 t + 508.68 65.52 (1e+181) .5 0 0 t + 652.00 65.52 (1e+245) .5 0 0 t +@@ -3800,8 +3800,8 @@ np + 77.04 436.50 m + -7.20 0 l + o +-59.76 92.27 (1 e-10) .5 0 90 t +-59.76 178.32 (1 e+49) .5 0 90 t ++59.76 92.27 (1e-10) .5 0 90 t ++59.76 178.32 (1e+49) .5 0 90 t + 59.76 264.38 (1e+108) .5 0 90 t + 59.76 350.44 (1e+167) .5 0 90 t + 59.76 436.50 (1e+226) .5 0 90 t +diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R +--- R-2.4.0.old/tests/reg-tests-1.R 2006-09-25 21:05:07.000000000 -0500 ++++ R-2.4.0/tests/reg-tests-1.R 2006-10-28 14:36:01.000000000 -0500 +@@ -4494,3 +4494,20 @@ test <- 1:10 + try(test[2:4] <- ls) # fails + stopifnot(!exists("*tmp*", where=1)) + ## was true < 2.4.0 ++ ++ ++## merge on zero-row data frames ++L3 <- LETTERS[1:3] ++d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE)) ++e <- d[-1,] ++merge(d, e, by.x = "x", by.y = "x", all.x = TRUE) ++## ++ ++ ++## PR#9313 ++library(stats4) ++g <- function(x, y) -cos(x) + abs(y) ++fit1 <- mle(g, start = list(x = 0, y = 7)) ++fit2 <- mle(g, start = list(y = 7, x = 0)) ++stopifnot(all.equal(coef(fit1), coef(fit2))) ++## Found different solutions in 2.4.0, as names were not remapped in fit2 +diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R +--- R-2.4.0.old/tests/reg-tests-2.R 2006-09-22 21:05:09.000000000 -0500 ++++ R-2.4.0/tests/reg-tests-2.R 2006-10-28 14:36:01.000000000 -0500 +@@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",") + + + ### end of tests added in 2.4.0 ### ++ ++ ++## Platform-specific behaviour in lowess reported to R-help ++## 2006-10-12 by Frank Harrell ++x <- c(0,7,8,14,15,120,242) ++y <- c(122,128,130,158,110,110,92) ++lowess(x, y, iter=0) ++lowess(x, y) ++## MAD of iterated residuals was zero, and result depended on the platform. ++ ++ ++### end of tests added in 2.4.1 ### +diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save +--- R-2.4.0.old/tests/reg-tests-2.Rout.save 2006-09-25 21:05:07.000000000 -0500 ++++ R-2.4.0/tests/reg-tests-2.Rout.save 2006-10-28 14:36:01.000000000 -0500 +@@ -1,6 +1,6 @@ + +-R version 2.4.0 beta (2005-09-25 r39509) +-Copyright (C) The R Foundation for Statistical Computing ++R version 2.5.0 Under development (unstable) (2006-10-15 r39637) ++Copyright (C) 2006 The R Foundation for Statistical Computing + ISBN 3-900051-07-0 + + R is free software and comes with ABSOLUTELY NO WARRANTY. +@@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg + > + > ### end of tests added in 2.4.0 ### + > ++> ++> ## Platform-specific behaviour in lowess reported to R-help ++> ## 2006-10-12 by Frank Harrell ++> x <- c(0,7,8,14,15,120,242) ++> y <- c(122,128,130,158,110,110,92) ++> lowess(x, y, iter=0) ++$x ++[1] 0 7 8 14 15 120 242 ++ ++$y ++[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903 92.00003 ++ ++> lowess(x, y) ++$x ++[1] 0 7 8 14 15 120 242 ++ ++$y ++[1] 122 128 128 158 110 110 92 ++ ++> ## MAD of iterated residuals was zero, and result depended on the platform. ++> ++> ++> ### end of tests added in 2.4.1 ### ++> +diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION +--- R-2.4.0.old/VERSION 2006-10-03 05:00:12.000000000 -0500 ++++ R-2.4.0/VERSION 2006-10-03 07:19:25.000000000 -0500 +@@ -1 +1 @@ +-2.4.0 ++2.4.0 Patched commit 4bffca9287d28c6da306dc006afc2d7e7d4f24f6 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Sat Nov 4 06:16:11 2006 +0000 Update to current patched level to fix buffer overflow condition. diff --git a/R.spec b/R.spec index 3403621..ff7c87d 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?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,6 +16,9 @@ BuildRequires: java-1.4.2-gcj-compat, lapack-devel 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. @@ -95,7 +98,8 @@ from the R project. This packages provides the static libRmath library and header files. %prep -%setup -q +%setup -q +%patch0 -p1 %build export R_PDFVIEWER="%{_bindir}/evince" @@ -108,7 +112,7 @@ export F77="gfortran" --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib )\ - | egrep '^R is now|^ |^$' - > CAPABILITIES + | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -219,6 +223,9 @@ fi /sbin/ldconfig %changelog +* Fri Nov 3 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.0-2 +- sync with patched 2006-11-03 level to fix PR#9339 + * Sun Oct 15 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 2.4.0-1 - bump for 2.4.0

1 0

Architecture specific change in rpms/java-11-openjdk.git
by githook-noreply＠fedoraproject.org 10 Sep '18

10 Sep '18

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes September 2018