Accepting request 660124 from home:TheBlackCat:branches:science
- Use upstream-recommended %{_rpmconfigdir}/macros.d directory for the rpm macros. OBS-URL: https://build.opensuse.org/request/show/660124 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=94
This commit is contained in:
parent
5ba5e4a7b5
commit
36f100cc81
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 19 19:54:05 UTC 2018 - Todd R <toddrme2178@gmail.com>
|
||||||
|
|
||||||
|
- Use upstream-recommended %{_rpmconfigdir}/macros.d directory
|
||||||
|
for the rpm macros.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 12 15:28:48 UTC 2018 - Todd R <toddrme2178@gmail.com>
|
Wed Dec 12 15:28:48 UTC 2018 - Todd R <toddrme2178@gmail.com>
|
||||||
|
|
||||||
|
@ -578,8 +578,8 @@ mv %{buildroot}%{_prefix}/share/%{version} \
|
|||||||
%{buildroot}%{_prefix}/share/hdf5_examples
|
%{buildroot}%{_prefix}/share/hdf5_examples
|
||||||
%else
|
%else
|
||||||
# rpm macro for version checking
|
# rpm macro for version checking
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
|
||||||
cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
|
cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.hdf5 <<EOF
|
||||||
#
|
#
|
||||||
# RPM macros for hdf5 packaging
|
# RPM macros for hdf5 packaging
|
||||||
#
|
#
|
||||||
@ -697,7 +697,7 @@ export HDF5_Make_Ignore=yes
|
|||||||
%if %{without hpc}
|
%if %{without hpc}
|
||||||
%files -n %{pname}-devel-data
|
%files -n %{pname}-devel-data
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%config(noreplace) %{_sysconfdir}/rpm/macros.hdf5
|
%{_rpmconfigdir}/macros.d/macros.hdf5
|
||||||
%endif
|
%endif
|
||||||
%endif # ?mpi
|
%endif # ?mpi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user