#10 Cleanup spec template
Merged 6 months ago by pingou. Opened 2 years ago by qulogic.
qulogic/r2spec refresh  into  master

file modified
+6 -12

@@ -8,11 +8,9 @@ 

  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}}

@@ -24,12 +22,12 @@ 

  {% 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}}

@@ -40,7 +38,6 @@ 

  %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 @@ 

  %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 @@ 

  

  

  %changelog

- * {{date}} {{name}} <{{email}}> {{version}}-1

+ * {{date}} {{name}} <{{email}}> - {{version}}-1

  - initial package for Fedora

Remove several of the old spec tags and commands that are no longer necessary on modern systems.

Also, remove the annoying trailing space that gets put on Requires lines.

Pull-Request has been merged by pingou

6 months ago
Metadata