[R-zoo] update to 1.7-12

José Abílio Oliveira Matos jamatos at fedoraproject.org
Tue Mar 17 12:01:19 UTC 2015


commit 580c0557a15d7fc14f1d6ac7d0c9c7520abdf6b5
Author: José Matos <jamatos at fedoraproject.org>
Date:   Tue Mar 17 12:01:16 2015 +0000

    update to 1.7-12
    
    - update license to GPL2 or GPL3
    - remove conditional statment that is true for all supported versions
      of Fedora and EPEL

 .gitignore |  5 +----
 R-zoo.spec | 18 ++++++++++--------
 sources    |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4470336..c7bc7cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-zoo_1.6-3.tar.gz
-/zoo_1.6-4.tar.gz
-/zoo_1.7-6.tar.gz
-/zoo_1.7-10.tar.gz
+/zoo_1.7-12.tar.gz
diff --git a/R-zoo.spec b/R-zoo.spec
index a411695..dbd8a83 100644
--- a/R-zoo.spec
+++ b/R-zoo.spec
@@ -3,22 +3,18 @@
 # This is the main package version
 %global packver 1.7
 # Note that some R packages do not use packrel
-%global packrel 10
+%global packrel 12
 
 Name:             R-%{packname}
 Version:          %{packver}.%{packrel}
-Release:          3%{?dist}
+Release:          1%{?dist}
 Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{packver}-%{packrel}.tar.gz
-License:          GPLv2
+License:          GPLv2 or GPLv3
 URL:              http://cran.r-project.org/web/packages/zoo/index.html
 Group:            Applications/Engineering
 Summary:          Z's ordered observations for irregular time series
 BuildRequires:    R-devel >= 3.0.0
-%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
 BuildRequires:    tex(latex)
-%else
-BuildRequires:    tetex-latex
-%endif
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         R-core >= 3.0.0
 
@@ -28,7 +24,7 @@ An S3 class with methods for totally ordered indexed observations. It is
 particularly aimed at irregular time series of numeric vectors/matrices and
 factors. zoo's key design goals are independence of a particular index/date/
 time class and consistency with with ts and base R by providing methods to
-extend standard generics. 
+extend standard generics.
 
 
 %prep
@@ -83,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 17 2015 José Matos <jamatos at fedoraproject.org> - 1.7.12-1
+- update to 1.7-12
+- update license to GPL2 or GPL3
+- remove conditional statment that is true for all supported versions
+  of Fedora and EPEL
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 4632f45..5319e8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d4a7c61da04d7b49c819edc6984933f  zoo_1.7-10.tar.gz
+f52c6e80283a09be27c175725487d0e4  zoo_1.7-12.tar.gz


More information about the scm-commits mailing list