laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-pfcp/+/29049 )
Change subject: RPM: fix .spec file
......................................................................
RPM: fix .spec file
Change-Id: Ie2fa0770b94af8637483434068b7c0df4b4272c6
---
M configure.ac
M contrib/libosmo-pfcp.spec.in
2 files changed, 77 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/configure.ac b/configure.ac
index f146c20..446f0b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,7 @@
AC_CONFIG_FILES([
libosmo-gtlv.pc
libosmo-pfcp.pc
+ contrib/libosmo-pfcp.spec
include/Makefile
include/osmocom/Makefile
include/osmocom/gtlv/Makefile
diff --git a/contrib/libosmo-pfcp.spec.in b/contrib/libosmo-pfcp.spec.in
index d3cf821..9e2c06a 100644
--- a/contrib/libosmo-pfcp.spec.in
+++ b/contrib/libosmo-pfcp.spec.in
@@ -12,12 +12,58 @@
BuildRequires: lksctp-tools-devel
BuildRequires: pkgconfig >= 0.20
BuildRequires: pkgconfig(libosmocore) >= 1.6.0
-BuildRequires: pkgconfig(libosmoctrl) >= 1.6.0
-BuildRequires: pkgconfig(libosmovty) >= 1.6.0
BuildRequires: pkgconfig(talloc)
%description
-libosmo-pfcp: PFCP protocol encoding and decoding, and generic PFCP endpoint
implementation
+Description: Osmocom PFCP protocol implementation (metapackage)
+
+Install Osmocom PFCP and generic TLV protocol libraries.
+libosmo-gtlv and libosmo-pfcp
+
+
+%package -n libosmo-gtlv0
+Summary: Generic TLV and TLIV protocol support
+License: GPL-2.0-or-later AND AGPL-3.0-or-later
+Group: System/Libraries
+
+%description -n libosmo-gtlv0
+Decoding, encoding and logging of protocols using a Tag-Length-Value and/or
+Tag-Length-Instance-Value structure.
+
+
+%package -n libosmo-gtlv-devel
+Summary: Development files for libosmo-pfcp
+License: GPL-2.0-or-later
+Group: Development/Libraries/C and C++
+Requires: libosmo-gtlv0 = %{version}
+
+%description -n libosmo-gtlv-devel
+libosmo-pfcp implements decoding, encoding and endpoint implementation of the
+Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular
+contains the files for compiling a program using this library.
+
+
+%package -n libosmo-pfcp0
+Summary: PFCP protocol support
+License: GPL-2.0-or-later AND AGPL-3.0-or-later
+Group: System/Libraries
+
+%description -n libosmo-pfcp0
+PFCP protocol support: Decoding, encoding and endpoint implementation of the
+Packet Forwarding Control Protocol (3GPP TS 29.244).
+
+
+%package -n libosmo-pfcp-devel
+Summary: Development files for libosmo-pfcp
+License: GPL-2.0-or-later
+Group: Development/Libraries/C and C++
+Requires: libosmo-pfcp0 = %{version}
+
+%description -n libosmo-pfcp-devel
+libosmo-pfcp implements decoding, encoding and endpoint implementation of the
+Packet Forwarding Control Protocol (3GPP TS 29.244). This package in particular
+contains the files for compiling a program using this library.
+
%prep
%setup -q
@@ -30,13 +76,36 @@
%install
%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
%check
make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-%files
-%license COPYING
-%doc AUTHORS README.md
-%{_bindir}/libosmo-pfcp
+%post -n libosmo-gtlv0 -p /sbin/ldconfig
+%postun -n libosmo-gtlv0 -p /sbin/ldconfig
+%post -n libosmo-pfcp0 -p /sbin/ldconfig
+%postun -n libosmo-pfcp0 -p /sbin/ldconfig
+
+%files -n libosmo-gtlv0
+%{_libdir}/libosmo-gltv.so.0*
+
+%files -n libosmo-gtlv-devel
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/osmocom
+%{_includedir}/%{name}/osmocom/gtlv
+%{_libdir}/libosmo-gtlv.so
+%{_libdir}/libosmo-gtlv.a
+%{_libdir}/pkgconfig/libosmo-gtlv.pc
+
+%files -n libosmo-pfcp0
+%{_libdir}/libosmo-pfcp.so.0*
+
+%files -n libosmo-pfcp-devel
+%dir %{_includedir}/%{name}
+%dir %{_includedir}/%{name}/osmocom
+%{_includedir}/%{name}/osmocom/pfcp
+%{_libdir}/libosmo-pfcp.so
+%{_libdir}/libosmo-pfcp.a
+%{_libdir}/pkgconfig/libosmo-pfcp.pc
%changelog
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/29049
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Ie2fa0770b94af8637483434068b7c0df4b4272c6
Gerrit-Change-Number: 29049
Gerrit-PatchSet: 1
Gerrit-Owner: neels <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
