Skip to content

Commit

Permalink
R-xfun: Autospec creation for update from version 0.31 to version 0.32
Browse files Browse the repository at this point in the history
Martin Mächler (1):
      specify the default library location since base_pkgs() can "hang"

Yihui Xie (11):
      start the next version
      roxygenize and bump version
      forgot to pass ... to dir.create() in dir_create()
      close #68: add support for more file extensions
      bump version
      factor out a function all_files() that changes list.files()'s default argument values
      make it possible to return all logo paths
      close rstudio/blogdown#614: add a function shrink_images() to shrink (and optionally compress) images under a directory
      also support .webp images
      svg images can fail on GHA's Linux machines
      CRAN release v0.32
  • Loading branch information
fenrus75 committed Aug 10, 2022
1 parent 00d1564 commit 298ad43
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 20 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-xfun
URL = https://cran.r-project.org/src/contrib/xfun_0.31.tar.gz
URL = https://cran.r-project.org/src/contrib/xfun_0.32.tar.gz
ARCHIVES =

include ../common/Makefile.common
22 changes: 11 additions & 11 deletions R-xfun.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Generated by: autospec.py
#
Name : R-xfun
Version : 0.31
Release : 60
URL : https://cran.r-project.org/src/contrib/xfun_0.31.tar.gz
Source0 : https://cran.r-project.org/src/contrib/xfun_0.31.tar.gz
Version : 0.32
Release : 61
URL : https://cran.r-project.org/src/contrib/xfun_0.32.tar.gz
Source0 : https://cran.r-project.org/src/contrib/xfun_0.32.tar.gz
Summary : Supporting Functions for Packages Maintained by 'Yihui Xie'
Group : Development/Tools
License : MIT
Expand All @@ -25,18 +25,18 @@ lib components for the R-xfun package.


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

%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=1652283034
export SOURCE_DATE_EPOCH=1660147244

%install
export SOURCE_DATE_EPOCH=1652283034
export SOURCE_DATE_EPOCH=1660147244
rm -rf %{buildroot}
export LANG=C.UTF-8
export CFLAGS="$CFLAGS -O3 -flto -fno-semantic-interposition "
Expand All @@ -53,17 +53,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 xfun
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 xfun
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 xfun
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 @@ -72,7 +72,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 xfun || :
R CMD check --no-manual --no-examples --no-codoc . || :


%files
Expand Down
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-xfun
url = https://cran.r-project.org/src/contrib/xfun_0.31.tar.gz
url = https://cran.r-project.org/src/contrib/xfun_0.32.tar.gz
archives =
giturl = https://github.com/yihui/xfun.git
domain =
Expand Down
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
60
61
6 changes: 3 additions & 3 deletions testresults
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Total : 51
Pass : 47
Fail : 2
Total : 50
Pass : 44
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 @@
d8449247da844f8a783cc9ee5280bd48d9eee401/xfun_0.31.tar.gz
83165ce1d5e8301ef6654a79f2156099b570fa68/xfun_0.32.tar.gz
2 changes: 1 addition & 1 deletion versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.31
0.32
1 change: 0 additions & 1 deletion whatrequires
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ R-highr
R-knitr
R-markdown
R-rmarkdown
R-styler
R-tinytex

0 comments on commit 298ad43

Please sign in to comment.