[R-car/el6] R3

Tom Callaway spot at fedoraproject.org
Thu Apr 18 02:12:04 UTC 2013


commit e8575f93500fa856d14744a5d8277c77c65b1483
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Apr 17 22:11:23 2013 -0400

    R3

 R-car.spec |   54 ++++++++++++++++++++++++++++++++++++------------------
 sources    |    2 +-
 2 files changed, 37 insertions(+), 19 deletions(-)
---
diff --git a/R-car.spec b/R-car.spec
index 9beaf4c..ec4bffc 100644
--- a/R-car.spec
+++ b/R-car.spec
@@ -1,21 +1,20 @@
 %define packname car
+%global packver 2.0
 # Note that some R packages do not use packrel
 %define packrel 16
 
 Name:             R-%{packname}
-Version:          1.2
-Release:          16.1%{?dist}
-Source0:          http://cran.r-project.org/src/contrib/car_%{version}-%{packrel}.tar.gz
+Version:          %{packver}.%{packrel}
+Release:          1%{?dist}
+Source0:          http://cran.r-project.org/src/contrib/car_%{packver}-%{packrel}.tar.gz
 License:          GPLv2+
 URL:              http://cran.r-project.org/web/packages/car/index.html
 Group:            Applications/Engineering
 Summary:          Companion to Applied Regression package for R
-BuildRequires:    R-devel, tex(latex)
+BuildRequires:    R-devel >= 3.0.0, tex(latex)
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
-Requires(post):   R
-Requires(postun): R
-Requires:         R
+Requires:         R-core >= 3.0.0
 
 %description
 This package accompanies J. Fox, An R and S-PLUS Companion to Applied
@@ -32,9 +31,9 @@ or na.exclude.
 #Fix permissions
 find -type f | xargs chmod -x
 #Fix encoding
-iconv -f iso-8859-1 -t utf-8 < car/inst/CHANGES | tr -d '\r' > car/inst/CHANGES.utf-8
-touch -r car/inst/CHANGES car/inst/CHANGES.utf-8
-mv car/inst/CHANGES.utf-8 car/inst/CHANGES
+iconv -f iso-8859-1 -t utf-8 < car/NEWS | tr -d '\r' > car/NEWS.utf-8
+touch -r car/NEWS car/NEWS.utf-8
+mv car/NEWS.utf-8 car/NEWS
 
 %build
 
@@ -53,18 +52,12 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/R/library/R.css
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%{_R_make_search_index}
-
-%postun
-%{_R_make_search_index}
-
 %files
-%defattr(-, root, root, -)
 %dir %{_datadir}/R/library/%{packname}
 %doc %{_datadir}/R/library/%{packname}/html
-%doc %{_datadir}/R/library/%{packname}/CHANGES 
+%doc %{_datadir}/R/library/%{packname}/CITATION
 %doc %{_datadir}/R/library/%{packname}/DESCRIPTION 
+%doc %{_datadir}/R/library/%{packname}/NEWS 
 %{_datadir}/R/library/%{packname}/INDEX
 %{_datadir}/R/library/%{packname}/NAMESPACE
 %{_datadir}/R/library/%{packname}/Meta
@@ -73,6 +66,31 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Thu Apr 11 2013 Tom Callaway <spot at fedoraproject.org> - 2.0.16-1
+- update to modern versioning, 2.0-16
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Nov 7 2012 Orion Poplawski <orion at cora.nwra.com> 2.0-15
+- Update to 2.0-15
+- Update spec to current guidelines
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Nov 7 2011 Orion Poplawski <orion at cora.nwra.com> 2.0-11
+- Update to 2.0-11
+
+* Tue Feb 8 2011 Orion Poplawski <orion at cora.nwra.com> 2.0-9
+- Update to 2.0-9
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-17.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Fri Nov 13 2009 Orion Poplawski <orion at cora.nwra.com> 1.2-16.1
 - Rebuild for R 2.10.0
 
diff --git a/sources b/sources
index 4f6083b..dc939e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a6853235f8f740d0db87e80682ac15ae  car_1.2-16.tar.gz
+57a47f7668ac9db22dbf6deb3618491d  car_2.0-16.tar.gz


More information about the scm-commits mailing list