automatic import of R-CRAN-OSDRf36f34

3 files changed, 19 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index c4e7231..956cd2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /OSDR_1.1.3.tar.gz
+/OSDR_1.1.4.tar.gz
diff --git a/R-CRAN-OSDR.spec b/R-CRAN-OSDR.spec
index 1c059d5..af81352 100644
--- a/R-CRAN-OSDR.spec
+++ b/R-CRAN-OSDR.spec
@@ -1,13 +1,14 @@
+%global __brp_check_rpaths %{nil}
 %global packname  OSDR
-%global packver   1.1.3
+%global packver   1.1.4
 %global rlibdir   /usr/local/lib/R/library
 
 Name:             R-CRAN-%{packname}
-Version:          1.1.3
-Release:          3%{?dist}%{?buildtag}
+Version:          1.1.4
+Release:          1%{?dist}%{?buildtag}
 Summary:          Finds an Optimal System of Distinct Representatives
 
-License:          GPL-2
+License:          GPL-3
 URL:              https://cran.r-project.org/package=%{packname}
 Source0:          %{url}&version=%{packver}#/%{packname}_%{packver}.tar.gz
 
@@ -24,6 +25,15 @@ Representatives (OSDR), as defined by D.Gale (1968)
 %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
+[ -d %{packname}/src ] && find %{packname}/src/Make* -type f -exec \
+  sed -i 's@-g0@@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
 
@@ -31,17 +41,10 @@ Representatives (OSDR), as defined by D.Gale (1968)
 
 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
-%{rlibdir}/%{packname}/NAMESPACE
-%{rlibdir}/%{packname}/R
-%{rlibdir}/%{packname}/INDEX
+%{rlibdir}/%{packname}
diff --git a/sources b/sources
index f0b9b18..2e3febc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51aef421dd316b4c3517d34c656711a1  OSDR_1.1.3.tar.gz
+613354e3cd34be986b1dafe395542546  OSDR_1.1.4.tar.gz