From fc01877e38079ffcdb18f44f072e9b7faa7e46e0 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Mon, 25 Dec 2017 15:36:16 +0900
Subject: [PATCH] gstlal, gstlal-ugly, gstlal-inspiral: adjust packaging
- update gstlal-ugly's .spec and debian/install files to account for addition of library code to the package
- alphabetize gstlal and gstlal-inspiral's files
- don't package the /usr/include/ directory, only its contents
---
gstlal-inspiral/gstlal-inspiral.spec.in | 6 +++---
gstlal-ugly/debian/gstlal-ugly-dev.install | 4 ++++
gstlal-ugly/debian/gstlal-ugly.install | 1 +
gstlal-ugly/gstlal-ugly.spec.in | 5 +++++
gstlal/debian/gstlal-dev.install | 4 ++--
gstlal/gstlal.spec.in | 2 +-
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/gstlal-inspiral/gstlal-inspiral.spec.in b/gstlal-inspiral/gstlal-inspiral.spec.in
index ce69f2b3d7..491879904f 100644
--- a/gstlal-inspiral/gstlal-inspiral.spec.in
+++ b/gstlal-inspiral/gstlal-inspiral.spec.in
@@ -113,14 +113,14 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}
%{_datadir}/gstlal/*
%{_docdir}/gstlal-inspiral-*
%{_libdir}/*.so.*
-%{_libdir}/gstreamer-*/*.so
-#%{_libdir}/gstreamer-*/python/*
+%{_libdir}/gstreamer-@GSTREAMER_RELEASE@/*.so
+#%{_libdir}/gstreamer-@GSTREAMER_RELEASE@/python/*
%{_prefix}/%{_lib}/python*/site-packages/gstlal
%files devel
%defattr(-,root,root)
%{_libdir}/*.a
%{_libdir}/*.so
+%{_libdir}/gstreamer-@GSTREAMER_RELEASE@/*.a
%{_libdir}/pkgconfig/*
-%{_libdir}/gstreamer-*/*.a
%{_includedir}/*
diff --git a/gstlal-ugly/debian/gstlal-ugly-dev.install b/gstlal-ugly/debian/gstlal-ugly-dev.install
index 81f3a3f915..8f16a27695 100644
--- a/gstlal-ugly/debian/gstlal-ugly-dev.install
+++ b/gstlal-ugly/debian/gstlal-ugly-dev.install
@@ -1 +1,5 @@
+usr/lib/*/*a
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/*
usr/lib/*/gstreamer-*/*a
+usr/include/*
diff --git a/gstlal-ugly/debian/gstlal-ugly.install b/gstlal-ugly/debian/gstlal-ugly.install
index dd614aa172..eb4d15a852 100644
--- a/gstlal-ugly/debian/gstlal-ugly.install
+++ b/gstlal-ugly/debian/gstlal-ugly.install
@@ -1,4 +1,5 @@
usr/bin/*
+usr/lib/*/*.so.*
usr/lib/*/gstreamer-*/*.so*
#usr/lib/*/gstreamer-*/python/*
usr/lib/python*/*/gstlal
diff --git a/gstlal-ugly/gstlal-ugly.spec.in b/gstlal-ugly/gstlal-ugly.spec.in
index fabd2dce6f..4d926a9018 100644
--- a/gstlal-ugly/gstlal-ugly.spec.in
+++ b/gstlal-ugly/gstlal-ugly.spec.in
@@ -116,10 +116,15 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}
%{_datadir}/gstlal/*
# there's no documentation
#%{_docdir}/gstlal-ugly-*
+%{_libdir}/*.so.*
%{_libdir}/gstreamer-@GSTREAMER_RELEASE@/*.so
#%{_libdir}/gstreamer-@GSTREAMER_RELEASE@/python/*
%{_prefix}/%{_lib}/python*/site-packages/gstlal
%files devel
%defattr(-,root,root)
+%{_includedir}/gstlal-ugly
+%{_libdir}/*.a
+%{_libdir}/*.so
%{_libdir}/gstreamer-@GSTREAMER_RELEASE@/*.a
+%{_libdir}/pkgconfig/*
diff --git a/gstlal/debian/gstlal-dev.install b/gstlal/debian/gstlal-dev.install
index b3bd2fb7b7..8f16a27695 100644
--- a/gstlal/debian/gstlal-dev.install
+++ b/gstlal/debian/gstlal-dev.install
@@ -1,5 +1,5 @@
usr/lib/*/*a
usr/lib/*/*.so
-usr/lib/*/pkgconfig
+usr/lib/*/pkgconfig/*
usr/lib/*/gstreamer-*/*a
-usr/include
+usr/include/*
diff --git a/gstlal/gstlal.spec.in b/gstlal/gstlal.spec.in
index 5a82a32bba..4cf2b0ec5c 100644
--- a/gstlal/gstlal.spec.in
+++ b/gstlal/gstlal.spec.in
@@ -141,6 +141,6 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}
%defattr(-,root,root)
%{_libdir}/*.a
%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
%{_libdir}/gstreamer-@GSTREAMER_RELEASE@/*.a
+%{_libdir}/pkgconfig/*
%{_includedir}/*
--
GitLab