From 927e9bc83ff90ceaa52fbeb7f24dff3b4b5966cb Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 18 Apr 2003 17:21:45 +0000 Subject: - changed makefile patch: don't always strip, link using $(CC) not ld - added URL - release 8 Changed files: libgsm-makefile.patch -> 1.5 libgsm.spec -> 1.26 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): 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 %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/* -- cgit v0.10.2