commit 4cba727c9d8d1e15c0be7eb680a23310817a327b Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sun Jul 2 14:23:12 2017 +0200
- updated to 6.18.0 (note: new sonames) - added env patch (don't touch system variables which don't require changing) lal-env.patch | 14 +++++++ lal.spec | 125 +++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 111 insertions(+), 28 deletions(-) --- diff --git a/lal.spec b/lal.spec index 81a326e..5428fab 100644 --- a/lal.spec +++ b/lal.spec @@ -1,19 +1,36 @@ -Summary: LALSuite is comprised of various gravitational wave data analysis routines +# TODO: bconds for boinc, cuda +Summary: LALSuite - various gravitational wave data analysis routines +Summary(pl.UTF-8): LALSuite - różne procedury do analizy danych fal grawitacyjnych Name: lal -Version: 6.15.0 -Release: 2 +Version: 6.18.0 +Release: 1 License: GPL v2 Group: Applications/Science -Source0: https://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite/%{name}-%{version}.tar.gz -# Source0-md5: 67fb4647b08f9ba2b9c4e561daf6e3e5 -URL: https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html -BuildRequires: fftw3-common-devel -BuildRequires: gsl-devel -BuildRequires: metaio-devel +Source0: http://software.ligo.org/lscsoft/source/lalsuite/%{name}-%{version}.tar.xz +# Source0-md5: a278f190758c4902055a57efa6d406d4 +Patch0: %{name}-env.patch +URL: https://wiki.ligo.org/DASWG/LALSuite +BuildRequires: autoconf >= 2.63 +BuildRequires: automake >= 1:1.11 +BuildRequires: fftw3-devel +BuildRequires: fftw3-single-devel +BuildRequires: gsl-devel >= 1.13 +BuildRequires: hdf5-devel +BuildRequires: libstdc++-devel +BuildRequires: libtool >= 2:2 +BuildRequires: octave-devel >= 2:3.2.0 BuildRequires: pkgconfig -BuildRequires: python +BuildRequires: python-devel >= 1:2.6 +BuildRequires: python-numpy-devel >= 1.7 +# 2.0.12 for octave 3.2, 3.0.7 for octave 4.0, 3.0.12 for octave 4.2 +BuildRequires: swig >= 3.0.12 +BuildRequires: swig-python >= 2.0.12 +BuildRequires: tar >= 1:1.22 BuildRequires: texlive-dvips BuildRequires: texlive-format-pdflatex +BuildRequires: xz +BuildRequires: zlib-devel +Requires: gsl >= 1.13 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -21,39 +38,80 @@ LALSuite is comprised of various gravitational wave data analysis routines written in C following the ISO/IEC 9899:1999 standard, more commonly referred to as C99. +%description -l pl.UTF-8 +LALSuite składa się z różnych procedur do analizy danych fal +grawitacyjnych, napisanych w C zgodnie ze standardem ISO/IEC +9899:1999, bardziej znanym jako C99. + %package devel -Summary: Development files for LAL +Summary: Header files for LAL core libraries +Summary(pl.UTF-8): Pliki nagłówkowe podstawowych bibliotek LAL Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: fftw3-devel Requires: fftw3-single-devel +Requires: gsl-devel >= 1.13 Requires: zlib-devel %description devel -Development files for LAL. +Header files for LAL core libraries. + +%description devel -l pl.UTF-8 +Pliki nagłówkowe podstawowych bibliotek LAL. %package static -Summary: Static LAL library +Summary: Static LAL core libraries +Summary(pl.UTF-8): Statyczne podstawowe biblioteki LAL Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static -Static LAL library. +Static LAL core libraries. + +%description static -l pl.UTF-8 +Statyczne podstawowe biblioteki LAL. + +%package -n octave-lal +Summary: Octave LAL interface +Summary(pl.UTF-8): Interfejs Octave do bibliotek LAL +Group: Applications/Math +Requires: %{name} = %{version}-%{release} +Requires: octave + +%description -n octave-lal +Octave LAL interface. + +%description -n octave-lal -l pl.UTF-8 +Interfejs Octave do bibliotek LAL. %package -n python-lal Summary: LAL Python bindings +Summary(pl.UTF-8): Wiązania Pythona do bibliotek LAL Group: Libraries/Python Requires: %{name} = %{version}-%{release} +Requires: python-modules >= 1:2.6 +Requires: python-numpy >= 1:1.7 -%description -n python-lal +%description -n python-lal LAL Python bindings. +%description -n python-lal -l pl.UTF-8 +Wiązania Pythona do bibliotek LAL. + %prep %setup -q +%patch0 -p1 %build +%{__libtoolize} +%{__aclocal} -I gnuscripts +%{__autoconf} +%{__autoheader} +%{__automake} %configure \ - ac_cv_path_GIT=no-you-dont + ac_cv_path_GIT=no-you-dont \ + --disable-silent-rules \ + --enable-swig %{__make} %install @@ -62,8 +120,11 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# obsoleted by pkg-config +%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblal*.la + install -d $RPM_BUILD_ROOT/etc/shrc.d -mv $RPM_BUILD_ROOT%{_sysconfdir}/*sh $RPM_BUILD_ROOT/etc/shrc.d +%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/*sh $RPM_BUILD_ROOT/etc/shrc.d %py_postclean @@ -73,29 +134,37 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS README -%{_sysconfdir}/shrc.d/lal-user-env.* -%attr(755,root,root) %{_bindir}/lal-simd-detect -%attr(755,root,root) %{_bindir}/lal-version +%{_sysconfdir}/shrc.d/lal-user-env.csh +%{_sysconfdir}/shrc.d/lal-user-env.fish +%{_sysconfdir}/shrc.d/lal-user-env.sh +%attr(755,root,root) %{_bindir}/lal_simd_detect +%attr(755,root,root) %{_bindir}/lal_version %attr(755,root,root) %{_libdir}/liblal.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liblal.so.11 +%attr(755,root,root) %ghost %{_libdir}/liblal.so.14 %attr(755,root,root) %{_libdir}/liblalsupport.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liblalsupport.so.7 +%attr(755,root,root) %ghost %{_libdir}/liblalsupport.so.11 %files devel %defattr(644,root,root,755) -%{_libdir}/lib*.la -%{_libdir}/lib*.so -%{_pkgconfigdir}/*.pc -%dir %{_includedir}/lal -%{_includedir}/lal/* +%attr(755,root,root) %{_libdir}/liblal.so +%attr(755,root,root) %{_libdir}/liblalsupport.so +%{_includedir}/lal +%{_pkgconfigdir}/lal.pc +%{_pkgconfigdir}/lalsupport.pc %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/liblal.a +%{_libdir}/liblalsupport.a + +%files -n octave-lal +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/octave/*/site/oct/*/lal.oct %files -n python-lal %defattr(644,root,root,755) %dir %{py_sitedir}/lal +%attr(755,root,root) %{py_sitedir}/lal/_lal.so %{py_sitedir}/lal/*.py[co] %dir %{py_sitedir}/lal/spectrum %{py_sitedir}/lal/spectrum/*.py[co] diff --git a/lal-env.patch b/lal-env.patch new file mode 100644 index 0000000..1b067de --- /dev/null +++ b/lal-env.patch @@ -0,0 +1,14 @@ +--- lal-6.18.0/Makefile.am.orig 2015-03-27 05:14:38.000000000 +0100 ++++ lal-6.18.0/Makefile.am 2017-07-02 11:55:20.751535928 +0200 +@@ -23,11 +23,6 @@ + user_environment = \ + set $(PACKAGE)_PREFIX $(prefix); \ + set $(PACKAGE)_DATADIR $(pkgdatadir); \ +- prepend MANPATH $(mandir); \ +- prepend OCTAVE_PATH $(octexecdir); \ +- prepend PATH $(bindir); \ +- prepend PKG_CONFIG_PATH $(libdir)/pkgconfig; \ +- prepend PYTHONPATH $(pyexecdir) $(pythondir); \ + $(END_OF_LIST) + + pkgconfigdir = $(libdir)/pkgconfig ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lal.git/commitdiff/4cba727c9d8d1e15c0be7eb680a23310817a327b _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit