automatic import of R-CRAN-unheadrf31

3 files changed, 16 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index 2a4d019..611dfad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /unheadr_0.2.0.tar.gz
 /unheadr_0.2.1.tar.gz
+/unheadr_0.3.0.tar.gz
diff --git a/R-CRAN-unheadr.spec b/R-CRAN-unheadr.spec
index 7ceaac4..7c9b578 100644
--- a/R-CRAN-unheadr.spec
+++ b/R-CRAN-unheadr.spec
@@ -1,10 +1,10 @@
 %global packname  unheadr
-%global packver   0.2.1
+%global packver   0.3.0
 %global rlibdir   /usr/local/lib/R/library
 
 Name:             R-CRAN-%{packname}
-Version:          0.2.1
-Release:          2%{?dist}
+Version:          0.3.0
+Release:          1%{?dist}%{?buildtag}
 Summary:          Handle Data with Messy Header Rows and Broken Values
 
 License:          MIT + file LICENSE
@@ -15,7 +15,7 @@ Source0:          %{url}&version=%{packver}#/%{packname}_%{packver}.tar.gz
 BuildRequires:    R-devel >= 2.10
 Requires:         R-core >= 2.10
 BuildArch:        noarch
-BuildRequires:    R-CRAN-dplyr >= 0.7.5
+BuildRequires:    R-CRAN-dplyr >= 0.8.4
 BuildRequires:    R-CRAN-rlang >= 0.2.1
 BuildRequires:    R-CRAN-forcats 
 BuildRequires:    R-CRAN-stringr 
@@ -24,7 +24,7 @@ BuildRequires:    R-CRAN-magrittr
 BuildRequires:    R-CRAN-tidyxl 
 BuildRequires:    R-CRAN-readxl 
 BuildRequires:    R-CRAN-tibble 
-Requires:         R-CRAN-dplyr >= 0.7.5
+Requires:         R-CRAN-dplyr >= 0.8.4
 Requires:         R-CRAN-rlang >= 0.2.1
 Requires:         R-CRAN-forcats 
 Requires:         R-CRAN-stringr 
@@ -43,7 +43,13 @@ annotate meaningful formatting in spreadsheet files.
 %prep
 %setup -q -c -n %{packname}
 
+# fix end of executable files
 find -type f -executable -exec grep -Iq . {} \; -exec sed -i -e '$a\' {} \;
+# prevent binary stripping
+[ -d %{packname}/src ] && find %{packname}/src -type f -exec \
+  sed -i 's@/usr/bin/strip@/usr/bin/true@g' {} \; || true
+# don't allow local prefix in executable scripts
+find -type f -executable -exec sed -Ei 's@#!( )*/usr/local/bin@#!/usr/bin@g' {} \;
 
 %build
 
@@ -51,22 +57,10 @@ find -type f -executable -exec grep -Iq . {} \; -exec sed -i -e '$a\' {} \;
 
 mkdir -p %{buildroot}%{rlibdir}
 %{_bindir}/R CMD INSTALL -l %{buildroot}%{rlibdir} %{packname}
-
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -f %{buildroot}%{rlibdir}/R.css
+# remove buildroot from installed files
+find %{buildroot}%{rlibdir} -type f -exec sed -i "s@%{buildroot}@@g" {} \;
 
 %files
-%dir %{rlibdir}/%{packname}
-%doc %{rlibdir}/%{packname}/html
-%{rlibdir}/%{packname}/Meta
-%{rlibdir}/%{packname}/help
-%{rlibdir}/%{packname}/data
-%{rlibdir}/%{packname}/DESCRIPTION
-%license %{rlibdir}/%{packname}/LICENSE
-%{rlibdir}/%{packname}/NAMESPACE
-%doc %{rlibdir}/%{packname}/NEWS.md
-%{rlibdir}/%{packname}/R
-%doc %{rlibdir}/%{packname}/CITATION
-%doc %{rlibdir}/%{packname}/doc
-%{rlibdir}/%{packname}/extdata
-%{rlibdir}/%{packname}/INDEX
+%{rlibdir}/%{packname}
diff --git a/sources b/sources
index f32cb20..f40e78f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-adae88925010921b49314b77191366ab  unheadr_0.2.1.tar.gz
+a23dcd80da618425f9b3d05243b5957f  unheadr_0.3.0.tar.gz