From 35afa18e4e6e897a27dbe09d2584ef3639662723 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Apr 11 2018 23:01:03 +0000 Subject: [PATCH 1/2] Remove outdated commands from spec template. --- diff --git a/r2spec/specfile.tpl b/r2spec/specfile.tpl index dc23e58..d45737a 100644 --- a/r2spec/specfile.tpl +++ b/r2spec/specfile.tpl @@ -8,11 +8,9 @@ Version: {{version}} Release: 1%{?dist} Summary: {{summary}} -Group: Applications/Engineering License: {{license}} URL: {{URL}} Source0: {{source0}} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Here's the R view of the dependencies world: # Depends: {{depends}} @@ -40,7 +38,6 @@ BuildRequires: R-devel tex(latex) {{depends}} %build %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{rlibdir} %{_bindir}/R CMD INSTALL -l %{buildroot}%{rlibdir} %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) @@ -49,11 +46,8 @@ rm -f %{buildroot}%{rlibdir}/R.css %check %{_bindir}/R CMD check %{packname} {% endif %} -%clean -rm -rf %{buildroot} %files -%defattr(-, root, root, -) %dir %{rlibdir}/%{packname} %doc %{rlibdir}/%{packname}/doc %doc %{rlibdir}/%{packname}/html @@ -67,5 +61,5 @@ rm -rf %{buildroot} %changelog -* {{date}} {{name}} <{{email}}> {{version}}-1 +* {{date}} {{name}} <{{email}}> - {{version}}-1 - initial package for Fedora From eb74e6521ee40fe11e1f892b3f14351c198922e9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Apr 11 2018 23:01:38 +0000 Subject: [PATCH 2/2] Remove trailing space from (Build)Requires. --- diff --git a/r2spec/specfile.tpl b/r2spec/specfile.tpl index d45737a..be014ac 100644 --- a/r2spec/specfile.tpl +++ b/r2spec/specfile.tpl @@ -22,12 +22,12 @@ Source0: {{source0}} {% if (arch == False) %}BuildArch: noarch Requires: R-core {% endif %} -{% if depends != "" %}Requires: {{depends}} {% endif %} -{% if imports != "" %}Requires: {{imports}} {% endif %} -{% if suggests != "" %}Requires: {{suggests}} {% endif %} +{% if depends != "" %}Requires: {{depends}}{% endif %} +{% if imports != "" %}Requires: {{imports}}{% endif %} +{% if suggests != "" %}Requires: {{suggests}}{% endif %} BuildRequires: R-devel tex(latex) {{depends}} -{% if imports != "" %}BuildRequires: {{imports}} {% endif %} -{% if suggests != "" %}BuildRequires: {{suggests}} {% endif %} +{% if imports != "" %}BuildRequires: {{imports}}{% endif %} +{% if suggests != "" %}BuildRequires: {{suggests}}{% endif %} %description {{description}}