rpms/gsm
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f27' into f28

Browse Source
This commit is contained in:
Dominik 'Rathann' Mierzejewski 2018-03-07 11:55:02 +01:00
commit ed1184b616
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gsm-makefile.patch
View File

@ -82,7 +82,7 @@ diff -up gsm-1.0-pl17/Makefile.mk gsm-1.0-pl17/Makefile
# The basic API: libgsm # The basic API: libgsm
+$(LIBGSMSO).$(SO_VER): $(LIB) $(GSM_OBJECTS) +$(LIBGSMSO).$(SO_VER): $(LIB) $(GSM_OBJECTS)
+ $(LD) -o $@ -shared -Xlinker -soname -Xlinker libgsm.so.$(SO_MAJOR) $(GSM_OBJECTS) -lc + $(LD) $(LFLAGS) -o $@ -shared -Xlinker -soname -Xlinker libgsm.so.$(SO_MAJOR) $(GSM_OBJECTS) -lc
+ +
+$(LIBGSMSO).$(SO_MAJOR): $(LIBGSMSO).$(SO_VER) +$(LIBGSMSO).$(SO_MAJOR): $(LIBGSMSO).$(SO_VER)
+ ln -fs libgsm.so.$(SO_VER) lib/libgsm.so.$(SO_MAJOR) + ln -fs libgsm.so.$(SO_VER) lib/libgsm.so.$(SO_MAJOR)

19
gsm.spec
View File

@ -3,7 +3,7 @@
Name: gsm Name: gsm
Version: %{ver_maj}.%{ver_min} Version: %{ver_maj}.%{ver_min}
Release: 4%{?dist} Release: 5%{?dist}
Summary: Shared libraries for GSM speech compressor Summary: Shared libraries for GSM speech compressor
Group: System Environment/Libraries Group: System Environment/Libraries
@ -61,9 +61,11 @@ full-rate speech transcoding, prI-ETS 300 036, which uses RPE/LTP
%patch1 -p1 -b .warn %patch1 -p1 -b .warn
%build %build
export LDFLAGS="%{?__global_ldflags}"
make %{?_smp_mflags} all make %{?_smp_mflags} all
%install %install
export LDFLAGS="%{?__global_ldflags}"
mkdir -p %{buildroot}{%{_bindir},%{_includedir}/gsm,%{_libdir},%{_mandir}/{man1,man3}} mkdir -p %{buildroot}{%{_bindir},%{_includedir}/gsm,%{_libdir},%{_mandir}/{man1,man3}}
make install \ make install \
@ -74,14 +76,16 @@ make install \
# some apps look for this in /usr/include # some apps look for this in /usr/include
ln -s gsm/gsm.h %{buildroot}%{_includedir} ln -s gsm/gsm.h %{buildroot}%{_includedir}
echo ".so toast.1" > %{buildroot}%{_mandir}/man1/tcat.1
echo ".so toast.1" > %{buildroot}%{_mandir}/man1/untoast.1
%check %check
# This is to ensure that the patch creates the proper library version. # This is to ensure that the patch creates the proper library version.
[ -f %{buildroot}%{_libdir}/libgsm.so.%{version} ] [ -f %{buildroot}%{_libdir}/libgsm.so.%{version} ]
export LDFLAGS="%{?__global_ldflags}"
make addtst make addtst
%post -p /sbin/ldconfig %ldconfig_scriptlets
%postun -p /sbin/ldconfig
%files %files
%license COPYRIGHT %license COPYRIGHT
@ -92,7 +96,9 @@ make addtst
%{_bindir}/tcat %{_bindir}/tcat
%{_bindir}/toast %{_bindir}/toast
%{_bindir}/untoast %{_bindir}/untoast
%{_mandir}/man1/tcat.1*
%{_mandir}/man1/toast.1* %{_mandir}/man1/toast.1*
%{_mandir}/man1/untoast.1*
%files devel %files devel
%dir %{_includedir}/gsm %dir %{_includedir}/gsm
@ -105,6 +111,11 @@ make addtst
%{_mandir}/man3/gsm_print.3* %{_mandir}/man3/gsm_print.3*
%changelog %changelog
* Wed Mar 07 2018 Dominik Mierzejewski <rpm[AT]greysector.net> 1.0.17-5
- ensure binaries are linked with Fedora LDFLAGS (#1548532)
- use ldconfig_scriptlets macro
- add proper man links for tcat and untoast
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-4 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.17-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild