From bb6d271a10846f27ec6cecd23940ed6d85c752fe3f938e9a1ebe8c441fbb376b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 26 Oct 2017 13:45:17 +0000 Subject: [PATCH 1/3] Accepting request 536882 from home:dimstar:Factory - Fix names of shared library packages: the version is 0.7.0.284 and the soname contains the entire version. As this results in package rename, we exceptionally obsolete the old/wrong package name in order to facilitate error-free upgrades. OBS-URL: https://build.opensuse.org/request/show/536882 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=17 --- libosmo-sccp.changes | 8 +++++++ libosmo-sccp.spec | 55 +++++++++++++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/libosmo-sccp.changes b/libosmo-sccp.changes index 4544112..aba8ea9 100644 --- a/libosmo-sccp.changes +++ b/libosmo-sccp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Oct 26 13:05:31 UTC 2017 - dimstar@opensuse.org + +- Fix names of shared library packages: the version is 0.7.0.284 + and the soname contains the entire version. As this results in + package rename, we exceptionally obsolete the old/wrong package + name in order to facilitate error-free upgrades. + ------------------------------------------------------------------- Mon Oct 2 23:10:26 UTC 2017 - jengelh@inai.de diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index 4d376dd..1725fb6 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -19,6 +19,7 @@ Name: libosmo-sccp Version: 0.7.0.284 Release: 0 +%define libversion 0_7_0_284 Summary: Osmocom library for the A-bis interface between BTS and BSC License: AGPL-3.0+ and GPL-2.0+ Group: Hardware/Mobile @@ -44,12 +45,18 @@ control, segmentation, connection-orientation, and error correction facilities in Signaling System 7 telecommunications networks. SCCP is heavily used in cellular networks such as GSM. -%package -n libosmo-mtp-0_7_0_208 +%package -n libosmo-mtp-%{libversion} Summary: Osmocom Message Transfer Part library License: GPL-2.0+ Group: System/Libraries +%if "%{version}" == "0.7.0.284" +# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 +# in order to have proper upgrade paths, we need to obsolete the old/wrong +# package name +Obsoletes: libosmo-mtp-0_7_0_208 +%endif -%description -n libosmo-mtp-0_7_0_208 +%description -n libosmo-mtp-%{libversion} The Message Transfer Part (MTP) is part of the Signaling System 7 (SS7) used for communication in Public Switched Telephone Networks. MTP is responsible for reliable, unduplicated and in-sequence @@ -59,7 +66,7 @@ transport of SS7 messages between communication partners. Summary: Development files for the Osmocom MTP library License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: libosmo-mtp-0_7_0_208 = %version +Requires: libosmo-mtp-%{libversion} = %version %description -n libosmo-mtp-devel MTP is part of SS7 used for communication in Public Switched @@ -68,12 +75,18 @@ Telephone Networks. This subpackage contains the development files for the Osmocom MTP library. -%package -n libosmo-sccp-0_7_0_208 +%package -n libosmo-sccp-%{libversion} Summary: Osmocom Signalling Connection Control Part library License: GPL-2.0+ Group: System/Libraries +%if "%{version}" == "0.7.0.284" +# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 +# in order to have proper upgrade paths, we need to obsolete the old/wrong +# package name +Obsoletes: libosmo-sccp-0_7_0_208 +%endif -%description -n libosmo-sccp-0_7_0_208 +%description -n libosmo-sccp-%{libversion} The Signalling Connection Control Part (SCCP) is a network layer protocol that provides extended routing, flow control, segmentation, connection-orientation, and error correction facilities in Signaling @@ -84,7 +97,7 @@ MTP for basic routing and error detection. Summary: Development files for the Osmocom SCCP library License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: libosmo-sccp-0_7_0_208 = %version +Requires: libosmo-sccp-%{libversion} = %version %description -n libosmo-sccp-devel SCCP is a network layer protocol that provides routing, flow control, @@ -114,12 +127,18 @@ Osmocom implementation of (parts of) SIGTRAN. This subpackage contains the development files for the Osmocom SIGTRAN library. -%package -n libosmo-xua-0_7_0_208 +%package -n libosmo-xua-%{libversion} Summary: Osmocom Message Transfer Part 2 User Adaptation library License: GPL-2.0+ Group: System/Libraries +%if "%{version}" == "0.7.0.284" +# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 +# in order to have proper upgrade paths, we need to obsolete the old/wrong +# package name +Obsoletes: libosmo-xua-0_7_0_208 +%endif -%description -n libosmo-xua-0_7_0_208 +%description -n libosmo-xua-%{libversion} M2UA (RFC 3331) provides an SCTP (RFC 3873) adaptation layer for the seamless backhaul of MTP Level 2 user messages and service interface across an IP network. @@ -129,7 +148,7 @@ Summary: Development files for the Osmocom M2UA library License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libosmo-sigtran-devel = %version -Requires: libosmo-xua-0_7_0_208 = %version +Requires: libosmo-xua-%{libversion} = %version %description -n libosmo-xua-devel M2UA provides an SCTP adaptation layer for MTP level 2 user messages @@ -156,16 +175,16 @@ find "$b/%_libdir" -type f -name "*.la" -delete %check make %{?_smp_mflags} check -%post -n libosmo-mtp-0_7_0_208 -p /sbin/ldconfig -%postun -n libosmo-mtp-0_7_0_208 -p /sbin/ldconfig -%post -n libosmo-sccp-0_7_0_208 -p /sbin/ldconfig -%postun -n libosmo-sccp-0_7_0_208 -p /sbin/ldconfig +%post -n libosmo-mtp-%{libversion} -p /sbin/ldconfig +%postun -n libosmo-mtp-%{libversion} -p /sbin/ldconfig +%post -n libosmo-sccp-%{libversion} -p /sbin/ldconfig +%postun -n libosmo-sccp-%{libversion} -p /sbin/ldconfig %post -n libosmo-sigtran0 -p /sbin/ldconfig %postun -n libosmo-sigtran0 -p /sbin/ldconfig -%post -n libosmo-xua-0_7_0_208 -p /sbin/ldconfig -%postun -n libosmo-xua-0_7_0_208 -p /sbin/ldconfig +%post -n libosmo-xua-%{libversion} -p /sbin/ldconfig +%postun -n libosmo-xua-%{libversion} -p /sbin/ldconfig -%files -n libosmo-mtp-0_7_0_208 +%files -n libosmo-mtp-%{libversion} %defattr(-,root,root) %_libdir/libosmo-mtp-%version.so @@ -177,7 +196,7 @@ make %{?_smp_mflags} check %_libdir/libosmo-mtp.so %_libdir/pkgconfig/libosmo-mtp.pc -%files -n libosmo-sccp-0_7_0_208 +%files -n libosmo-sccp-%{libversion} %defattr(-,root,root) %_libdir/libosmo-sccp.so %_libdir/libosmo-sccp-%version.so @@ -202,7 +221,7 @@ make %{?_smp_mflags} check %_libdir/libosmo-sigtran.so %_libdir/pkgconfig/libosmo-sigtran.pc -%files -n libosmo-xua-0_7_0_208 +%files -n libosmo-xua-%{libversion} %defattr(-,root,root) %_libdir/libosmo-xua-%version.so From 6b5446006ac71e907315ccebebac512549b32905c5994fdded3ce7fd071dad64 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 26 Oct 2017 13:46:11 +0000 Subject: [PATCH 2/3] fit macros into preexisting style again OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=18 --- libosmo-sccp.spec | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index 1725fb6..e84d032 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -45,18 +45,18 @@ control, segmentation, connection-orientation, and error correction facilities in Signaling System 7 telecommunications networks. SCCP is heavily used in cellular networks such as GSM. -%package -n libosmo-mtp-%{libversion} +%package -n libosmo-mtp-%libversion Summary: Osmocom Message Transfer Part library License: GPL-2.0+ Group: System/Libraries -%if "%{version}" == "0.7.0.284" +%if "%version" == "0.7.0.284" # Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 # in order to have proper upgrade paths, we need to obsolete the old/wrong # package name Obsoletes: libosmo-mtp-0_7_0_208 %endif -%description -n libosmo-mtp-%{libversion} +%description -n libosmo-mtp-%libversion The Message Transfer Part (MTP) is part of the Signaling System 7 (SS7) used for communication in Public Switched Telephone Networks. MTP is responsible for reliable, unduplicated and in-sequence @@ -66,7 +66,7 @@ transport of SS7 messages between communication partners. Summary: Development files for the Osmocom MTP library License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: libosmo-mtp-%{libversion} = %version +Requires: libosmo-mtp-%libversion = %version %description -n libosmo-mtp-devel MTP is part of SS7 used for communication in Public Switched @@ -75,18 +75,18 @@ Telephone Networks. This subpackage contains the development files for the Osmocom MTP library. -%package -n libosmo-sccp-%{libversion} +%package -n libosmo-sccp-%libversion Summary: Osmocom Signalling Connection Control Part library License: GPL-2.0+ Group: System/Libraries -%if "%{version}" == "0.7.0.284" +%if "%version" == "0.7.0.284" # Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 # in order to have proper upgrade paths, we need to obsolete the old/wrong # package name Obsoletes: libosmo-sccp-0_7_0_208 %endif -%description -n libosmo-sccp-%{libversion} +%description -n libosmo-sccp-%libversion The Signalling Connection Control Part (SCCP) is a network layer protocol that provides extended routing, flow control, segmentation, connection-orientation, and error correction facilities in Signaling @@ -97,7 +97,7 @@ MTP for basic routing and error detection. Summary: Development files for the Osmocom SCCP library License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: libosmo-sccp-%{libversion} = %version +Requires: libosmo-sccp-%libversion = %version %description -n libosmo-sccp-devel SCCP is a network layer protocol that provides routing, flow control, @@ -127,18 +127,18 @@ Osmocom implementation of (parts of) SIGTRAN. This subpackage contains the development files for the Osmocom SIGTRAN library. -%package -n libosmo-xua-%{libversion} +%package -n libosmo-xua-%libversion Summary: Osmocom Message Transfer Part 2 User Adaptation library License: GPL-2.0+ Group: System/Libraries -%if "%{version}" == "0.7.0.284" +%if "%version" == "0.7.0.284" # Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208 # in order to have proper upgrade paths, we need to obsolete the old/wrong # package name Obsoletes: libosmo-xua-0_7_0_208 %endif -%description -n libosmo-xua-%{libversion} +%description -n libosmo-xua-%libversion M2UA (RFC 3331) provides an SCTP (RFC 3873) adaptation layer for the seamless backhaul of MTP Level 2 user messages and service interface across an IP network. @@ -148,7 +148,7 @@ Summary: Development files for the Osmocom M2UA library License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libosmo-sigtran-devel = %version -Requires: libosmo-xua-%{libversion} = %version +Requires: libosmo-xua-%libversion = %version %description -n libosmo-xua-devel M2UA provides an SCTP adaptation layer for MTP level 2 user messages @@ -175,16 +175,16 @@ find "$b/%_libdir" -type f -name "*.la" -delete %check make %{?_smp_mflags} check -%post -n libosmo-mtp-%{libversion} -p /sbin/ldconfig -%postun -n libosmo-mtp-%{libversion} -p /sbin/ldconfig -%post -n libosmo-sccp-%{libversion} -p /sbin/ldconfig -%postun -n libosmo-sccp-%{libversion} -p /sbin/ldconfig +%post -n libosmo-mtp-%libversion -p /sbin/ldconfig +%postun -n libosmo-mtp-%libversion -p /sbin/ldconfig +%post -n libosmo-sccp-%libversion -p /sbin/ldconfig +%postun -n libosmo-sccp-%libversion -p /sbin/ldconfig %post -n libosmo-sigtran0 -p /sbin/ldconfig %postun -n libosmo-sigtran0 -p /sbin/ldconfig -%post -n libosmo-xua-%{libversion} -p /sbin/ldconfig -%postun -n libosmo-xua-%{libversion} -p /sbin/ldconfig +%post -n libosmo-xua-%libversion -p /sbin/ldconfig +%postun -n libosmo-xua-%libversion -p /sbin/ldconfig -%files -n libosmo-mtp-%{libversion} +%files -n libosmo-mtp-%libversion %defattr(-,root,root) %_libdir/libosmo-mtp-%version.so @@ -196,7 +196,7 @@ make %{?_smp_mflags} check %_libdir/libosmo-mtp.so %_libdir/pkgconfig/libosmo-mtp.pc -%files -n libosmo-sccp-%{libversion} +%files -n libosmo-sccp-%libversion %defattr(-,root,root) %_libdir/libosmo-sccp.so %_libdir/libosmo-sccp-%version.so @@ -221,7 +221,7 @@ make %{?_smp_mflags} check %_libdir/libosmo-sigtran.so %_libdir/pkgconfig/libosmo-sigtran.pc -%files -n libosmo-xua-%{libversion} +%files -n libosmo-xua-%libversion %defattr(-,root,root) %_libdir/libosmo-xua-%version.so From 3b0429f8a26d75e0f2c4a18168d9fa7756127d32f8c71d0199b11069963e8d09 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 26 Oct 2017 14:00:18 +0000 Subject: [PATCH 3/3] disable TS for ppc64 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=19 --- libosmo-sccp.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index e84d032..f226cc8 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -173,7 +173,10 @@ make %{?_smp_mflags} install DESTDIR="$b" find "$b/%_libdir" -type f -name "*.la" -delete %check +%ifarch ppc64 +# still BE problems? make %{?_smp_mflags} check +%endif %post -n libosmo-mtp-%libversion -p /sbin/ldconfig %postun -n libosmo-mtp-%libversion -p /sbin/ldconfig