This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25952 )
Change subject: contrib/osmo-iuh.spec.in: fix header packaging
......................................................................
contrib/osmo-iuh.spec.in: fix header packaging
Fix the conflict from having %{_includedir}/* in multiple packages by
replacing it with the correct subdir path.
Fix for:
found conflict of libosmo-hnbap-devel-0.7.0.11.b110.202110260026-1.1.armv7hl with libosmo-ranap-devel-0.7.0.11.b110.202110260026-1.1.armv7hl:
- /usr/include/osmocom/hnbap/Access-stratum-release-indicator.h
- /usr/include/osmocom/hnbap/AccessResult.h
- /usr/include/osmocom/hnbap/AdditionalNeighbourInfoList.h
...
I've verified that it builds again in my own OBS namespace.
Related: SYS#5516
Fixes: 35f2bd ("Provide libosmo-hnbap as a public shared library")
Fixes: dba8b0 ("Provide libosmo-rua as a public shared library")
Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc
---
M contrib/osmo-iuh.spec.in
1 file changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/52/25952/1
diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in
index 2ef38a3..b4f14f2 100644
--- a/contrib/osmo-iuh.spec.in
+++ b/contrib/osmo-iuh.spec.in
@@ -2,6 +2,7 @@
# spec file for package osmo-iuh
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 sysmocom - s.f.m.c GmbH
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -154,7 +155,9 @@
%{_libdir}/libosmo-hnbap.so.0*
%files -n libosmo-hnbap-devel
-%{_includedir}/*
+%dir %{_includedir}/osmocom/
+%dir %{_includedir}/osmocom/hnbap/
+%{_includedir}/osmocom/hnbap/*
%{_libdir}/libosmo-hnbap.so
%{_libdir}/pkgconfig/libosmo-hnbap.pc
@@ -162,7 +165,9 @@
%{_libdir}/libosmo-ranap.so.3*
%files -n libosmo-ranap-devel
-%{_includedir}/*
+%dir %{_includedir}/osmocom/
+%dir %{_includedir}/osmocom/ranap/
+%{_includedir}/osmocom/ranap/*
%{_libdir}/libosmo-ranap.so
%{_libdir}/pkgconfig/libosmo-ranap.pc
@@ -170,7 +175,9 @@
%{_libdir}/libosmo-rua.so.0*
%files -n libosmo-rua-devel
-%{_includedir}/*
+%dir %{_includedir}/osmocom/
+%dir %{_includedir}/osmocom/rua/
+%{_includedir}/osmocom/rua/*
%{_libdir}/libosmo-rua.so
%{_libdir}/pkgconfig/libosmo-rua.pc
@@ -178,6 +185,9 @@
%{_libdir}/libosmo-sabp.so.0*
%files -n libosmo-sabp-devel
+%dir %{_includedir}/osmocom/
+%dir %{_includedir}/osmocom/sabp/
+%{_includedir}/osmocom/sabp/*
%{_libdir}/libosmo-sabp.so
%{_libdir}/pkgconfig/libosmo-sabp.pc
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25952
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc
Gerrit-Change-Number: 25952
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211026/d3dfda10/attachment.htm>