Install rpm macros to %{_rpmconfigdir}/macros.d as non-%config.

https://lists.fedoraproject.org/pipermail/devel/2014-January/195026.html
https://fedorahosted.org/fpc/ticket/259
This commit is contained in:
Ville Skyttä 2014-02-21 19:18:38 +02:00
parent 642fdc3757
commit 82ce2318d5

View File

@ -3,7 +3,7 @@
Summary: A high-performance implementation of MPI Summary: A high-performance implementation of MPI
Name: mpich Name: mpich
Version: 3.1 Version: 3.1
Release: 1%{?dist} Release: 2%{?dist}
License: MIT License: MIT
Group: Development/Libraries Group: Development/Libraries
URL: http://www.mpich.org/ URL: http://www.mpich.org/
@ -178,9 +178,9 @@ module load mpi/%{name}-%{_arch}
EOF EOF
cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh} cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh}
# Install the RPM macro # Install the RPM macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
cp -pr %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.%{name} cp -p %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
rm -f %{buildroot}%{_libdir}/%{name}/lib/lib{*mpich*,opa,mpl}.a rm -f %{buildroot}%{_libdir}/%{name}/lib/lib{*mpich*,opa,mpl}.a
@ -214,7 +214,7 @@ make check
%{_libdir}/%{name}/lib/*.so %{_libdir}/%{name}/lib/*.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/openpa.pc %{_libdir}/pkgconfig/openpa.pc
%config %{_sysconfdir}/rpm/macros.%{name} %{_rpmconfigdir}/macros.d/macros.%{name}
%files doc %files doc
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
@ -222,6 +222,9 @@ make check
%{_mandir}/%{name}/man3/ %{_mandir}/%{name}/man3/
%changelog %changelog
* Fri Feb 21 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.1-2
- Install rpm macros to %%{_rpmconfigdir}/macros.d as non-%%config.
* Fri Feb 21 2014 Deji Akingunola <dakingun@gmail.com> - 3.1-1 * Fri Feb 21 2014 Deji Akingunola <dakingun@gmail.com> - 3.1-1
- Update to 3.1 - Update to 3.1