[R-multcomp] Update to 1.3-0

Orion Poplawski orion at fedoraproject.org
Thu Oct 17 14:52:00 UTC 2013


commit 12d0fdd48f06e1e7c39bfc4d9010d1440ac4494e
Author: Orion Poplawski <orion at nwra.com>
Date:   Thu Oct 17 08:52:01 2013 -0600

    Update to 1.3-0

 .gitignore      |    1 +
 R-multcomp.spec |   19 +++++++++++--------
 sources         |    2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 11e8548..e3f3fe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ multcomp_1.1-7.tar.gz
 /multcomp_1.2-6.tar.gz
 /multcomp_1.2-8.tar.gz
 /multcomp_1.2-17.tar.gz
+/multcomp_1.3-0.tar.gz
diff --git a/R-multcomp.spec b/R-multcomp.spec
index 26bfec5..42a5af4 100644
--- a/R-multcomp.spec
+++ b/R-multcomp.spec
@@ -1,27 +1,28 @@
 %define packname multcomp
-%global packver  1.2
-%define packrel  17
+%global packver  1.3
+%define packrel  0
 
 Summary:        Simultaneous inference for general linear hypotheses R Package
 Name:           R-%{packname}
 Version:        %{packver}.%{packrel}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/Engineering
 Source0:        http://cran.r-project.org/src/contrib/%{packname}_%{packver}-%{packrel}.tar.gz
 URL:            http://cran.r-project.org/web/packages/multcomp/index.html
-#Patch to remove multcomp:: package name from R code to fix --noinstall build
-Patch0:         multcomp-1.1-3-noinstall.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  R-devel >= 3.0.0, tex(latex), R-mvtnorm >= 0.8
-BuildRequires:  R-survival >= 2.35-7
+BuildRequires:  R-sandwich >= 2.3.0
+BuildRequires:  R-survival >= 2.35.7
 #For a test
 BuildRequires:  R-lmtest
 #Needed for more testing coverage, but not in fedora yet
 #BuildRequires:  R-lme4
+Requires:       R-core >= 3.0.0
 Requires:       R-mvtnorm >= 0.8
-Requires:	R-core >= 3.0.0
+Requires:       R-sandwich >= 2.3.0
+Requires:       R-survival >= 2.35.7
 
 %description
 This R package contains functions for simultaneous tests and confidence
@@ -30,7 +31,6 @@ linear, generalized linear, linear mixed effects, and survival models.
 
 %prep
 %setup -q -c -n %{packname}
-%patch0 -p1 -b .noinstall
 
 %build
 
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 16 2013 Orion Poplawski <orion at cora.nwra.com> - 1.3.0-1
+- Update to 1.3-0
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 843424f..86fad98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddf4172560307cd783693d1ed84ecadf  multcomp_1.2-17.tar.gz
+759d78148ed3d0036867b9e812386f74  multcomp_1.3-0.tar.gz


More information about the scm-commits mailing list