From 80a36f879acd3ac2666feb380b31fdf1a3897658 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Thu, 5 May 2016 20:40:11 -0700
Subject: [PATCH] gstlal, gstlal-ugly: adjust dependencies
---
gstlal-ugly/debian/control.in | 15 +++++++++------
gstlal-ugly/gstlal-ugly.spec.in | 6 +++---
gstlal/debian/control.in | 21 ++++++++++++++-------
gstlal/gstlal.spec.in | 6 +++---
4 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/gstlal-ugly/debian/control.in b/gstlal-ugly/debian/control.in
index b96fc280c8..ab593b0d0a 100644
--- a/gstlal-ugly/debian/control.in
+++ b/gstlal-ugly/debian/control.in
@@ -10,9 +10,11 @@ Build-Depends:
gds-crtools (>= @MIN_GDS_VERSION@),
gds-dev (>= @MIN_GDS_VERSION@),
gds-services (>= @MIN_GDS_VERSION@),
- gstlal-dep (>= 2.2) | gstenvironment,
gstlal-dev (>= @MIN_GSTLAL_VERSION@),
gtk-doc-tools,
+ ldas-tools-framecpp-dev (>= @MIN_FRAMECPP_VERSION@),
+ libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
lal-dev (>= @MIN_LAL_VERSION@),
lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
ldas-tools-framecpp-dev (>= @MIN_FRAMECPP_VERSION@),
@@ -25,7 +27,6 @@ Build-Depends:
pkg-config,
python-all-dev (>= @MIN_PYTHON_VERSION@),
python-glue (>= @MIN_GLUE_VERSION@),
- python-gobject-dev,
python-numpy
Package: gstlal-ugly
@@ -36,7 +37,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
gds-crtools (>= @MIN_GDS_VERSION@),
gds-services (>= @MIN_GDS_VERSION@),
gstlal (>= @MIN_GSTLAL_VERSION@),
- gstlal-dep (>= 2.2) | gstenvironment,
+ ldas-tools-framecpp (>= @MIN_FRAMECPP_VERSION@),
+ libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
lal (>= @MIN_LAL_VERSION@),
lalmetaio (>= @MIN_LALMETAIO_VERSION@),
ldas-tools-framecpp (>= @MIN_FRAMECPP_VERSION@),
@@ -49,7 +52,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
python-dbus,
python-glue (>= @MIN_GLUE_VERSION@),
python-glue-segments (>= @MIN_GLUE_VERSION@),
- python-gobject,
python-numpy,
python-pylal (>= @MIN_PYLAL_VERSION@),
python-scipy
@@ -69,10 +71,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
gstlal-ugly (= ${binary:Version}),
lal-dev (>= @MIN_LAL_VERSION@),
lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
+ libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
libfftw3-dev,
libgsl0-dev,
- libreadline-dev,
- python-gobject-dev
+ libreadline-dev
Description: Files and documentation needed for compiling gstlal-ugly based plugins and programs.
This package contains the files needed for building gstlal-ugly based
plugins ands programs.
diff --git a/gstlal-ugly/gstlal-ugly.spec.in b/gstlal-ugly/gstlal-ugly.spec.in
index c7bf5ee326..2aa076facc 100644
--- a/gstlal-ugly/gstlal-ugly.spec.in
+++ b/gstlal-ugly/gstlal-ugly.spec.in
@@ -6,8 +6,8 @@ Release: 1.lscsoft
Summary: GSTLAL Experimental Supplements
License: GPL
Group: LSC Software/Data Analysis
-Requires: gstlal >= @MIN_GSTLAL_VERSION@ python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ fftw >= 3 %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 1.2.4 %{gstreamername}-python >= 0.10.21 pygobject2 numpy scipy lal >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@ gsl ldas-tools-framecpp >= @MIN_FRAMECPP_VERSION@ gds-core >= @MIN_GDS_VERSION@ gds-crtools >= @MIN_GDS_VERSION@ gds-services >= @MIN_GDS_VERSION@ cyrus-sasl-lib nds2-client >= @MIN_NDS_VERSION@ orc >= @MIN_ORC_VERSION@ dbus-python avahi-ui-tools
-BuildRequires: doxygen graphviz gstlal-devel >= @MIN_GSTLAL_VERSION@ python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ pygobject2-devel lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ gsl-devel ldas-tools-framecpp-devel >= @MIN_FRAMECPP_VERSION@ gds-devel >= @MIN_GDS_VERSION@ cyrus-sasl-devel nds2-client-devel >= @MIN_NDS_VERSION@ nds2-client-headers >= @MIN_NDS_VERSION@ orc >= @MIN_ORC_VERSION@
+Requires: gstlal >= @MIN_GSTLAL_VERSION@ python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ fftw >= 3 %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 1.2.4 %{gstreamername}-python >= 0.10.21 numpy scipy lal >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@ gsl ldas-tools-framecpp >= @MIN_FRAMECPP_VERSION@ gds-core >= @MIN_GDS_VERSION@ gds-crtools >= @MIN_GDS_VERSION@ gds-services >= @MIN_GDS_VERSION@ cyrus-sasl-lib nds2-client >= @MIN_NDS_VERSION@ orc >= @MIN_ORC_VERSION@ dbus-python avahi-ui-tools
+BuildRequires: doxygen graphviz gstlal-devel >= @MIN_GSTLAL_VERSION@ python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ gsl-devel ldas-tools-framecpp-devel >= @MIN_FRAMECPP_VERSION@ gds-devel >= @MIN_GDS_VERSION@ cyrus-sasl-devel nds2-client-devel >= @MIN_NDS_VERSION@ nds2-client-headers >= @MIN_NDS_VERSION@ orc >= @MIN_ORC_VERSION@
Source: @PACKAGE_NAME@-%{version}.tar.gz
URL: https://www.lsc-group.phys.uwm.edu/daswg/projects/gstlal.html
Packager: Kipp Cannon <kipp.cannon@ligo.org>
@@ -26,7 +26,7 @@ gstlal-based applications.
%package devel
Summary: Files and documentation needed for compiling gstlal-based plugins and programs.
Group: LSC Software/Data Analysis
-Requires: %{name} = %{version} gstlal-devel >= @MIN_GSTLAL_VERSION@ python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ pygobject2-devel lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ gsl-devel nds2-client-headers >= @MIN_NDS_VERSION@
+Requires: %{name} = %{version} gstlal-devel >= @MIN_GSTLAL_VERSION@ python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ gsl-devel nds2-client-headers >= @MIN_NDS_VERSION@
%description devel
This package contains the files needed for building gstlal-ugly based
plugins and programs.
diff --git a/gstlal/debian/control.in b/gstlal/debian/control.in
index 988f64ddba..d7936930b8 100644
--- a/gstlal/debian/control.in
+++ b/gstlal/debian/control.in
@@ -8,10 +8,11 @@ Build-Depends:
debhelper (>= 8),
fakeroot,
gtk-doc-tools (>= @MIN_GTK_DOC_VERSION@),
+ libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
liborc-0.4-0 (>= 1:@MIN_ORC_VERSION@),
liborc-0.4-dev (>= 1:@MIN_ORC_VERSION@),
libfftw3-dev (>= 3),
- gstlal-dep (>= 2.2) | gstenvironment,
lal-dev (>= @MIN_LAL_VERSION@),
lal-python (>= @MIN_LAL_VERSION@),
lalburst-dev (>= @MIN_LALBURST_VERSION@),
@@ -22,7 +23,6 @@ Build-Depends:
libxml2-dev,
pkg-config,
python-all-dev (>= @MIN_PYTHON_VERSION@),
- python-gobject-dev,
python-numpy-dev
Package: gstlal
@@ -30,7 +30,15 @@ Architecture: any
Replaces: gstlal-ugly (<< 0.4.0)
Breaks: gstlal-ugly (<< 0.4.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- gstlal-dep (>= 2.2) | gstenvironment,
+ gstreamer1.0-plugins-base (>= @MIN_GSTREAMER_VERSION@),
+ gstreamer1.0-plugins-good (>= @MIN_GSTREAMER_VERSION@),
+ gstreamer1.0-plugins-bad,
+ gstreamer1.0-plugins-ugly,
+ libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
+ gstreamer1.0-tools (>= @MIN_GSTREAMER_VERSION@),
+ gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
+ gir1.2-gst-plugins-base-1.0 (>= @MIN_GSTREAMER_VERSION@),
libfftw3-3,
liborc-0.4-0 (>= 1:@MIN_ORC_VERSION@),
lal (>= @MIN_LAL_VERSION@),
@@ -44,7 +52,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
python (>= @MIN_PYTHON_VERSION@),
python-glue (>= @MIN_GLUE_VERSION@),
python-glue-segments (>= @MIN_GLUE_VERSION@),
- python-gobject,
python-numpy,
python-pylal (>= @MIN_PYLAL_VERSION@),
python-scipy
@@ -61,7 +68,8 @@ Package: gstlal-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
gstlal (= ${binary:Version}),
- gstlal-dep (>= 2.2) | gstenvironment,
+ libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
lal-dev (>= @MIN_LAL_VERSION@),
lalburst-dev (>= @MIN_LALBURST_VERSION@),
lalinspiral-dev (>= @MIN_LALINSPIRAL_VERSION@),
@@ -71,8 +79,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libgsl0-dev (>= 1.9),
liborc-0.4-0 (>=1:@MIN_ORC_VERSION@),
liborc-0.4-dev (>= 1:@MIN_ORC_VERSION@),
- python-all-dev (>= @MIN_PYTHON_VERSION@),
- python-gobject-dev
+ python-all-dev (>= @MIN_PYTHON_VERSION@)
Description: Files and documentation needed for compiling gstlal based plugins and programs.
This package contains the files needed for building gstlal-based plugins
and programs.
diff --git a/gstlal/gstlal.spec.in b/gstlal/gstlal.spec.in
index 1341664102..d435131cc6 100644
--- a/gstlal/gstlal.spec.in
+++ b/gstlal/gstlal.spec.in
@@ -6,8 +6,8 @@ Release: 1.lscsoft
Summary: GSTLAL
License: GPL
Group: LSC Software/Data Analysis
-Requires: python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ fftw >= 3 %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 1.2.4 %{gstreamername}-python >= 0.10.21 pygobject2 numpy scipy lal >= @MIN_LAL_VERSION@ lal-python >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@ lalsimulation >= @MIN_LALSIMULATION_VERSION@ lalburst >= @MIN_LALBURST_VERSION@ lalinspiral >= @MIN_LALINSPIRAL_VERSION@ gsl orc >= @MIN_ORC_VERSION@
-BuildRequires: doxygen graphviz python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ pygobject2-devel numpy lal-devel >= @MIN_LAL_VERSION@ lal-python >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@ lalburst-devel >= @MIN_LALBURST_VERSION@ lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@ gsl-devel orc >= @MIN_ORC_VERSION@
+Requires: python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ fftw >= 3 %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 1.2.4 %{gstreamername}-python >= 0.10.21 numpy scipy lal >= @MIN_LAL_VERSION@ lal-python >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@ lalsimulation >= @MIN_LALSIMULATION_VERSION@ lalburst >= @MIN_LALBURST_VERSION@ lalinspiral >= @MIN_LALINSPIRAL_VERSION@ gsl orc >= @MIN_ORC_VERSION@
+BuildRequires: doxygen graphviz python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ numpy lal-devel >= @MIN_LAL_VERSION@ lal-python >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@ lalburst-devel >= @MIN_LALBURST_VERSION@ lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@ gsl-devel orc >= @MIN_ORC_VERSION@
Source: @PACKAGE_NAME@-%{version}.tar.gz
URL: https://www.lsc-group.phys.uwm.edu/daswg/projects/gstlal.html
Packager: Kipp Cannon <kipp.cannon@ligo.org>
@@ -26,7 +26,7 @@ gstlal-based applications.
%package devel
Summary: Files and documentation needed for compiling gstlal-based plugins and programs.
Group: LSC Software/Data Analysis
-Requires: %{name} = %{version} python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ pygobject2-devel lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@ lalburst-devel >= @MIN_LALBURST_VERSION@ lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@ gsl-devel
+Requires: %{name} = %{version} python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@ lalburst-devel >= @MIN_LALBURST_VERSION@ lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@ gsl-devel
%description devel
This package contains the files needed for building gstlal-based plugins
and programs.
--
GitLab