OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2007 20:00:56
Branch: HEAD Handle: 2007062719005600
Modified files:
openpkg-src/r r.spec
Log:
cleanup and fix packaging
Summary:
Revision Changes Path
1.21 +7 -2 openpkg-src/r/r.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/r/r.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 r.spec
--- openpkg-src/r/r.spec 25 Apr 2007 07:47:32 -0000 1.20
+++ openpkg-src/r/r.spec 27 Jun 2007 18:00:56 -0000 1.21
@@ -33,7 +33,7 @@
Group: Algorithm
License: GPL
Version: 2.5.0
-Release: 20070425
+Release: 20070627
# package options
%option with_x11 yes
@@ -87,6 +87,7 @@
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-recommended-packages \
--with-readline \
--without-gnome \
@@ -112,7 +113,11 @@
exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
%{l_shtool} subst \
-e 's;^\(R_HOME_DIR\)=.*;\1=%{l_prefix}/lib/r;' \
- $RPM_BUILD_ROOT%{l_prefix}/bin/R
+ -e 's;^\(R_SHARE_DIR\)=.*;\1=%{l_prefix}/lib/r/share;' \
+ -e 's;^\(R_INCLUDE_DIR\)=.*;\1=%{l_prefix}/lib/r/include;' \
+ -e 's;^\(R_DOC_DIR\)=.*;\1=%{l_prefix}/lib/r/doc;' \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/R \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/R/bin/R
mv $RPM_BUILD_ROOT%{l_prefix}/lib/R \
$RPM_BUILD_ROOT%{l_prefix}/lib/r
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
