summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2003-04-18 17:21:45 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit927e9bc83ff90ceaa52fbeb7f24dff3b4b5966cb (patch)
treef98c216e2cfe3f8d66f683fb6fb7775dc0c7fab0
parentd1f0dad38968ea6eb1774310f33ce22a6a0a43dd (diff)
downloadlibgsm-927e9bc83ff90ceaa52fbeb7f24dff3b4b5966cb.zip
libgsm-927e9bc83ff90ceaa52fbeb7f24dff3b4b5966cb.tar.gz
- changed makefile patch: don't always strip, link using $(CC) not ldlibgsm-1_0_10-8STABLE
- added URL - release 8 Changed files: libgsm-makefile.patch -> 1.5 libgsm.spec -> 1.26
-rw-r--r--libgsm-makefile.patch5
-rw-r--r--libgsm.spec9
2 files changed, 8 insertions, 6 deletions
diff --git a/libgsm-makefile.patch b/libgsm-makefile.patch
index b242412..0346966 100644
--- a/libgsm-makefile.patch
+++ b/libgsm-makefile.patch
@@ -88,7 +88,7 @@
@-echo $(ROOT): Done.
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -298,24 +304,38 @@
+@@ -298,24 +304,37 @@
# The basic API: libgsm
@@ -112,8 +112,7 @@
+# cd shared; $(CC) -shared -Wl -soname libgsm.so.2 -o libgsm.so.2.0 *.o
+
+$(LIBGSMSO): shared $(GSM_SHOBJECTS)
-+ cd shared; ld -o ../lib/libgsm.so.1.0.10 -shared -soname libgsm.so.1 *.o
-+ strip --strip-unneeded $(LIBGSMSO).1.0.10
++ cd shared; $(CC) -o ../lib/libgsm.so.1.0.10 -shared -Wl,-soname=libgsm.so.1 *.o
+
+
# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
diff --git a/libgsm.spec b/libgsm.spec
index 94b7f8f..f0bde9a 100644
--- a/libgsm.spec
+++ b/libgsm.spec
@@ -5,11 +5,12 @@ Summary(ru): Библиотека аудио кодирования/декодирования GSM
Summary(uk): Б╕бл╕отека ауд╕о кодування/декодування GSM
Name: libgsm
Version: 1.0.10
-Release: 7
+Release: 8
License: Free (Copyright (C) Technische Universitaet Berlin)
Group: Libraries
Source0: ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/gsm-%{version}.tar.gz
Patch0: %{name}-makefile.patch
+URL: http://kbs.cs.tu-berlin.de/~jutta/toast.html
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -112,7 +113,9 @@ Bibliotecas estАticas para desenvolvimento com libgsm
%patch0 -p1
%build
-%{__make} OPTFLAGS="%{rpmcflags}" WAV49="-DWAV49"
+%{__make} \
+ CC="%{__cc} -ansi -pedantic" \
+ OPTFLAGS="%{rpmcflags}" WAV49="-DWAV49"
%install
rm -rf $RPM_BUILD_ROOT
@@ -131,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYRIGHT ChangeLog MACHINES MANIFEST README
+%doc COPYRIGHT ChangeLog MACHINES README
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_libdir}/libgsm.so.*.*
%{_mandir}/man1/*