rpms/R-qtl/EL-4 .cvsignore, 1.3, 1.4 R-qtl.spec, 1.2, 1.3 import.log, 1.2, 1.3 sources, 1.3, 1.4

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/R-qtl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10091/EL-4

Modified Files:
	.cvsignore R-qtl.spec import.log sources 
Log Message:
* 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
- Change license tag to GPLv3 to reflect an upstream license change



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 May 2009 12:14:13 -0000	1.3
+++ .cvsignore	7 Oct 2009 17:37:07 -0000	1.4
@@ -1 +1 @@
-qtl_1.11-12.tar.gz
+qtl_1.14-2.tar.gz


Index: R-qtl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-4/R-qtl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-qtl.spec	23 May 2009 12:14:13 -0000	1.2
+++ R-qtl.spec	7 Oct 2009 17:37:07 -0000	1.3
@@ -1,18 +1,22 @@
-%global packname qtl
-%global packrel 12
+%global packname  qtl
 
 Name:             R-%{packname}
-Version:          1.11
+Version:          1.14.2
 Release:          1%{?dist}
-Source0:          http://www.rqtl.org/download/%{packname}_%{version}-%{packrel}.tar.gz
-License:          GPLv2+
+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, tetex-latex
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    R-devel
+%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
 R-qtl is an extensible, interactive environment for mapping
@@ -40,17 +44,21 @@ models by multiple imputation and Haley-
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/R/library
+R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/R.css
 
 %check
-%{_bindir}/R CMD check %{packname}
+# The check is disabled because it treats the non-precense of the
+# suggested R-snow package as an error - this is an optional dependency
+# not (yet) available in Fedora. R-qtl works without it.
+
+# R CMD check %{packname}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %{_R_make_search_index}
@@ -72,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -82,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/sampledata
 
 %changelog
+* 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
+- Change license tag to GPLv3 to reflect an upstream license change
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.11-1
 - New upstream release
 
@@ -93,8 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to new upstream version - contains consistent licensing information
 - Reverted License tag from GPLv2 to GPLv2+ to reflect the new information
 
-* Tue Dec  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
+* Tue Dec 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
 - Corrected License tag from GPLv2+ to GPLv2
 
-* Wed Nov  5 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
+* Wed Nov 05 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
 - Initial package creation


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 May 2009 12:14:13 -0000	1.2
+++ import.log	7 Oct 2009 17:37:07 -0000	1.3
@@ -1,2 +1,3 @@
 R-qtl-1_10-2_fc9:EL-4:R-qtl-1.10-2.fc9.src.rpm:1237381268
 R-qtl-1_11-1_fc9:EL-4:R-qtl-1.11-1.fc9.src.rpm:1243080817
+R-qtl-1_14_2-1_fc11:EL-4:R-qtl-1.14.2-1.fc11.src.rpm:1254937005


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 May 2009 12:14:13 -0000	1.3
+++ sources	7 Oct 2009 17:37:07 -0000	1.4
@@ -1 +1 @@
-ac1afe8286155f9d00b2542e33f582e2  qtl_1.11-12.tar.gz
+f754602d37b6d30b3c46701670164cc1  qtl_1.14-2.tar.gz