Compare commits

...

No commits in common. 'i10cs' and 'c9' have entirely different histories.
i10cs ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/gsm-1.0.22.tar.gz
SOURCES/gsm-1.0.19.tar.gz

@ -1 +1 @@
9bb93febbacb125dfac38e9bdd6f9231b333fdf7 SOURCES/gsm-1.0.22.tar.gz
3ea15bf487593b589bec1b8d08b25e66c8a125f9 SOURCES/gsm-1.0.19.tar.gz

@ -1,7 +1,6 @@
diff --git a/Makefile b/Makefile
index 2ad5e5d..a1aa787 100644
--- a/Makefile
+++ b/Makefile
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
@@ -44,13 +44,17 @@ WAV49 = -DWAV49
# CCFLAGS = -c -O
@ -16,7 +15,7 @@ index 2ad5e5d..a1aa787 100644
+SO_MAJOR = 1
+SO_MINOR = 0
+SO_PATCH = 19
+SO_PATCH = 18
+SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_PATCH)
# If your compiler needs additional flags/libraries, regardless of
@ -30,7 +29,7 @@ index 2ad5e5d..a1aa787 100644
# Where do you want to install the toast binaries and their manpage?
@@ -91,12 +95,12 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
@@ -91,16 +95,16 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma
TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
@ -45,6 +44,11 @@ index 2ad5e5d..a1aa787 100644
BASENAME = basename
AR = ar
ARFLAGS = cr
-RMFLAGS =
+RMFLAGS = -f
FIND = find
COMPRESS = gzip
COMPRESSFLAGS =
@@ -140,6 +144,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
# Targets
@ -111,76 +115,70 @@ index 2ad5e5d..a1aa787 100644
# The local bin and lib directories
@@ -352,52 +367,55 @@ toastuninstall:
@@ -352,8 +367,7 @@ toastuninstall:
$(TOAST_INSTALL_BIN)/toast: $(TOAST)
-rm $(RMFLAGS) $@
-rm $@
- cp $(TOAST) $@
- chmod 755 $@
+ install -pm755 $(TOAST) $@
$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
-rm $(RMFLAGS) $@
- $(LN) $? $@
+ $(LN) -rs $? $@
$(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
-rm $(RMFLAGS) $@
- $(LN) $? $@
+ $(LN) -rs $? $@
-rm $@
@@ -365,39 +379,43 @@ $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTA
$(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
-rm $(RMFLAGS) $@
-rm $@
- cp $? $@
- chmod 444 $@
+ install -pm644 $? $@
$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
-rm $(RMFLAGS) $@
-rm $@
- cp $? $@
- chmod 444 $@
+ install -pm644 $? $@
$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
-rm $(RMFLAGS) $@
-rm $@
- cp $? $@
- chmod 444 $@
+ install -pm644 $? $@
$(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
-rm $(RMFLAGS) $@
-rm $@
- cp $? $@
- chmod 444 $@
+ install -pm644 $? $@
$(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
-rm $(RMFLAGS) $@
-rm $@
- cp $? $@
- chmod 444 $@
+ install -pm644 $? $@
$(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
-rm $(RMFLAGS) $@
-rm $@
- cp $? $@
- chmod 444 $@
+ install -pm644 $? $@
$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
-rm $(RMFLAGS) $@
-rm $@
- cp $? $@
- chmod 444 $@
+ install -pm644 $? $@
+$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER): $(LIBGSMSO).$(SO_VER)
+ -rm $(RMFLAGS) $@
+ -rm $@
+ install -pm755 $? $@
+
+$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR): $(LIBGSMSO).$(SO_MAJOR)
+ -rm $(RMFLAGS) $@
+ -rm $@
+ ln -s libgsm.so.$(SO_VER) $@
+
+$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO)
+ -rm $(RMFLAGS) $@
+ -rm $@
+ ln -s libgsm.so.$(SO_VER) $@
# Distribution

@ -1,20 +1,19 @@
# on update also change soname in the gsm-makefile.patch
%global ver_major 1
%global ver_minor 0
%global ver_patch 22
%global ver_patch 19
Name: gsm
Version: %{ver_major}.%{ver_minor}.%{ver_patch}
Release: 8%{?dist}
Release: 6%{?dist}
Summary: Shared libraries for GSM speech compressor
License: tu-berlin-2.0
License: MIT
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
BuildRequires: make
%global srcver %{ver_major}.%{ver_minor}-pl%{ver_patch}
@ -113,49 +112,12 @@ export LDFLAGS="%{?__global_ldflags}"
%{_mandir}/man3/gsm_print.3*
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.0.22-8
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.19-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.0.22-7
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.0.22-7
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.22-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.22-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Dec 12 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1.0.22-4
- License converted to SPDX
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sun Aug 7 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1.0.22-1
- New version
Resolves: rhbz#2112903
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jul 19 2022 Dominik Mierzejewski <rpm[AT]greysector.net> 1.0.20-1
- update to 1.0.20 (resolves rhbz#2103499)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.19-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.19-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Apr 29 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1.0.19-5
- Updated soname
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.19-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save