rpms/R/F-7 R-make-search-index.sh, NONE, 1.1 macros.R, NONE, 1.1 R.spec, 1.28, 1.29
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Fri Jul 6 22:08:10 UTC 2007
- Previous message: rpms/gengetopt/devel .cvsignore,1.2,1.3 sources,1.2,1.3
- Next message: rpms/R/FC-6 R-make-search-index.sh, NONE, 1.1 macros.R, NONE, 1.1 R.spec, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/R/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3379/F-7
Modified Files:
R.spec
Added Files:
R-make-search-index.sh macros.R
Log Message:
Add scripts and macros to make R packaging easier.
--- NEW FILE R-make-search-index.sh ---
#!/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
--- NEW FILE macros.R ---
#
# RPM macros for R packaging
#
#
# Make R search index.txt
#
%_R_make_search_index /usr/lib/rpm/R-make-search-index.sh
Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-7/R.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- R.spec 3 Jul 2007 02:04:55 -0000 1.28
+++ R.spec 6 Jul 2007 22:07:34 -0000 1.29
@@ -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 @@
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 @@
# 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 @@
/sbin/ldconfig
%changelog
+* Thu Jul 5 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.1-2
+- add rpm helper macros, script
+
* Mon Jul 2 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.1-1
- drop patch, upstream fixed
- bump to 2.5.1
- Previous message: rpms/gengetopt/devel .cvsignore,1.2,1.3 sources,1.2,1.3
- Next message: rpms/R/FC-6 R-make-search-index.sh, NONE, 1.1 macros.R, NONE, 1.1 R.spec, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list