diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-10-26 08:29:40 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-10-26 09:21:02 +0200 |
| commit | 6a77d1ffa5683448fe16cadca0bb41f3c84e5ffb (patch) | |
| tree | ac5b4af30a043357d9b6a58ad7b2030768c48c11 | |
| parent | b1103fc8e3dafee522eda99888daa0ce164601fa (diff) | |
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
| -rw-r--r-- | contrib/osmo-iuh.spec.in | 16 |
1 files changed, 13 insertions, 3 deletions
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 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %{_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 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %{_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 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %{_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 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %{_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 |