From dcef191405883a3f30ee118baa9d5c3f822755c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Sun, 7 Aug 2022 23:32:15 +0200
Subject: [PATCH] New version

  Resolves: rhbz#2112903
---
 .gitignore         |  1 +
 gsm-makefile.patch | 29 ++++++++++++++++++-----------
 gsm.spec           |  8 ++++++--
 sources            |  2 +-
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index ba4613a..f70b26c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gsm-1.0.13.tar.gz
 /gsm-1.0.18.tar.gz
 /gsm-1.0.19.tar.gz
 /gsm-1.0.20.tar.gz
+/gsm-1.0.22.tar.gz
diff --git a/gsm-makefile.patch b/gsm-makefile.patch
index 7630a6e..7de6f15 100644
--- a/gsm-makefile.patch
+++ b/gsm-makefile.patch
@@ -1,6 +1,7 @@
-diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
---- gsm-1.0-pl20/Makefile.mk	2022-07-03 19:49:29.000000000 +0200
-+++ gsm-1.0-pl20/Makefile	2022-07-19 10:20:35.123611479 +0200
+diff --git a/Makefile b/Makefile
+index 2ad5e5d..a1aa787 100644
+--- a/Makefile
++++ b/Makefile
 @@ -44,13 +44,17 @@ WAV49	= -DWAV49
  # CCFLAGS 	= -c -O
  
@@ -20,7 +21,7 @@ diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
  
  # If your compiler needs additional flags/libraries, regardless of
  # the source compiled, configure them here.
-@@ -84,7 +88,7 @@ VERSION = 1.0-pl20
+@@ -81,7 +85,7 @@ INSTALL_ROOT	=
  GSM_INSTALL_ROOT = $(INSTALL_ROOT)
  GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
  GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
@@ -29,7 +30,7 @@ diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
  
  
  # Where do you want to install the toast binaries and their manpage?
-@@ -94,12 +98,12 @@ 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,7 +45,7 @@ diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
  BASENAME 	= basename
  AR		= ar
  ARFLAGS		= cr
-@@ -143,6 +147,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
+@@ -140,6 +144,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
  # Targets
  
  LIBGSM	= $(LIB)/libgsm.a
@@ -52,7 +53,7 @@ diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
  
  TOAST	= $(BIN)/toast
  UNTOAST	= $(BIN)/untoast
-@@ -260,7 +265,9 @@ STUFF = 	ChangeLog			\
+@@ -257,7 +262,9 @@ STUFF = 	ChangeLog			\
  # Install targets
  
  GSM_INSTALL_TARGETS =	\
@@ -63,7 +64,7 @@ diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
  		$(GSM_INSTALL_INC)/gsm.h		\
  		$(GSM_INSTALL_MAN)/gsm.3		\
  		$(GSM_INSTALL_MAN)/gsm_explode.3	\
-@@ -282,7 +289,7 @@ TOAST_INSTALL_TARGETS =	\
+@@ -279,7 +286,7 @@ TOAST_INSTALL_TARGETS =	\
  
  # Target rules
  
@@ -72,7 +73,7 @@ diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -302,24 +309,32 @@ install:	toastinstall gsminstall
+@@ -299,24 +306,32 @@ install:	toastinstall gsminstall
  
  # The basic API: libgsm
  
@@ -110,7 +111,7 @@ diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
  
  
  # The local bin and lib directories
-@@ -355,8 +370,7 @@ toastuninstall:
+@@ -352,52 +367,55 @@ toastuninstall:
  
  $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
  		-rm $(RMFLAGS) $@
@@ -120,7 +121,13 @@ diff -up gsm-1.0-pl20/Makefile.mk gsm-1.0-pl20/Makefile
  
  $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
  		-rm $(RMFLAGS) $@
-@@ -368,39 +382,43 @@ $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTA
+-		$(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 $(RMFLAGS) $@
diff --git a/gsm.spec b/gsm.spec
index d2611c1..d7325df 100644
--- a/gsm.spec
+++ b/gsm.spec
@@ -1,11 +1,11 @@
 # on update also change soname in the gsm-makefile.patch
 %global ver_major 1
 %global ver_minor 0
-%global ver_patch 20
+%global ver_patch 22
 
 Name:           gsm
 Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Shared libraries for GSM speech compressor
 
 License:        MIT
@@ -113,6 +113,10 @@ export LDFLAGS="%{?__global_ldflags}"
 %{_mandir}/man3/gsm_print.3*
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index c988f6a..133ebbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gsm-1.0.20.tar.gz) = 8a57395cd22ff1e0340619aefc279693cbed7c4616b6e6ddc33fffca35361ddfe26b6c5a64ddcb5a9bb455797ca79aa1b7b8a31671dab1a003c544da78fc2ec5
+SHA512 (gsm-1.0.22.tar.gz) = f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2