Merge branch 'pkgconfig-private' into 'master'

Use private fields in pkgconfig files

See merge request !8

gstlal-burst/configure.ac

@@ -99,7 +99,7 @@ case `cat /etc/redhat-release 2> /dev/null` in
     ;;
 esac
 LT_INIT
-PKG_PROG_PKG_CONFIG()
+PKG_PROG_PKG_CONFIG(0.18.0)
 
 
 #

gstlal-burst/debian/control.in

@@ -13,7 +13,7 @@ Build-Depends:
  lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
  python-glue (>= @MIN_GLUE_VERSION@),
  fakeroot,
- pkg-config,
+ pkg-config (>= 0.18.0),
  gstlal-dev (>= @MIN_GSTLAL_VERSION@),
  gstlal-ugly-dev (>= @MIN_GSTLAL_UGLY_VERSION@)
 

gstlal-burst/gstlal-burst.spec.in

@@ -26,6 +26,7 @@ Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
 Requires: lalburst >= @MIN_LALBURST_VERSION@
 Requires: orc >= @MIN_ORC_VERSION@
 Requires: gsl
+BuildRequires: pkgconfig >= 0.18.0
 BuildRequires: gobject-introspection-devel >= @MIN_GOBJECT_INTROSPECTION_VERSION@
 BuildRequires: gstlal-devel >= @MIN_GSTLAL_VERSION@
 BuildRequires: python-devel >= @MIN_PYTHON_VERSION@

gstlal-burst/lib/gstlal-burst/gstlal-burst.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libgstlalburst
 Description: LAL/Gstreamer Library (the bursty bits)
 Version: @VERSION@
-Requires: lal lalmetaio lalburst gstlal
+Requires.private: lal lalmetaio lalburst gstlal
 Libs: -L${libdir} -lgstlalburst
 Cflags: -I${includedir}

gstlal-calibration/configure.ac

@@ -96,7 +96,7 @@ case `cat /etc/redhat-release 2> /dev/null` in
     ;;
 esac
 LT_INIT
-PKG_PROG_PKG_CONFIG()
+PKG_PROG_PKG_CONFIG(0.18.0)
 
 
 #

gstlal-calibration/debian/control.in

@@ -12,7 +12,7 @@ Build-Depends:
  lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
- pkg-config,
+ pkg-config (>= 0.18.0),
  python-all-dev (>= @MIN_PYTHON_VERSION@),
  python-numpy
 

gstlal-calibration/gstlal-calibration.spec.in

@@ -21,6 +21,7 @@ Requires: lal >= @MIN_LAL_VERSION@
 Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
 Requires: gst-plugins-math >= @MIN_GSTPLUGINSMATH_VERSION@
 
+BuildRequires: pkgconfig >= 0.18.0
 BuildRequires: gstlal-devel >= @MIN_GSTLAL_VERSION@
 BuildRequires: python-devel >= @MIN_PYTHON_VERSION@
 BuildRequires: fftw-devel >= 3

gstlal-inspiral/configure.ac

@@ -107,7 +107,7 @@ case `cat /etc/redhat-release 2> /dev/null` in
     ;;
 esac
 LT_INIT
-PKG_PROG_PKG_CONFIG()
+PKG_PROG_PKG_CONFIG(0.18.0)
 
 MIN_DOXYGEN_VERSION="1.8.3"
 GSTLAL_DOXYGEN([$MIN_DOXYGEN_VERSION])

gstlal-inspiral/debian/control.in

@@ -23,7 +23,7 @@ Build-Depends:
  libgsl-dev (>= 1.9),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
- pkg-config,
+ pkg-config (>= 0.18.0),
  python-all-dev (>= @MIN_PYTHON_VERSION@),
  python-glue (>= @MIN_GLUE_VERSION@),
  python-glue-ligolw-tools,

gstlal-inspiral/gstlal-inspiral.spec.in

@@ -28,6 +28,7 @@ Requires: lalinspiral-python >= @MIN_LALINSPIRAL_VERSION@
 Requires: gsl
 Requires: ligo-gracedb >= 1.11
 Requires: python-%{gstreamername}
+BuildRequires: pkgconfig >= 0.18.0
 BuildRequires: doxygen >= @MIN_DOXYGEN_VERSION@
 BuildRequires: gobject-introspection-devel >= @MIN_GOBJECT_INTROSPECTION_VERSION@
 BuildRequires: graphviz

gstlal-ugly/configure.ac

@@ -105,7 +105,7 @@ case `cat /etc/redhat-release 2> /dev/null` in
     ;;
 esac
 LT_INIT
-PKG_PROG_PKG_CONFIG()
+PKG_PROG_PKG_CONFIG(0.18.0)
 
 MIN_DOXYGEN_VERSION="1.8.3"
 GSTLAL_DOXYGEN([$MIN_DOXYGEN_VERSION])

gstlal-ugly/debian/control.in

@@ -25,7 +25,7 @@ Build-Depends:
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libnds2-client-dev (>= @MIN_NDS_VERSION@),
  liborc-0.4-dev (>= 1:@MIN_ORC_VERSION@),
- pkg-config,
+ pkg-config (>= 0.18.0),
  python-all-dev (>= @MIN_PYTHON_VERSION@),
  python-glue (>= @MIN_GLUE_VERSION@),
  python-glue-ligolw-tools,

gstlal-ugly/gstlal-ugly.spec.in

@@ -28,6 +28,7 @@ Requires: gds-lowlatency >= @MIN_GDS_VERSION@
 Requires: nds2-client >= @MIN_NDS_VERSION@
 Requires: orc >= @MIN_ORC_VERSION@
 Requires: python-%{gstreamername}
+BuildRequires: pkgconfig >= 0.18.0
 BuildRequires: doxygen  >= @MIN_DOXYGEN_VERSION@
 BuildRequires: graphviz
 BuildRequires: gstlal-devel >= @MIN_GSTLAL_VERSION@

gstlal/configure.ac

@@ -101,7 +101,7 @@ case `cat /etc/redhat-release 2> /dev/null` in
     ;;
 esac
 LT_INIT
-PKG_PROG_PKG_CONFIG()
+PKG_PROG_PKG_CONFIG(0.18.0)
 
 MIN_DOXYGEN_VERSION="1.8.3"
 GSTLAL_DOXYGEN([$MIN_DOXYGEN_VERSION])

gstlal/debian/control.in

@@ -25,7 +25,7 @@ Build-Depends:
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstrtspserver-1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  liborc-0.4-dev (>= 1:@MIN_ORC_VERSION@),
- pkg-config,
+ pkg-config (>= 0.18.0),
  python-all-dev (>= @MIN_PYTHON_VERSION@),
  python-gi-dev (>= @MIN_PYGOBJECT_VERSION@),
  python-numpy-dev (>= @MIN_NUMPY_VERSION@),

gstlal/gstlal.spec.in

@@ -37,6 +37,7 @@ Requires: python-%{gstreamername}
 Requires: python-gobject >= @MIN_PYGOBJECT_VERSION@
 Requires: scipy
 Requires: zlib
+BuildRequires: pkgconfig >= 0.18.0
 BuildRequires: doxygen >= @MIN_DOXYGEN_VERSION@
 BuildRequires: fftw-devel >= 3
 BuildRequires: gobject-introspection-devel >= @MIN_GOBJECT_INTROSPECTION_VERSION@

gstlal/lib/gstlal/gstlal.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libgstlal
 Description: LAL/Gstreamer Library
 Version: @VERSION@
-Requires: fftw3 gsl lal lalframe lalmetaio lalsupport lalburst gstreamer-@GSTREAMER_RELEASE@ gstreamer-base-@GSTREAMER_RELEASE@ gstreamer-audio-@GSTREAMER_RELEASE@ gstreamer-video-@GSTREAMER_RELEASE@ gstreamer-plugins-base-@GSTREAMER_RELEASE@
+Requires.private: fftw3 gsl lal lalframe lalmetaio lalsupport lalburst gstreamer-@GSTREAMER_RELEASE@ gstreamer-base-@GSTREAMER_RELEASE@ gstreamer-audio-@GSTREAMER_RELEASE@ gstreamer-video-@GSTREAMER_RELEASE@ gstreamer-plugins-base-@GSTREAMER_RELEASE@
 Libs: -L${libdir} -lgstlal -lgstlaltags -lgstlaltypes
 Cflags: -I${includedir}