Skip to content

Commit

Permalink
R-rmarkdown: Autospec creation for update from version 2.14 to versio…
Browse files Browse the repository at this point in the history
…n 2.15

Carson Sievert (1):
      Fix html_document's client-side navbar updating in Bootstrap 5 (#2384)

Christophe Dervieux (2):
      Add support for native math by default in Github document (#2362)
      Test pandoc-devel on ubuntu latest (#2398)

Garrick Aden-Buie (1):
      Use `while` instead of `for` loop when adjusting pandoc styles (#2380)

Maëlle Salmon (1):
      Fix typo (#2392)

Michael Chirico (1):
      fix typos (#2386)

Yihui Xie (4):
      mark tufte_handout() as defunct
      use tufte::tufte_handout in test, and remove tufte_handout in doc
      moving the doc of extra_dependencies from html_document to html_document_base, otherwise the latter can't inherit it from the former because of the change in roxygen2 7.2.0: r-lib/roxygen2#1316
      CRAN release v2.15
  • Loading branch information
fenrus75 committed Aug 16, 2022
1 parent b495b75 commit 1032a36
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME := R-rmarkdown
URL = https://cran.r-project.org/src/contrib/rmarkdown_2.14.tar.gz
URL = https://cran.r-project.org/src/contrib/rmarkdown_2.15.tar.gz
ARCHIVES =

include ../common/Makefile.common
43 changes: 32 additions & 11 deletions R-rmarkdown.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
# Generated by: autospec.py
#
Name : R-rmarkdown
Version : 2.14
Release : 72
URL : https://cran.r-project.org/src/contrib/rmarkdown_2.14.tar.gz
Source0 : https://cran.r-project.org/src/contrib/rmarkdown_2.14.tar.gz
Version : 2.15
Release : 73
URL : https://cran.r-project.org/src/contrib/rmarkdown_2.15.tar.gz
Source0 : https://cran.r-project.org/src/contrib/rmarkdown_2.15.tar.gz
Summary : Dynamic Documents for R
Group : Development/Tools
License : GPL-3.0 MIT
Requires: R-rmarkdown-license = %{version}-%{release}
Requires: R-bslib
Requires: R-evaluate
Requires: R-htmltools
Expand All @@ -36,20 +37,33 @@ BuildRequires : buildreq-R
This a jQuery UI custom build, downloaded from:
http://jqueryui.com/download/#!version=1.11.4&components=1111111111110111111111111111111111111

%package license
Summary: license components for the R-rmarkdown package.
Group: Default

%description license
license components for the R-rmarkdown package.


%prep
%setup -q -c -n rmarkdown
%setup -q -n rmarkdown
cd %{_builddir}/rmarkdown

%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1650992892
export SOURCE_DATE_EPOCH=1660687362

%install
export SOURCE_DATE_EPOCH=1650992892
export SOURCE_DATE_EPOCH=1660687362
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/R-rmarkdown
cp %{_builddir}/rmarkdown/inst/COPYING %{buildroot}/usr/share/package-licenses/R-rmarkdown/4d76d5eed4f10a2d7dca86d55d5f44d1d0aab6cb
cp %{_builddir}/rmarkdown/inst/NOTICE %{buildroot}/usr/share/package-licenses/R-rmarkdown/382b54d07ad938bd565388b3f20b5cc6abdcb5c2
cp %{_builddir}/rmarkdown/inst/rmd/h/ionicons/LICENSE %{buildroot}/usr/share/package-licenses/R-rmarkdown/f46103e895c6a4a7b1ee99280d134fffeec4ea72
cp %{_builddir}/rmarkdown/inst/rmd/h/tabset/LICENSE %{buildroot}/usr/share/package-licenses/R-rmarkdown/ed711e39228118ba417650f6e3b5f61872d44e5a
export LANG=C.UTF-8
export CFLAGS="$CFLAGS -O3 -flto -fno-semantic-interposition "
export FCFLAGS="$FFLAGS -O3 -flto -fno-semantic-interposition "
Expand All @@ -65,17 +79,17 @@ mkdir -p ~/.stash
echo "CFLAGS = $CFLAGS -march=x86-64-v3 -ftree-vectorize -mno-vzeroupper" > ~/.R/Makevars
echo "FFLAGS = $FFLAGS -march=x86-64-v3 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars
echo "CXXFLAGS = $CXXFLAGS -march=x86-64-v3 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars
R CMD INSTALL --install-tests --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library rmarkdown
R CMD INSTALL --install-tests --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library .
for i in `find %{buildroot}/usr/lib64/R/ -name "*.so"`; do mv $i $i.avx2 ; mv $i.avx2 ~/.stash/; done
echo "CFLAGS = $CFLAGS -march=x86-64-v4 -ftree-vectorize -mno-vzeroupper " > ~/.R/Makevars
echo "FFLAGS = $FFLAGS -march=x86-64-v4 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars
echo "CXXFLAGS = $CXXFLAGS -march=x86-64-v4 -ftree-vectorize -mno-vzeroupper " >> ~/.R/Makevars
R CMD INSTALL --preclean --install-tests --no-test-load --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library rmarkdown
R CMD INSTALL --preclean --install-tests --no-test-load --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library .
for i in `find %{buildroot}/usr/lib64/R/ -name "*.so"`; do mv $i $i.avx512 ; mv $i.avx512 ~/.stash/; done
echo "CFLAGS = $CFLAGS -ftree-vectorize " > ~/.R/Makevars
echo "FFLAGS = $FFLAGS -ftree-vectorize " >> ~/.R/Makevars
echo "CXXFLAGS = $CXXFLAGS -ftree-vectorize " >> ~/.R/Makevars
R CMD INSTALL --preclean --install-tests --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library rmarkdown
R CMD INSTALL --preclean --install-tests --built-timestamp=${SOURCE_DATE_EPOCH} --build -l %{buildroot}/usr/lib64/R/library .
cp ~/.stash/* %{buildroot}/usr/lib64/R/library/*/libs/ || :
%{__rm} -rf %{buildroot}%{_datadir}/R/library/R.css
%check
Expand All @@ -84,7 +98,7 @@ export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export _R_CHECK_FORCE_SUGGESTS_=false
R CMD check --no-manual --no-examples --no-codoc rmarkdown || :
R CMD check --no-manual --no-examples --no-codoc . || :


%files
Expand Down Expand Up @@ -455,3 +469,10 @@ R CMD check --no-manual --no-examples --no-codoc rmarkdown || :
/usr/lib64/R/library/rmarkdown/tests/testthat/test-utils.R
/usr/lib64/R/library/rmarkdown/tests/testthat/test-vignette.R
/usr/lib64/R/library/rmarkdown/tests/testthat/test-yml-parsing.R

%files license
%defattr(0644,root,root,0755)
/usr/share/package-licenses/R-rmarkdown/382b54d07ad938bd565388b3f20b5cc6abdcb5c2
/usr/share/package-licenses/R-rmarkdown/4d76d5eed4f10a2d7dca86d55d5f44d1d0aab6cb
/usr/share/package-licenses/R-rmarkdown/ed711e39228118ba417650f6e3b5f61872d44e5a
/usr/share/package-licenses/R-rmarkdown/f46103e895c6a4a7b1ee99280d134fffeec4ea72
2 changes: 1 addition & 1 deletion options.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = R-rmarkdown
url = https://cran.r-project.org/src/contrib/rmarkdown_2.14.tar.gz
url = https://cran.r-project.org/src/contrib/rmarkdown_2.15.tar.gz
archives =
giturl = https://github.com/rstudio/rmarkdown.git
domain =
Expand Down
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
72
73
6 changes: 3 additions & 3 deletions testresults
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Total : 45
Pass : 41
Fail : 2
Total : 44
Pass : 38
Fail : 4
Skip : 2
XFail : 0
2 changes: 1 addition & 1 deletion upstream
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ae4efaedbf1c0126f05a63f36617ccea4f9553de/rmarkdown_2.14.tar.gz
e2830ef570732b039cc198b98525e3055b37c25a/rmarkdown_2.15.tar.gz
2 changes: 1 addition & 1 deletion versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.14
2.15

0 comments on commit 1032a36

Please sign in to comment.