From fed97b27ef34474d8aa6c169fa6d29f24a4f091f Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Wed, 6 Jul 2016 16:19:34 +0900
Subject: [PATCH] gstlal-calibration: tweak packaging files, bump version to
0.99.1
- remove reference to python elements and to interleave plugin
- update name of gstreamer python bindings RPM
- don't source gstenvironment.sh in .spec
- bump minimum required gstlal and gstlal-ugly for ER9
---
gstlal-calibration/configure.ac | 6 +++---
gstlal-calibration/debian/changelog | 6 ++++++
.../debian/gstlal-calibration.install | 6 +-----
gstlal-calibration/gstlal-calibration.spec.in | 13 +++----------
4 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/gstlal-calibration/configure.ac b/gstlal-calibration/configure.ac
index deb2741f79..f66f1977ad 100644
--- a/gstlal-calibration/configure.ac
+++ b/gstlal-calibration/configure.ac
@@ -3,7 +3,7 @@
#
-AC_INIT([gstlal-calibration],[0.99.0],[gstlal-discuss@ligo.org],[gstlal-calibration])
+AC_INIT([gstlal-calibration],[0.99.1],[gstlal-discuss@ligo.org],[gstlal-calibration])
AC_COPYRIGHT([Copyright (C) 2008--2016 Madeline Wade])
# a file whose existance can be used to use to check that we are in the
# top-level directory of the source tree
@@ -229,8 +229,8 @@ AX_PYTHON_PYLAL()
#
-AC_SUBST([MIN_GSTLAL_VERSION], [0.99.0])
-AC_SUBST([MIN_GSTLALUGLY_VERSION], [0.99.0])
+AC_SUBST([MIN_GSTLAL_VERSION], [0.99.4])
+AC_SUBST([MIN_GSTLALUGLY_VERSION], [0.99.2])
PKG_CHECK_MODULES([GSTLAL], [gstlal >= ${MIN_GSTLAL_VERSION}])
AC_SUBST([GSTLAL_VERSION], [`$PKG_CONFIG --modversion gstlal`])
AX_GSTLAL_SPLIT_VERSION([GSTLAL_VERSION])
diff --git a/gstlal-calibration/debian/changelog b/gstlal-calibration/debian/changelog
index 80a407437e..f9f547042c 100644
--- a/gstlal-calibration/debian/changelog
+++ b/gstlal-calibration/debian/changelog
@@ -1,3 +1,9 @@
+gstlal-calibration (0.99.1-1) unstable; urgency=low
+
+ * More packaging related adjustments
+
+ -- Kipp Cannon <kipp.cannon@ligo.org> Wed, 05 Jul 2016 16:22:00 +0900
+
gstlal-calibration (0.99.0-2) unstable; urgency=low
* A few updates to the .spec file for dependencies
diff --git a/gstlal-calibration/debian/gstlal-calibration.install b/gstlal-calibration/debian/gstlal-calibration.install
index 0a41307f56..ebfc80c2cd 100644
--- a/gstlal-calibration/debian/gstlal-calibration.install
+++ b/gstlal-calibration/debian/gstlal-calibration.install
@@ -1,6 +1,2 @@
usr/bin/*
-usr/lib/gstreamer-*/python/*
-usr/lib/gstreamer-*/libgstlalcalibration.a
-usr/lib/gstreamer-*/libgstlalcalibration.so
-usr/lib/gstreamer-*/libgstlalinterleave.a
-usr/lib/gstreamer-*/libgstlalinterleave.so
+usr/lib/gstreamer-*/libgstlalcalibration.*
diff --git a/gstlal-calibration/gstlal-calibration.spec.in b/gstlal-calibration/gstlal-calibration.spec.in
index 2f1d6ca77a..ab51bcbe2a 100644
--- a/gstlal-calibration/gstlal-calibration.spec.in
+++ b/gstlal-calibration/gstlal-calibration.spec.in
@@ -15,8 +15,8 @@ Requires: glue-segments >= @MIN_GLUE_VERSION@
Requires: python-pylal >= @MIN_PYLAL_VERSION@
Requires: %{gstreamername} >= @MIN_GSTREAMER_VERSION@
Requires: %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@
-Requires: %{gstreamername}-plugins-good >= 1.2.4
-Requires: %{gstreamername}-python >= 0.10.21
+Requires: %{gstreamername}-plugins-good >= @MIN_GSTREAMER_VERSION@
+Requires: python-%{gstreamername}
Requires: numpy
Requires: scipy
Requires: lal >= @MIN_LAL_VERSION@
@@ -44,7 +44,6 @@ This package contains the plugins and shared libraries required to run the gstla
%build
-. /opt/lscsoft/gst/gstenvironment.sh
%configure
%{__make}
@@ -85,11 +84,5 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}
%files
%defattr(-,root,root)
%{_bindir}/*
-%{_libdir}/gstreamer-1.0/python/*
-%{_libdir}/gstreamer-1.0/libgstlalcalibration.a
-%{_libdir}/gstreamer-1.0/libgstlalcalibration.so
-%{_libdir}/gstreamer-1.0/libgstlaldeinterleave.a
-%{_libdir}/gstreamer-1.0/libgstlaldeinterleave.so
-%{_libdir}/gstreamer-1.0/libgstlalinterleave.a
-%{_libdir}/gstreamer-1.0/libgstlalinterleave.so
+%{_libdir}/gstreamer-*/libgstlalcalibration.*
%{_prefix}/%{_lib}/python*/site-packages/gstlal
--
GitLab