update to 1.0.22
This commit is contained in:
zhouwenpei
parent
b6db6ba8f8
commit
a00e7ecd8e
Binary file not shown.
BIN
gsm-1.0.22.tar.gz
Normal file
BIN
gsm-1.0.22.tar.gz
Normal file
Binary file not shown.
@ -1,6 +1,7 @@
|
|||||||
diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
--- gsm-1.0-pl17/Makefile.mk 2017-06-28 02:24:24.000000000 +0200
|
index 2ad5e5d..a1aa787 100644
|
||||||
+++ gsm-1.0-pl17/Makefile 2017-06-29 13:18:44.138719902 +0200
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
@@ -44,13 +44,17 @@ WAV49 = -DWAV49
|
@@ -44,13 +44,17 @@ WAV49 = -DWAV49
|
||||||
# CCFLAGS = -c -O
|
# CCFLAGS = -c -O
|
||||||
|
|
||||||
@ -15,8 +16,8 @@ diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile
|
|||||||
|
|
||||||
+SO_MAJOR = 1
|
+SO_MAJOR = 1
|
||||||
+SO_MINOR = 0
|
+SO_MINOR = 0
|
||||||
+SO_MICRO = 18
|
+SO_PATCH = 19
|
||||||
+SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_MICRO)
|
+SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_PATCH)
|
||||||
|
|
||||||
# If your compiler needs additional flags/libraries, regardless of
|
# If your compiler needs additional flags/libraries, regardless of
|
||||||
# the source compiled, configure them here.
|
# 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?
|
# 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_ROOT = $(INSTALL_ROOT)
|
||||||
TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
|
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
|
BASENAME = basename
|
||||||
AR = ar
|
AR = ar
|
||||||
ARFLAGS = cr
|
ARFLAGS = cr
|
||||||
-RMFLAGS =
|
|
||||||
+RMFLAGS = -f
|
|
||||||
FIND = find
|
|
||||||
COMPRESS = compress
|
|
||||||
COMPRESSFLAGS =
|
|
||||||
@@ -140,6 +144,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
|
@@ -140,6 +144,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
|
||||||
# Targets
|
# Targets
|
||||||
|
|
||||||
@ -115,70 +111,76 @@ diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile
|
|||||||
|
|
||||||
|
|
||||||
# The local bin and lib directories
|
# The local bin and lib directories
|
||||||
@@ -352,8 +367,7 @@ toastuninstall:
|
@@ -352,52 +367,55 @@ toastuninstall:
|
||||||
|
|
||||||
$(TOAST_INSTALL_BIN)/toast: $(TOAST)
|
$(TOAST_INSTALL_BIN)/toast: $(TOAST)
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
- cp $(TOAST) $@
|
- cp $(TOAST) $@
|
||||||
- chmod 755 $@
|
- chmod 755 $@
|
||||||
+ install -pm755 $(TOAST) $@
|
+ install -pm755 $(TOAST) $@
|
||||||
|
|
||||||
$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
|
$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
@@ -365,39 +379,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
|
$(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
- cp $? $@
|
- cp $? $@
|
||||||
- chmod 444 $@
|
- chmod 444 $@
|
||||||
+ install -pm644 $? $@
|
+ install -pm644 $? $@
|
||||||
|
|
||||||
$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
|
$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
- cp $? $@
|
- cp $? $@
|
||||||
- chmod 444 $@
|
- chmod 444 $@
|
||||||
+ install -pm644 $? $@
|
+ install -pm644 $? $@
|
||||||
|
|
||||||
$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
|
$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
- cp $? $@
|
- cp $? $@
|
||||||
- chmod 444 $@
|
- chmod 444 $@
|
||||||
+ install -pm644 $? $@
|
+ install -pm644 $? $@
|
||||||
|
|
||||||
$(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
|
$(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
- cp $? $@
|
- cp $? $@
|
||||||
- chmod 444 $@
|
- chmod 444 $@
|
||||||
+ install -pm644 $? $@
|
+ install -pm644 $? $@
|
||||||
|
|
||||||
$(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
|
$(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
- cp $? $@
|
- cp $? $@
|
||||||
- chmod 444 $@
|
- chmod 444 $@
|
||||||
+ install -pm644 $? $@
|
+ install -pm644 $? $@
|
||||||
|
|
||||||
$(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
|
$(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
- cp $? $@
|
- cp $? $@
|
||||||
- chmod 444 $@
|
- chmod 444 $@
|
||||||
+ install -pm644 $? $@
|
+ install -pm644 $? $@
|
||||||
|
|
||||||
$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
|
$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
|
||||||
-rm $@
|
-rm $(RMFLAGS) $@
|
||||||
- cp $? $@
|
- cp $? $@
|
||||||
- chmod 444 $@
|
- chmod 444 $@
|
||||||
+ install -pm644 $? $@
|
+ install -pm644 $? $@
|
||||||
|
|
||||||
+$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER): $(LIBGSMSO).$(SO_VER)
|
+$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER): $(LIBGSMSO).$(SO_VER)
|
||||||
+ -rm $@
|
+ -rm $(RMFLAGS) $@
|
||||||
+ install -pm755 $? $@
|
+ install -pm755 $? $@
|
||||||
+
|
+
|
||||||
+$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR): $(LIBGSMSO).$(SO_MAJOR)
|
+$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR): $(LIBGSMSO).$(SO_MAJOR)
|
||||||
+ -rm $@
|
+ -rm $(RMFLAGS) $@
|
||||||
+ ln -s libgsm.so.$(SO_VER) $@
|
+ ln -s libgsm.so.$(SO_VER) $@
|
||||||
+
|
+
|
||||||
+$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO)
|
+$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO)
|
||||||
+ -rm $@
|
+ -rm $(RMFLAGS) $@
|
||||||
+ ln -s libgsm.so.$(SO_VER) $@
|
+ ln -s libgsm.so.$(SO_VER) $@
|
||||||
|
|
||||||
# Distribution
|
# Distribution
|
||||||
|
|||||||
11
gsm.spec
11
gsm.spec
@ -1,6 +1,6 @@
|
|||||||
Name: gsm
|
Name: gsm
|
||||||
Version: 1.0.18
|
Version: 1.0.22
|
||||||
Release: 6
|
Release: 1
|
||||||
Summary: GSM speech compressor Shared libraries and Utilities
|
Summary: GSM speech compressor Shared libraries and Utilities
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://www.quut.com/gsm/
|
URL: http://www.quut.com/gsm/
|
||||||
@ -34,7 +34,7 @@ Summary: Help files for gsm
|
|||||||
Contains documents and manuals files for gsm
|
Contains documents and manuals files for gsm
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-1.0-pl18 -p1
|
%autosetup -n %{name}-1.0-pl22 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -52,7 +52,7 @@ echo ".so toast.1" > %{buildroot}%{_mandir}/man1/tcat.1
|
|||||||
echo ".so toast.1" > %{buildroot}%{_mandir}/man1/untoast.1
|
echo ".so toast.1" > %{buildroot}%{_mandir}/man1/untoast.1
|
||||||
|
|
||||||
%check
|
%check
|
||||||
[ -f %{buildroot}%{_libdir}/libgsm.so.%{version} ]
|
[ -f %{buildroot}%{_libdir}/libgsm.so.1.0.19 ]
|
||||||
export LDFLAGS="%{?__global_ldflags}"
|
export LDFLAGS="%{?__global_ldflags}"
|
||||||
make addtst
|
make addtst
|
||||||
|
|
||||||
@ -75,6 +75,9 @@ make addtst
|
|||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 01 2024 zhouwenpei <zhouwenpei1@h-partners.com> - 1.0.22-1
|
||||||
|
- update to 1.0.22
|
||||||
|
|
||||||
* Fri Apr 14 2023 jammyjellyfish <jammyjellyfish255@outlook.com> - 1.0.18-6
|
* Fri Apr 14 2023 jammyjellyfish <jammyjellyfish255@outlook.com> - 1.0.18-6
|
||||||
- Support specify CC
|
- Support specify CC
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user