Accepting request 812115 from home:badshah400:branches:multimedia:libs

- Fix BuildFailures for openSUSE >= 1550:
  * Correct info dir.
  * Fix ill-formatted comments.

OBS-URL: https://build.opensuse.org/request/show/812115
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=81
This commit is contained in:
Takashi Iwai 2020-06-15 09:59:42 +00:00 committed by Git OBS Bridge
parent 5f4c46d1ce
commit d33b947a78
2 changed files with 30 additions and 13 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Jun 6 22:20:41 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Fix BuildFailures for openSUSE >= 1550:
* Correct info dir.
* Fix ill-formatted comments.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 29 15:00:55 UTC 2019 - Egbert Eich <eich@suse.com> Fri Nov 29 15:00:55 UTC 2019 - Egbert Eich <eich@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package fftw3 # spec file for package fftw3
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -197,7 +197,7 @@ Release: 0
Summary: Discrete Fourier Transform (DFT) C Subroutine Library Summary: Discrete Fourier Transform (DFT) C Subroutine Library
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Productivity/Scientific/Math Group: Productivity/Scientific/Math
Url: http://www.fftw.org URL: http://www.fftw.org
Source: ftp://ftp.fftw.org/pub/fftw/fftw-%{version}%{?pl_ext:-%{pl_ext}}.tar.gz Source: ftp://ftp.fftw.org/pub/fftw/fftw-%{version}%{?pl_ext:-%{pl_ext}}.tar.gz
Source1: %{pname}-rpmlintrc Source1: %{pname}-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -541,7 +541,8 @@ EOF
%if %{without hpc} %if %{without hpc}
%files -n libfftw3_threads3 %files -n libfftw3_threads3
%defattr(-,root,root) %defattr(-,root,root)
%endif #%%{without hpc} %endif
# ENDIF FOR {without hpc}
%{package_libdir}/libfftw3_threads.so.3* %{package_libdir}/libfftw3_threads.so.3*
%{package_libdir}/libfftw3f_threads.so.3* %{package_libdir}/libfftw3f_threads.so.3*
%{package_libdir}/libfftw3l_threads.so.3* %{package_libdir}/libfftw3l_threads.so.3*
@ -551,7 +552,8 @@ EOF
%defattr(-,root,root) %defattr(-,root,root)
%else %else
%hpc_modules_files %hpc_modules_files
%endif #%%{without hpc} %endif
# ENDIF FOR {without hpc}
%{package_libdir}/libfftw3_omp.so.3* %{package_libdir}/libfftw3_omp.so.3*
%{package_libdir}/libfftw3f_omp.so.3* %{package_libdir}/libfftw3f_omp.so.3*
%{package_libdir}/libfftw3l_omp.so.3* %{package_libdir}/libfftw3l_omp.so.3*
@ -561,17 +563,20 @@ EOF
%if %{without hpc} %if %{without hpc}
%files -n libfftw3_mpi3 %files -n libfftw3_mpi3
%defattr(-,root,root) %defattr(-,root,root)
%endif #%%{without hpc} %endif
# ENDIF FOR {without hpc}
%{package_libdir}/libfftw3_mpi.so.3* %{package_libdir}/libfftw3_mpi.so.3*
%{package_libdir}/libfftw3f_mpi.so.3* %{package_libdir}/libfftw3f_mpi.so.3*
%{package_libdir}/libfftw3l_mpi.so.3* %{package_libdir}/libfftw3l_mpi.so.3*
%endif #%%(with mpi) %endif
%endif #%%(s390 s390x) # ENDIF FOR {without mpi}
%endif
# ENDIF FOR ARCH s390 s390x
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%if %{with hpc} %if %{with hpc}
%{package_infodir}/dir %{package_infodir}/
%hpc_dirs %hpc_dirs
%dir %package_libdir/pkgconfig %dir %package_libdir/pkgconfig
%dir %package_includedir %dir %package_includedir
@ -602,7 +607,8 @@ EOF
%if %{without hpc} %if %{without hpc}
%files threads-devel %files threads-devel
%defattr(-,root,root) %defattr(-,root,root)
%endif #%%{without hpc} %endif
# ENDIF FOR {without hpc}
%{package_libdir}/libfftw3_threads.so %{package_libdir}/libfftw3_threads.so
%{package_libdir}/libfftw3f_threads.so %{package_libdir}/libfftw3f_threads.so
%{package_libdir}/libfftw3l_threads.so %{package_libdir}/libfftw3l_threads.so
@ -610,7 +616,8 @@ EOF
%if %{without hpc} %if %{without hpc}
%files openmp-devel %files openmp-devel
%defattr(-,root,root) %defattr(-,root,root)
%endif #%%{without hpc} %endif
# ENDIF FOR {without hpc}
%{package_libdir}/libfftw3_omp.so %{package_libdir}/libfftw3_omp.so
%{package_libdir}/libfftw3f_omp.so %{package_libdir}/libfftw3f_omp.so
%{package_libdir}/libfftw3l_omp.so %{package_libdir}/libfftw3l_omp.so
@ -620,14 +627,17 @@ EOF
%if %{without hpc} %if %{without hpc}
%files mpi-devel %files mpi-devel
%defattr(-,root,root) %defattr(-,root,root)
%endif #%%{without hpc} %endif
# ENDIF FOR {without hpc}
%{package_libdir}/libfftw3_mpi.so %{package_libdir}/libfftw3_mpi.so
%{package_libdir}/libfftw3f_mpi.so %{package_libdir}/libfftw3f_mpi.so
%{package_libdir}/libfftw3l_mpi.so %{package_libdir}/libfftw3l_mpi.so
%{package_includedir}/fftw3-mpi.* %{package_includedir}/fftw3-mpi.*
%{package_includedir}/fftw3l-mpi.f03 %{package_includedir}/fftw3l-mpi.f03
%endif #%%(with mpi) %endif
%endif #%%(s390 s390x) # ENDIF FOR {with mpi}
%endif
# ENDIF FOR arch s390 s390x
%if %{with hpc} %if %{with hpc}
%files devel-static %files devel-static