packages: R/R.spec, R/R-install.patch (REMOVED) - up to 2.13.2; build from ...

[arekm]

Author: arekm                        Date: Fri Oct 14 08:28:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.13.2; build from separate dir (makes install patch obsolete + fixes issues with install trying to  c overwrite file with that same file)

---- Files affected:
packages/R:
   R.spec (1.152 -> 1.153) , R-install.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/R/R.spec
diff -u packages/R/R.spec:1.152 packages/R/R.spec:1.153
--- packages/R/R.spec:1.152	Fri Oct 14 07:27:14 2011
+++ packages/R/R.spec	Fri Oct 14 10:28:28 2011
@@ -14,16 +14,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
@@ -91,12 +90,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__aclocal} -I m4
 %{__autoconf}
-%configure \
+install -d build
+cd build
+../%configure \
 	--enable-R-shlib \
 	--enable-largefile \
 	--with-ICU \
@@ -115,16 +115,18 @@
 	--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}
@@ -206,6 +208,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.153  2011/10/14 08:28:28  arekm
+- up to 2.13.2; build from separate dir (makes install patch obsolete + fixes issues with install trying to  c overwrite file with that same file)
+
 Revision 1.152  2011/10/14 05:27:14  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/R/R.spec?r1=1.152&r2=1.153&f=u