- up to 2.13.2; build from separate dir (makes install patch obsolete + fixes issues...

Changed files:
    R-install.patch -> 1.2
    R.spec -> 1.153

diff --git a/R-install.patch b/R-install.patch
deleted file mode 100644 (file)
index 22c1ee2..0000000
--- a/R-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- R-2.13.0/configure.ac~     2011-03-31 00:05:02.000000000 +0200
-+++ R-2.13.0/configure.ac      2011-04-26 11:11:24.466666842 +0200
-@@ -538,9 +538,9 @@
- AC_PATH_PROG(GETWD, pwd, pwd)
- AC_MSG_CHECKING([whether builddir is srcdir])
- if test "`cd \"${srcdir}\" && ${GETWD}`" = "`${GETWD}`"; then
--  BUILDDIR_IS_SRCDIR=yes
--else
-   BUILDDIR_IS_SRCDIR=no
-+else
-+  BUILDDIR_IS_SRCDIR=yes
- fi
- AC_SUBST(BUILDDIR_IS_SRCDIR)
- AC_MSG_RESULT([${BUILDDIR_IS_SRCDIR}])

diff --git a/R.spec b/R.spec
index 26791831cfb6ee6040c1c814410277b3fab3f221..1131bb4e6a4c4449d6ec5b36be33bcc66a7845d8 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -13,16 +13,15 @@
 Summary:       A language for data analysis and graphics
 Summary(pl.UTF-8):     Język do analizy danych oraz grafiki
 Name:          R
-Version:       2.13.1
-Release:       3
+Version:       2.13.2
+Release:       1
 License:       Mixed (distributable), mostly GPL v2+
 Group:         Development/Languages
 # CRAN master site: ftp://cran.r-project.org/pub/R/src/
 Source0:       ftp://stat.ethz.ch/R-CRAN/src/base/R-2/%{name}-%{version}.tar.gz
-# Source0-md5: 28dd0d68ac3a0eab93fe7035565a1c30
+# Source0-md5: fbad74f6415385f86425d0f3968dd684
 Source1:       %{name}.desktop
 Source2:       %{name}.xpm
-Patch0:                %{name}-install.patch
 URL:           http://www.r-project.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -90,12 +89,13 @@ implementacja i semantyka wywodzi się ze Scheme.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__aclocal} -I m4
 %{__autoconf}
-%configure \
+install -d build
+cd build
+../%configure \
        --enable-R-shlib \
        --enable-largefile \
        --with-ICU \
@@ -114,16 +114,18 @@ implementacja i semantyka wywodzi się ze Scheme.
        --with-x
 
 %{__make}
+
 %if %{with tests}
 %{__make} check
 %endif
+
 %{__make} docs pdf info
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir},%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} -j1 install \
+%{__make} -C build -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}