Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2019-03-20 18:30:17 -04:00
parent a9264a4d94
commit b13a4802f3
4 changed files with 17 additions and 9 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/fs_1.2.6.tar.gz
/fs_1.2.7.tar.gz

View File

@ -1,4 +1,4 @@
From 00d1cfafea1476fa6a9696100d64cd8aebe929a3 Mon Sep 17 00:00:00 2001
From 6d955f0b1bd13364dcffffd73018e8681d399a1e Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 22 Sep 2018 23:50:25 -0400
Subject: [PATCH] Use system libuv.
@ -100,13 +100,13 @@ index 912533e3..ed998717 100644
use one of the following licenses:
diff --git a/src/Makevars b/src/Makevars
index a5d2e3d6..6e08a28f 100644
index a4c07030..6e08a28f 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,6 +1,6 @@
UNAME := $(shell uname)
-PKG_LIBS = ./libuv/.libs/libuv.a
-PKG_LIBS = ./libuv/.libs/libuv.a -pthread
+PKG_LIBS = $(shell pkgconf --libs libuv)
SOURCES = $(wildcard *.cc unix/*.cc)
@ -115,7 +115,7 @@ index a5d2e3d6..6e08a28f 100644
OBJECTS += bsd/setmode.o bsd/strmode.o bsd/reallocarray.o
endif
-PKG_CPPFLAGS = -I./libuv/include -I.
-PKG_CPPFLAGS = -I./libuv/include -I. -pthread
+PKG_CPPFLAGS = $(shell pkgconf --cflags libuv) -I.
all: $(SHLIB)
@ -144,5 +144,5 @@ index a5d2e3d6..6e08a28f 100644
- $(MAKE) --directory=libuv distclean
rm -f $(OBJECTS)
--
2.17.1
2.20.1

View File

@ -2,8 +2,8 @@
%global rlibdir %{_libdir}/R/library
Name: R-%{packname}
Version: 1.2.6
Release: 2%{?dist}
Version: 1.2.7
Release: 1%{?dist}
Summary: Cross-Platform File System Operations Based on 'libuv'
License: GPLv3
@ -14,7 +14,7 @@ Patch0001: 0001-Use-system-libuv.patch
# Here's the R view of the dependencies world:
# Depends:
# Imports: R-methods, R-Rcpp
# Suggests: R-testthat, R-covr, R-pillar >= 1.0.0, R-crayon, R-withr
# Suggests: R-testthat, R-covr, R-pillar >= 1.0.0, R-crayon, R-rmarkdown, R-knitr, R-withr
# LinkingTo:
# Enhances:
@ -23,6 +23,7 @@ Requires: R-Rcpp
Suggests: R-testthat
Suggests: R-pillar >= 1.0.0
Suggests: R-crayon
Suggests: R-knitr
Suggests: R-withr
BuildRequires: pkgconfig(libuv) >= 1.18.0
BuildRequires: R-devel
@ -32,6 +33,8 @@ BuildRequires: R-Rcpp-devel
BuildRequires: R-testthat
BuildRequires: R-pillar >= 1.0.0
BuildRequires: R-crayon
BuildRequires: R-rmarkdown
BuildRequires: R-knitr
BuildRequires: R-withr
%description
@ -70,6 +73,7 @@ export LANG=C.UTF-8
%files
%dir %{rlibdir}/%{packname}
%doc %{rlibdir}/%{packname}/doc
%doc %{rlibdir}/%{packname}/html
%{rlibdir}/%{packname}/DESCRIPTION
%doc %{rlibdir}/%{packname}/NEWS.md
@ -85,6 +89,9 @@ export LANG=C.UTF-8
%changelog
* Wed Mar 20 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.2.7-1
- Update to latest version
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (fs_1.2.6.tar.gz) = 8730ff5376cc9f051787aa99cf607328f0f96f3e05147e1dbe7d043e6d8af916dc15483769fda65e8f2c086539a0382f2afbf71f9d70f287c7c37cb083802d71
SHA512 (fs_1.2.7.tar.gz) = 0d63343350ff2ee264aa4f164af4d6fe5b5153c2cafb1c9499612ccd2eb428e923fac0a0a5bd337ddc154fb3ca2c6cc457ce21524ccd0e5d63a59bc5acdd02b4