From 7a46f0abc8e91d9567725ccff0582677c51586b3 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 17:57:42 +0000 Subject: [PATCH] import UBI gsm-1.0.22-8.el10 --- .gitignore | 3 +- gating.yaml | 6 --- gsm-makefile.patch | 52 ++++++++++++----------- gsm.spec | 101 +++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 5 files changed, 117 insertions(+), 47 deletions(-) delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 2d6f3c8..f2b7b11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/gsm-1.0.17.tar.gz -/gsm-1.0.17.tar.gz +gsm-1.0.22.tar.gz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index eb7c84f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/gsm-makefile.patch b/gsm-makefile.patch index 8153480..7de6f15 100644 --- a/gsm-makefile.patch +++ b/gsm-makefile.patch @@ -1,6 +1,7 @@ -diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile ---- gsm-1.0-pl17/Makefile.mk 2017-06-28 02:24:24.000000000 +0200 -+++ gsm-1.0-pl17/Makefile 2017-06-29 13:18:44.138719902 +0200 +diff --git a/Makefile b/Makefile +index 2ad5e5d..a1aa787 100644 +--- a/Makefile ++++ b/Makefile @@ -44,13 +44,17 @@ WAV49 = -DWAV49 # CCFLAGS = -c -O @@ -15,8 +16,8 @@ diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile +SO_MAJOR = 1 +SO_MINOR = 0 -+SO_MICRO = 17 -+SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_MICRO) ++SO_PATCH = 19 ++SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_PATCH) # If your compiler needs additional flags/libraries, regardless of # the source compiled, configure them here. @@ -29,7 +30,7 @@ diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile # Where do you want to install the toast binaries and their manpage? -@@ -91,16 +95,16 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma +@@ -91,12 +95,12 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 TOAST_INSTALL_ROOT = $(INSTALL_ROOT) TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin @@ -44,11 +45,6 @@ diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile BASENAME = basename AR = ar ARFLAGS = cr --RMFLAGS = -+RMFLAGS = -f - FIND = find - COMPRESS = compress - COMPRESSFLAGS = @@ -140,6 +144,7 @@ LFLAGS = $(LDFLAGS) $(LDINC) # Targets @@ -115,70 +111,76 @@ diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile # The local bin and lib directories -@@ -352,8 +367,7 @@ toastuninstall: +@@ -352,52 +367,55 @@ toastuninstall: $(TOAST_INSTALL_BIN)/toast: $(TOAST) - -rm $@ + -rm $(RMFLAGS) $@ - cp $(TOAST) $@ - chmod 755 $@ + install -pm755 $(TOAST) $@ $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast - -rm $@ -@@ -365,39 +379,43 @@ $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTA + -rm $(RMFLAGS) $@ +- $(LN) $? $@ ++ $(LN) -rs $? $@ + + $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast + -rm $(RMFLAGS) $@ +- $(LN) $? $@ ++ $(LN) -rs $? $@ $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 - -rm $@ + -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ + install -pm644 $? $@ $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 - -rm $@ + -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ + install -pm644 $? $@ $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 - -rm $@ + -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ + install -pm644 $? $@ $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 - -rm $@ + -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ + install -pm644 $? $@ $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 - -rm $@ + -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ + install -pm644 $? $@ $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h - -rm $@ + -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ + install -pm644 $? $@ $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) - -rm $@ + -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ + install -pm644 $? $@ +$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER): $(LIBGSMSO).$(SO_VER) -+ -rm $@ ++ -rm $(RMFLAGS) $@ + install -pm755 $? $@ + +$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR): $(LIBGSMSO).$(SO_MAJOR) -+ -rm $@ ++ -rm $(RMFLAGS) $@ + ln -s libgsm.so.$(SO_VER) $@ + +$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO) -+ -rm $@ ++ -rm $(RMFLAGS) $@ + ln -s libgsm.so.$(SO_VER) $@ # Distribution diff --git a/gsm.spec b/gsm.spec index 2749c27..7535e5f 100644 --- a/gsm.spec +++ b/gsm.spec @@ -1,19 +1,22 @@ -%global ver_maj 1.0 -%global ver_min 17 +# on update also change soname in the gsm-makefile.patch +%global ver_major 1 +%global ver_minor 0 +%global ver_patch 22 Name: gsm -Version: %{ver_maj}.%{ver_min} -Release: 5%{?dist} +Version: %{ver_major}.%{ver_minor}.%{ver_patch} +Release: 8%{?dist} Summary: Shared libraries for GSM speech compressor -Group: System Environment/Libraries -License: MIT +License: tu-berlin-2.0 URL: http://www.quut.com/gsm/ Source: http://www.quut.com/gsm/%{name}-%{version}.tar.gz Patch0: %{name}-makefile.patch Patch1: %{name}-warnings.patch +BuildRequires: gcc +BuildRequires: make -%global srcver %{ver_maj}-pl%{ver_min} +%global srcver %{ver_major}.%{ver_minor}-pl%{ver_patch} %description Contains runtime shared libraries for libgsm, an implementation of @@ -36,7 +39,6 @@ ETSI standard test patterns. %package tools Summary: GSM speech compressor tools -Group: Applications/Multimedia %description tools Contains command line utilities for libgsm, an implementation of @@ -46,7 +48,6 @@ excitation/long term prediction) coding at 13 kbit/s. %package devel Summary: Header files and development libraries for libgsm -Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} %description devel @@ -62,16 +63,17 @@ full-rate speech transcoding, prI-ETS 300 036, which uses RPE/LTP %build export LDFLAGS="%{?__global_ldflags}" -make %{?_smp_mflags} all +%make_build all SO_MAJOR=%{ver_major} SO_MINOR=%{ver_minor} SO_PATCH=%{ver_patch} %install export LDFLAGS="%{?__global_ldflags}" mkdir -p %{buildroot}{%{_bindir},%{_includedir}/gsm,%{_libdir},%{_mandir}/{man1,man3}} -make install \ +%make_install \ INSTALL_ROOT=%{buildroot}%{_prefix} \ GSM_INSTALL_INC=%{buildroot}%{_includedir}/gsm \ - GSM_INSTALL_LIB=%{buildroot}%{_libdir} + GSM_INSTALL_LIB=%{buildroot}%{_libdir} \ + SO_MAJOR=%{ver_major} SO_MINOR=%{ver_minor} SO_PATCH=%{ver_patch} # some apps look for this in /usr/include ln -s gsm/gsm.h %{buildroot}%{_includedir} @@ -83,7 +85,7 @@ echo ".so toast.1" > %{buildroot}%{_mandir}/man1/untoast.1 # This is to ensure that the patch creates the proper library version. [ -f %{buildroot}%{_libdir}/libgsm.so.%{version} ] export LDFLAGS="%{?__global_ldflags}" -make addtst +%{__make} addtst %ldconfig_scriptlets @@ -111,6 +113,79 @@ make addtst %{_mandir}/man3/gsm_print.3* %changelog +* Tue Oct 29 2024 Troy Dawson - 1.0.22-8 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.0.22-7 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 1.0.22-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1.0.22-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Dec 12 2023 Jaroslav Škarvada - 1.0.22-4 +- License converted to SPDX + +* Thu Jul 20 2023 Fedora Release Engineering - 1.0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.0.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Aug 7 2022 Jaroslav Škarvada - 1.0.22-1 +- New version + Resolves: rhbz#2112903 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.0.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Dominik Mierzejewski 1.0.20-1 +- update to 1.0.20 (resolves rhbz#2103499) + +* Thu Jan 20 2022 Fedora Release Engineering - 1.0.19-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.0.19-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Apr 29 2021 Jaroslav Škarvada - 1.0.19-5 +- Updated soname + +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.0.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Tom Stellard - 1.0.19-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Wed Apr 1 2020 Jaroslav Škarvada - 1.0.19-1 +- New version + Resolves: rhbz#1818181 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.0.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.0.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.0.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Itamar Reis Peixoto - 1.0.18-3 +- include gcc into buildrequires + +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon May 21 2018 Dominik Mierzejewski 1.0.18-1 +- update to 1.0.18 (#1575372) + * Wed Mar 07 2018 Dominik Mierzejewski 1.0.17-5 - ensure binaries are linked with Fedora LDFLAGS (#1548532) - use ldconfig_scriptlets macro diff --git a/sources b/sources index 2318818..133ebbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gsm-1.0.17.tar.gz) = 983b442a1ee3f8bce0523f671071823598c4edb222f8d3de1ad7997c85cbeb7bc49ee87130e12f0f815266a29ad2ef58e59672e81bf41cdadc292baf66942026 +SHA512 (gsm-1.0.22.tar.gz) = f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2