From 944ee71c418a4e6bb4f737ed7b08d283f5cbec0a17262449afe03bdd0e993ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 14 Aug 2019 08:41:27 +0000 Subject: [PATCH] - Small cleanups with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libgsm?expand=0&rev=23 --- libgsm.changes | 5 +++++ libgsm.spec | 40 ++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/libgsm.changes b/libgsm.changes index 85980cf..022eaba 100644 --- a/libgsm.changes +++ b/libgsm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 14 08:41:11 UTC 2019 - Tomáš Chvátal + +- Small cleanups with spec-cleaner + ------------------------------------------------------------------- Sat Feb 23 20:06:39 UTC 2019 - bjorn.lie@gmail.com diff --git a/libgsm.spec b/libgsm.spec index f5da2ee..fe4601f 100644 --- a/libgsm.spec +++ b/libgsm.spec @@ -16,22 +16,21 @@ # -Name: libgsm %define _name gsm +%define _version 1.0-pl18 +Name: libgsm Version: 1.0.18 Release: 0 -%define _version 1.0-pl18 Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities License: ISC Group: Productivity/Multimedia/Sound/Editors and Convertors +URL: http://www.quut.com/gsm/ Source: http://www.quut.com/gsm/%{_name}-%{version}.tar.gz Source2: baselibs.conf -Url: http://www.quut.com/gsm/ # This is a Debian patch file with debian chunks removed. -Patch: %{name}-1.0.13.patch +Patch0: %{name}-1.0.13.patch Patch1: libgsm-paths.patch Patch2: libgsm-include.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libgsm implements the European GSM 06.10 provisional standard for @@ -70,7 +69,7 @@ The front-end is modeled after the historic compress(1) utility. %package devel Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities -Group: Productivity/Multimedia/Sound/Editors and Convertors +Group: Development/Libraries/C and C++ Requires: libgsm1 = %{version} %description devel @@ -86,45 +85,42 @@ This implementation turns frames of 160 16-bit linear samples into standard test patterns. %prep -%setup -n %{_name}-%{_version} -%patch -p1 +%setup -q -n %{_name}-%{_version} +%patch0 -p1 %patch1 %patch2 %build -make CCFLAGS="-c $RPM_OPT_FLAGS -D_POSIX_SOURCE -D_BSD_SOURCE -DNeedFunctionPrototypes=1" lib/libgsm.a +make -j1 CCFLAGS="-c %{optflags} -D_POSIX_SOURCE -D_BSD_SOURCE -DNeedFunctionPrototypes=1" lib/libgsm.a cp lib/libgsm.a lib/libgsm.a.save -make clean -make CCFLAGS="-c $RPM_OPT_FLAGS -D_POSIX_SOURCE -D_BSD_SOURCE -DNeedFunctionPrototypes=1 -fPIC" +make -j1 clean +make -j1 CCFLAGS="-c %{optflags} -D_POSIX_SOURCE -D_BSD_SOURCE -DNeedFunctionPrototypes=1 -fPIC" cp lib/libgsm.a.save lib/libgsm.a touch lib/libgsm.a %install -mkdir -p $RPM_BUILD_ROOT%{_prefix}/{include/gsm,%{_lib},bin,share/man/man{1,3}} -make INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} GSM_INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} install -cp -d lib/libgsm.so* $RPM_BUILD_ROOT%{_libdir} -( cd $RPM_BUILD_ROOT%{_libdir} ; ln -sf libgsm.so.1 libgsm.so ) -cp inc/{private.h,proto.h,unproto.h} $RPM_BUILD_ROOT%{_includedir}/gsm/ -%{__rm} -f %{buildroot}%{_libdir}/*.a +mkdir -p %{buildroot}%{_prefix}/{include/gsm,%{_lib},bin,share/man/man{1,3}} +make INSTALL_ROOT=%{buildroot}%{_prefix} GSM_INSTALL_LIB=%{buildroot}%{_libdir} install +cp -d lib/libgsm.so* %{buildroot}%{_libdir} +( cd %{buildroot}%{_libdir} ; ln -sf libgsm.so.1 libgsm.so ) +cp inc/{private.h,proto.h,unproto.h} %{buildroot}%{_includedir}/gsm/ +rm -f %{buildroot}%{_libdir}/*.a %post -n libgsm1 -p /sbin/ldconfig %postun -n libgsm1 -p /sbin/ldconfig %files utils -%defattr (-, root, root) %{_bindir}/* -%doc %{_mandir}/man1/*.* +%{_mandir}/man1/*.* %files -n libgsm1 -%defattr (-, root, root) %license COPYRIGHT %doc ChangeLog MACHINES README %{_libdir}/*.so.* %files devel -%defattr (-, root, root) %{_libdir}/*.so -%doc %{_mandir}/man3/*.* +%{_mandir}/man3/*.* %{_includedir}/gsm %changelog