rpms/R-qtl/devel R-qtl.spec,1.4,1.5 import.log,1.3,1.4

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/R-qtl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25342/devel

Modified Files:
	R-qtl.spec import.log 
Log Message:
* Sun Nov 22 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-2
- Modify build for R 2.10 and higher - remove scriptlets



Index: R-qtl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/devel/R-qtl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-qtl.spec	7 Oct 2009 17:32:18 -0000	1.4
+++ R-qtl.spec	24 Nov 2009 05:23:22 -0000	1.5
@@ -2,20 +2,19 @@
 
 Name:             R-%{packname}
 Version:          1.14.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 Source0:          http://www.rqtl.org/download/%{packname}_1.14-2.tar.gz
 License:          GPLv3
 URL:              http://www.rqtl.org/
 Group:            Applications/Engineering
 Summary:          Tools for analyzing QTL experiments
-BuildRequires:    R-devel
+Requires:         R-core >= 2.10
+BuildRequires:    R-devel >= 2.10
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:    tex(latex)
 %else
 BuildRequires:    tetex-latex
 %endif
-Requires(post):   R
-Requires(postun): R
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -60,37 +59,30 @@ rm -rf %{buildroot}%{_libdir}/R/library/
 %clean
 rm -rf %{buildroot}
 
-%post
-%{_R_make_search_index}
-
-%postun
-%{_R_make_search_index}
-
 %files
 %defattr(-, root, root, -)
 %dir %{_libdir}/R/library/%{packname}
-%doc %{_libdir}/R/library/%{packname}/latex
 %doc %{_libdir}/R/library/%{packname}/docs
 %doc %{_libdir}/R/library/%{packname}/html
-%doc %{_libdir}/R/library/%{packname}/man
 %doc %{_libdir}/R/library/%{packname}/BUGS.txt
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
 %doc %{_libdir}/R/library/%{packname}/LICENSE.txt
 %doc %{_libdir}/R/library/%{packname}/README.txt
 %doc %{_libdir}/R/library/%{packname}/STATUS.txt
 %doc %{_libdir}/R/library/%{packname}/TODO.txt
-%{_libdir}/R/library/%{packname}/CONTENTS
 %{_libdir}/R/library/%{packname}/CITATION
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/R
-%{_libdir}/R/library/%{packname}/R-ex
 %{_libdir}/R/library/%{packname}/data
 %{_libdir}/R/library/%{packname}/help
 %{_libdir}/R/library/%{packname}/libs
 %{_libdir}/R/library/%{packname}/sampledata
 
 %changelog
+* Sun Nov 22 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-2
+- Modify build for R 2.10 and higher - remove scriptlets
+
 * Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
 - New upstream release
 - Disable the check since it trips on a missing suggested package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 Oct 2009 17:32:18 -0000	1.3
+++ import.log	24 Nov 2009 05:23:22 -0000	1.4
@@ -1,3 +1,4 @@
 R-qtl-1_10-2_fc9:HEAD:R-qtl-1.10-2.fc9.src.rpm:1237380831
 R-qtl-1_11-1_fc9:HEAD:R-qtl-1.11-1.fc9.src.rpm:1243080370
 R-qtl-1_14_2-1_fc11:HEAD:R-qtl-1.14.2-1.fc11.src.rpm:1254936679
+R-qtl-1_14_2-2_fc12:HEAD:R-qtl-1.14.2-2.fc12.src.rpm:1259040099