diff --git a/gstlal-inspiral/gstlal-inspiral.spec.in b/gstlal-inspiral/gstlal-inspiral.spec.in index 0e3d9d891cabe3098ee2cdaf48901b78ce78d4f8..9aab80efbb792b4ba19c92ddae47b3d99b93c45e 100644 --- a/gstlal-inspiral/gstlal-inspiral.spec.in +++ b/gstlal-inspiral/gstlal-inspiral.spec.in @@ -27,7 +27,7 @@ Requires: lalinspiral-python >= @MIN_LALINSPIRAL_VERSION@ Requires: gsl Requires: ligo-gracedb >= 1.11 Requires: python-gstreamer1 -BuildRequires: doxygen +BuildRequires: doxygen >= @MIN_DOXYGEN_VERSION@ BuildRequires: graphviz BuildRequires: gstlal-devel >= @MIN_GSTLAL_VERSION@ BuildRequires: python-devel >= @MIN_PYTHON_VERSION@ @@ -69,10 +69,7 @@ plugins and programs. %build . /opt/lscsoft/gst/gstenvironment.sh -# FIXME: enable doxygen when we can rely on a platform with a new-enough -# version. don't forget to uncomment the documentation entries in the -# files section -%configure --without-doxygen +%configure %{__make} @@ -113,9 +110,7 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version} %defattr(-,root,root) %{_bindir}/* %{_datadir}/gstlal/* -# commented out until RPM-based reference platform can be relied upon to -# have a new-enough doxygen installed -#%{_docdir}/gstlal-inspiral-* +%{_docdir}/gstlal-inspiral-* %{_libdir}/*.so.* %{_libdir}/gstreamer-0.10/*.so %{_libdir}/gstreamer-0.10/python/* diff --git a/gstlal-ugly/gstlal-ugly.spec.in b/gstlal-ugly/gstlal-ugly.spec.in index c6cb937ad2afb486d90addc69a10acbd11e45a91..17dff3fd4b51c35e14cf3aab667f518aefbb9b12 100644 --- a/gstlal-ugly/gstlal-ugly.spec.in +++ b/gstlal-ugly/gstlal-ugly.spec.in @@ -28,7 +28,7 @@ Requires: cyrus-sasl-lib Requires: nds2-client >= @MIN_NDS_VERSION@ Requires: orc >= @MIN_ORC_VERSION@ Requires: python-gstreamer1 -BuildRequires: doxygen +BuildRequires: doxygen >= @MIN_DOXYGEN_VERSION@ BuildRequires: graphviz BuildRequires: gstlal-devel >= @MIN_GSTLAL_VERSION@ BuildRequires: python-devel >= @MIN_PYTHON_VERSION@ @@ -74,10 +74,7 @@ plugins and programs. %build . /opt/lscsoft/gst/gstenvironment.sh -# FIXME: enable doxygen when we can rely on a platform with a new-enough -# version. don't forget to uncomment the documentation entries in the -# files section -%configure --without-doxygen +%configure %{__make} @@ -118,9 +115,7 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version} %defattr(-,root,root) %{_bindir}/* %{_datadir}/gstlal/* -# commented out until RPM-based reference platform can be relied upon to -# have a new-enough doxygen installed -#%{_docdir}/gstlal-* +%{_docdir}/gstlal-* %{_libdir}/gstreamer-@GSTREAMER_RELEASE@/*.so %{_libdir}/gstreamer-@GSTREAMER_RELEASE@/python/* %{_prefix}/%{_lib}/python*/site-packages/gstlal diff --git a/gstlal/gstlal.spec.in b/gstlal/gstlal.spec.in index 059c74bfb1c8cca6d2752b2f0a0c62dca1e92c60..b498259567dce0c8f455bb5d58850ce79715d90c 100644 --- a/gstlal/gstlal.spec.in +++ b/gstlal/gstlal.spec.in @@ -28,7 +28,7 @@ Requires: orc >= @MIN_ORC_VERSION@ Requires: dbus-python Requires: avahi-ui-tools Requires: python-gstreamer1 -BuildRequires: doxygen +BuildRequires: doxygen >= @MIN_DOXYGEN_VERSION@ BuildRequires: graphviz BuildRequires: python-devel >= @MIN_PYTHON_VERSION@ BuildRequires: gobject-introspection-devel >= @MIN_GOBJECT_INTROSPECTION_VERSION@ @@ -74,10 +74,7 @@ and programs. %build -# FIXME: enable doxygen when we can rely on a platform with a new-enough -# version. don't forget to uncomment the documentation entries in the -# files section -%configure --without-doxygen +%configure %{__make} @@ -119,9 +116,7 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version} %{_bindir}/* %{_datadir}/gstlal %{_datadir}/gtk-doc/html/gstlal-* -# commented out until RPM-based reference platform can be relied upon to -# have a new-enough doxygen installed -#%{_docdir}/gstlal-* +%{_docdir}/gstlal-* %{_libdir}/*.so.* %{_libdir}/gstreamer-@GSTREAMER_RELEASE@/*.so %{_libdir}/gstreamer-@GSTREAMER_RELEASE@/python/*