[R-multcomp/f19] R3 build, drop scriptlets
Tom Callaway
spot at fedoraproject.org
Fri Apr 26 12:48:25 UTC 2013
commit aef3edad00ede15b079030c128ffe804d9dfed81
Author: Tom Callaway <spot at fedoraproject.org>
Date: Fri Apr 26 08:47:48 2013 -0400
R3 build, drop scriptlets
R-multcomp.spec | 33 ++++++++++-----------------------
multcomp-1.1-3-noinstall.patch | 8 ++++----
sources | 2 +-
3 files changed, 15 insertions(+), 28 deletions(-)
---
diff --git a/R-multcomp.spec b/R-multcomp.spec
index 1a8697d..f1f5d48 100644
--- a/R-multcomp.spec
+++ b/R-multcomp.spec
@@ -1,43 +1,39 @@
%define packname multcomp
-%define packrel 8
+%global packver 1.2
+%define packrel 17
Summary: Simultaneous inference for general linear hypotheses R Package
Name: R-%{packname}
-Version: 1.2
-Release: 11%{?dist}
+Version: %{packver}.%{packrel}
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Engineering
-Source0: http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
+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, tex(latex), R-mvtnorm >= 0.8
+BuildRequires: R-devel >= 3.0.0, tex(latex), R-mvtnorm >= 0.8
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-mvtnorm >= 0.8
-Requires(post): R
-Requires(postun): R
-
+Requires: R-core >= 3.0.0
%description
This R package contains functions for simultaneous tests and confidence
intervals for general linear hypotheses in parametric models, including
linear, generalized linear, linear mixed effects, and survival models.
-
%prep
%setup -q -c -n %{packname}
%patch0 -p1 -b .noinstall
-
%build
-
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/R/library
@@ -46,7 +42,6 @@ mkdir -p %{buildroot}%{_datadir}/R/library
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf %{buildroot}%{_datadir}/R/library/R.css
-
%check
#We have to use --no-install because we don't have all of the suggested
#dependencies
@@ -56,15 +51,6 @@ rm -rf %{buildroot}%{_datadir}/R/library/R.css
%clean
rm -rf %{buildroot}
-
-%post
-%{_R_make_search_index}
-
-
-%postun
-%{_R_make_search_index}
-
-
%files
%defattr(-, root, root, -)
%dir %{_datadir}/R/library/%{packname}
@@ -72,7 +58,6 @@ rm -rf %{buildroot}
%doc %{_datadir}/R/library/%{packname}/deprecated
%doc %{_datadir}/R/library/%{packname}/doc
%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
@@ -81,7 +66,6 @@ rm -rf %{buildroot}
%{_datadir}/R/library/%{packname}/MCMT
%{_datadir}/R/library/%{packname}/Meta
%{_datadir}/R/library/%{packname}/R
-%{_datadir}/R/library/%{packname}/applications
%{_datadir}/R/library/%{packname}/data
%{_datadir}/R/library/%{packname}/help
%{_datadir}/R/library/%{packname}/multcomp_VA.R
@@ -89,6 +73,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Apr 11 2013 Tom Callaway <spot at fedoraproject.org> - 1.2.17-1
+- update to 1.2-17
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/multcomp-1.1-3-noinstall.patch b/multcomp-1.1-3-noinstall.patch
index 7c77714..14883c5 100644
--- a/multcomp-1.1-3-noinstall.patch
+++ b/multcomp-1.1-3-noinstall.patch
@@ -1,9 +1,9 @@
---- multcomp/multcomp/R/helpers.R.noinstall 2010-10-13 09:28:00.000000000 -0600
-+++ multcomp/multcomp/R/helpers.R 2010-12-07 15:33:48.256892971 -0700
-@@ -95,7 +95,7 @@
- mf
+--- multcomp/multcomp/R/helpers.R.noinstall 2012-03-09 08:16:12.000000000 -0500
++++ multcomp/multcomp/R/helpers.R 2013-04-11 14:11:11.452118063 -0400
+@@ -70,7 +70,7 @@ model.matrix.survreg <- function(object,
}
+ ### coxme objects
-model.matrix.coxme <- multcomp:::model.matrix.coxph
+model.matrix.coxme <- model.matrix.coxph
diff --git a/sources b/sources
index 6963bf5..843424f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b6834d6572e3f62d49f5ef8e09d9860 multcomp_1.2-8.tar.gz
+ddf4172560307cd783693d1ed84ecadf multcomp_1.2-17.tar.gz
More information about the scm-commits
mailing list