automatic import of R-CRAN-bartMachineJARs

3 files changed, 19 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index f73530a..b483609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /bartMachineJARs_1.1.tar.gz
+/bartMachineJARs_1.2.tar.gz
diff --git a/R-CRAN-bartMachineJARs.spec b/R-CRAN-bartMachineJARs.spec
index e80abfb..182f0ac 100644
--- a/R-CRAN-bartMachineJARs.spec
+++ b/R-CRAN-bartMachineJARs.spec
@@ -1,10 +1,12 @@
+%global __brp_check_rpaths %{nil}
+%global __requires_exclude ^libmpi
 %global packname  bartMachineJARs
-%global packver   1.1
+%global packver   1.2
 %global rlibdir   /usr/local/lib/R/library
 
 Name:             R-CRAN-%{packname}
-Version:          1.1
-Release:          3%{?dist}%{?buildtag}
+Version:          1.2
+Release:          1%{?dist}%{?buildtag}
 Summary:          bartMachine JARs
 
 License:          GPL-3
@@ -12,7 +14,6 @@ URL:              https://cran.r-project.org/package=%{packname}
 Source0:          %{url}&version=%{packver}#/%{packname}_%{packver}.tar.gz
 
 
-Requires:         java
 BuildRequires:    R-devel >= 2.14.0
 Requires:         R-core >= 2.14.0
 BuildArch:        noarch
@@ -27,6 +28,15 @@ package without bartMachine.
 %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
 
@@ -36,14 +46,8 @@ 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}/DESCRIPTION
-%{rlibdir}/%{packname}/NAMESPACE
-%{rlibdir}/%{packname}/R
-%doc %{rlibdir}/%{packname}/COPYRIGHTS
-%doc %{rlibdir}/%{packname}/java
+%{rlibdir}/%{packname}
diff --git a/sources b/sources
index d99f7d2..db7a55d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fa6a7fbcf8e92b7db7b0ebd66738c3c  bartMachineJARs_1.1.tar.gz
+f6306151ba9e9e2589201e462245f860  bartMachineJARs_1.2.tar.gz