diff --git a/gsm-1.0.18.tar.gz b/gsm-1.0.18.tar.gz deleted file mode 100644 index bd029ecb67db380abee9ed5ce960e41159d7ed75..0000000000000000000000000000000000000000 Binary files a/gsm-1.0.18.tar.gz and /dev/null differ diff --git a/gsm-1.0.22.tar.gz b/gsm-1.0.22.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..2be40dd433fe4646f3e5c05d9a90ea1ef102b243 Binary files /dev/null and b/gsm-1.0.22.tar.gz differ diff --git a/gsm-makefile.patch b/gsm-makefile.patch index b5b07979efad34c392131609f38ae0aa387b57d6..28ab8d72739b29de56db125f7dc7fe00e28c107d 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 = 18 -+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,71 +111,77 @@ 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 - + \ No newline at end of file diff --git a/gsm.spec b/gsm.spec index c60858b24ea5d96ec49c621c3023a051479d7135..636ffaa74e6259466ecd30bcffc4166541975648 100644 --- a/gsm.spec +++ b/gsm.spec @@ -1,6 +1,6 @@ Name: gsm -Version: 1.0.18 -Release: 6 +Version: 1.0.22 +Release: 1 Summary: GSM speech compressor Shared libraries and Utilities License: MIT URL: http://www.quut.com/gsm/ @@ -34,7 +34,7 @@ Summary: Help files for gsm Contains documents and manuals files for gsm %prep -%autosetup -n %{name}-1.0-pl18 -p1 +%autosetup -n %{name}-1.0-pl22 -p1 %build @@ -52,7 +52,7 @@ echo ".so toast.1" > %{buildroot}%{_mandir}/man1/tcat.1 echo ".so toast.1" > %{buildroot}%{_mandir}/man1/untoast.1 %check -[ -f %{buildroot}%{_libdir}/libgsm.so.%{version} ] +[ -f %{buildroot}%{_libdir}/libgsm.so.1.0.19 ] export LDFLAGS="%{?__global_ldflags}" make addtst @@ -75,6 +75,9 @@ make addtst %{_mandir}/man*/* %changelog +* Thu Feb 01 2024 zhouwenpei - 1.0.22-1 +- update to 1.0.22 + * Fri Apr 14 2023 jammyjellyfish - 1.0.18-6 - Support specify CC