diff --git a/gsm-1.0.13-makefile.patch b/gsm-1.0.13-makefile.patch deleted file mode 100644 index a839461..0000000 --- a/gsm-1.0.13-makefile.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- gsm-1.0-pl12/Makefile.mk 2006-04-26 21:14:26.000000000 +0200 -+++ gsm-1.0-pl12/Makefile 2007-05-13 13:03:32.000000000 +0200 -@@ -30,6 +30,10 @@ - ######### define this, and read about the GSM_OPT_WAV49 option in the - ######### manual page on gsm_option(3). - -+PG = -+#PG = -g -pg -+######### Profiling flags. If you don't know what that means, leave it blank -+ - # Choose a compiler. The code works both with ANSI and K&R-C. - # Use -DNeedFunctionPrototypes to compile with, -UNeedFunctionPrototypes to - # compile without, function prototypes in the header files. -@@ -44,7 +48,7 @@ - # CCFLAGS = -c -O - - CC = gcc -ansi -pedantic --CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -+CCFLAGS = -c $(RPM_OPT_FLAGS) -D_REENTRANT -DNeedFunctionPrototypes=1 -fPIC - - LD = $(CC) - -@@ -81,7 +85,7 @@ - GSM_INSTALL_ROOT = $(INSTALL_ROOT) - GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib - GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc --GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 -+GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3 - - - # Where do you want to install the toast binaries and their manpage? -@@ -91,16 +95,16 @@ - - TOAST_INSTALL_ROOT = $(INSTALL_ROOT) - TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin --TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1 -+TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1 - - # Other tools - - SHELL = /bin/sh --LN = ln -+LN = ln -s - BASENAME = basename - AR = ar - ARFLAGS = cr --RMFLAGS = -+RMFLAGS = -f - FIND = find - COMPRESS = compress - COMPRESSFLAGS = -@@ -129,17 +133,18 @@ - # DEBUG = -DNDEBUG - ######### Remove -DNDEBUG to enable assertions. - --CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ -+CFLAGS = $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ - $(WAV49) $(CCINC) -I$(INC) - ######### It's $(CC) $(CFLAGS) - --LFLAGS = $(LDFLAGS) $(LDINC) -+LFLAGS = $(PG) $(LDFLAGS) $(LDINC) - ######### It's $(LD) $(LFLAGS) - - - # Targets - - LIBGSM = $(LIB)/libgsm.a -+LIBGSMSO = $(LIB)/libgsm.so - - TOAST = $(BIN)/toast - UNTOAST = $(BIN)/untoast -@@ -279,7 +284,7 @@ - - # Target rules - --all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) -+all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) - @-echo $(ROOT): Done. - - tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,24 +304,28 @@ - - # The basic API: libgsm - -+$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) -+ $(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc -+ ln -fs libgsm.so.1.0.12 lib/libgsm.so.1 -+ ln -fs libgsm.so.1.0.12 lib/libgsm.so -+ - $(LIBGSM): $(LIB) $(GSM_OBJECTS) - -rm $(RMFLAGS) $(LIBGSM) - $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) - $(RANLIB) $(LIBGSM) - -- - # Toast, Untoast and Tcat -- the compress-like frontends to gsm. - --$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) -- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) -+$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) $(LIBGSMSO) -+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) - - $(UNTOAST): $(BIN) $(TOAST) - -rm $(RMFLAGS) $(UNTOAST) -- $(LN) $(TOAST) $(UNTOAST) -+ $(LN) toast $(UNTOAST) - - $(TCAT): $(BIN) $(TOAST) - -rm $(RMFLAGS) $(TCAT) -- $(LN) $(TOAST) $(TCAT) -+ $(LN) toast $(TCAT) - - - # The local bin and lib directories diff --git a/gsm-1.0.17-shared-lib.patch b/gsm-1.0.17-shared-lib.patch new file mode 100644 index 0000000..e7d412c --- /dev/null +++ b/gsm-1.0.17-shared-lib.patch @@ -0,0 +1,189 @@ +--- Makefile 2006-04-26 15:14:26.000000000 -0400 ++++ Makefile 2010-06-19 16:53:25.000000000 -0400 +@@ -96,11 +96,11 @@ + # Other tools + + SHELL = /bin/sh +-LN = ln ++LN = ln -s -f + BASENAME = basename + AR = ar + ARFLAGS = cr +-RMFLAGS = ++RMFLAGS = -f + FIND = find + COMPRESS = compress + COMPRESSFLAGS = +@@ -139,7 +139,7 @@ + + # Targets + +-LIBGSM = $(LIB)/libgsm.a ++LIBGSMSO = $(LIB)/libgsm.so + + TOAST = $(BIN)/toast + UNTOAST = $(BIN)/untoast +@@ -257,7 +257,7 @@ + # Install targets + + GSM_INSTALL_TARGETS = \ +- $(GSM_INSTALL_LIB)/libgsm.a \ ++ $(GSM_INSTALL_LIB)/libgsm.so \ + $(GSM_INSTALL_INC)/gsm.h \ + $(GSM_INSTALL_MAN)/gsm.3 \ + $(GSM_INSTALL_MAN)/gsm_explode.3 \ +@@ -279,7 +279,7 @@ + + # Target rules + +-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) ++all: $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) + @-echo $(ROOT): Done. + + tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result +@@ -299,24 +299,23 @@ + + # The basic API: libgsm + +-$(LIBGSM): $(LIB) $(GSM_OBJECTS) +- -rm $(RMFLAGS) $(LIBGSM) +- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) +- $(RANLIB) $(LIBGSM) +- ++$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) ++ $(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.17 $(GSM_OBJECTS) ++ $(LN) libgsm.so.1.0.17 $(LIBGSMSO).1 ++ $(LN) libgsm.so.1.0.17 $(LIBGSMSO) + + # Toast, Untoast and Tcat -- the compress-like frontends to gsm. + +-$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) +- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) ++$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSMSO) ++ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) + + $(UNTOAST): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(UNTOAST) +- $(LN) $(TOAST) $(UNTOAST) ++ $(LN) toast $(UNTOAST) + + $(TCAT): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(TCAT) +- $(LN) $(TOAST) $(TCAT) ++ $(LN) toast $(TCAT) + + + # The local bin and lib directories +@@ -351,53 +350,54 @@ + fi + + $(TOAST_INSTALL_BIN)/toast: $(TOAST) +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $(TOAST) $@ + chmod 755 $@ + + $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast +- -rm $@ +- ln $? $@ ++ -rm $(RMFLAGS) $@ ++ $(LN) toast $@ + + $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast +- -rm $@ +- ln $? $@ ++ -rm $(RMFLAGS) $@ ++ $(LN) toast $@ + + $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + + $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h +- -rm $@ +- cp $? $@ +- chmod 444 $@ +- +-$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) +- -rm $@ ++ -rm $(RMFLAGS) $@ + cp $? $@ + chmod 444 $@ + ++$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO) ++ -rm $(RMFLAGS) $@ $@.1 $@.1.0.17 ++ cp $?.1.0.17 $@.1.0.17 ++ chmod 755 $@.1.0.17 ++ $(LN) libgsm.so.1.0.17 $@ ++ $(LN) libgsm.so.1.0.17 $@.1 + + # Distribution + +@@ -425,7 +425,7 @@ + -print | xargs rm $(RMFLAGS) + + clean: semi-clean +- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ ++ -rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add \ + $(TOAST) $(TCAT) $(UNTOAST) \ + $(ROOT)/gsm-1.0.tar.Z + +@@ -473,22 +473,22 @@ + $(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run + ( cd $(TST); ./run ) + +-$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM) ++$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/lin2txt \ +- $(TST)/lin2txt.o $(LIBGSM) $(LDLIB) ++ $(TST)/lin2txt.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSM) ++$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/lin2cod \ +- $(TST)/lin2cod.o $(LIBGSM) $(LDLIB) ++ $(TST)/lin2cod.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSM) ++$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/gsm2cod \ +- $(TST)/gsm2cod.o $(LIBGSM) $(LDLIB) ++ $(TST)/gsm2cod.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSM) ++$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/cod2txt \ +- $(TST)/cod2txt.o $(LIBGSM) $(LDLIB) ++ $(TST)/cod2txt.o $(LIBGSMSO) $(LDLIB) + +-$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSM) ++$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSMSO) + $(LD) $(LFLAGS) -o $(TST)/cod2lin \ +- $(TST)/cod2lin.o $(LIBGSM) $(LDLIB) ++ $(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB) diff --git a/gsm.spec b/gsm.spec index bc4c1f9..c757abc 100644 --- a/gsm.spec +++ b/gsm.spec @@ -1,9 +1,9 @@ %define majver %(echo %version | cut -d . -f1-2) %define minver %(echo %version | cut -d . -f3) -%define soname 1.0.12 +#%define soname Name: gsm -Version: 1.0.16 +Version: 1.0.17 Release: 1mamba Summary: GSM 06.10 lossy speech compression library Group: System/Tools @@ -12,7 +12,7 @@ Distribution: openmamba Packager: Silvan Calarco URL: http://www.quut.com/gsm Source: http://www.quut.com/gsm/gsm-%{version}.tar.gz -Patch0: %{name}-1.0.13-makefile.patch +Patch0: gsm-1.0.17-shared-lib.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -43,10 +43,13 @@ This package contains static libraries and header files need for development. %prep %setup -q -n gsm-%{majver}-pl%{minver} -%patch0 -p1 +%patch0 -p0 %build -%make all +%make all \ +%ifarch x86_64 + LTP_CUT="-fPIC" +%endif %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -64,9 +67,9 @@ make install \ GSM_INSTALL_INC=%{buildroot}%{_includedir}/gsm \ GSM_INSTALL_MAN=%{buildroot}%{_mandir}/man3 -install -m0755 lib/libgsm.so.%{soname} %{buildroot}%{_libdir} -ln -s libgsm.so.%{soname} %{buildroot}%{_libdir}/libgsm.so.1 -ln -s libgsm.so.%{soname} %{buildroot}%{_libdir}/libgsm.so +#install -m0755 lib/libgsm.so.%{soname} %{buildroot}%{_libdir} +#ln -s libgsm.so.%{soname} %{buildroot}%{_libdir}/libgsm.so.1 +#ln -s libgsm.so.%{soname} %{buildroot}%{_libdir}/libgsm.so %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -79,7 +82,7 @@ ln -s libgsm.so.%{soname} %{buildroot}%{_libdir}/libgsm.so %{_bindir}/tcat %{_bindir}/toast %{_bindir}/untoast -%{_mandir}/man1/toast.1.gz +%{_mandir}/man1/toast.1* %files -n libgsm %defattr(-,root,root) @@ -88,15 +91,14 @@ ln -s libgsm.so.%{soname} %{buildroot}%{_libdir}/libgsm.so %files -n libgsm-devel %defattr(-,root,root) %{_includedir}/gsm/*.h -%{_libdir}/*.a %{_libdir}/libgsm.so -%{_mandir}/man3/gsm.3.gz -%{_mandir}/man3/gsm_explode.3.gz -%{_mandir}/man3/gsm_option.3.gz -%{_mandir}/man3/gsm_print.3.gz +%{_mandir}/man3/gsm*.3* %doc ChangeLog README %changelog +* Mon Feb 12 2018 Automatic Build System 1.0.17-1mamba +- automatic version update by autodist + * Wed Jan 04 2017 Automatic Build System 1.0.16-1mamba - automatic version update by autodist