From f2178d8d2bc58adc51ca87e8d05e7f90db5badb4 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 19 Feb 2019 16:45:26 -0500 Subject: [PATCH] Modernize spec - Drop EL5 specific stuff --- .gitignore | 1 + ilbc-0002-No-dist-xz-for-EL5.patch | 26 ------------- ...ess-warning-about-unused-parameter-s.patch | 28 -------------- ilbc.spec | 37 ++++++++++--------- sources | 2 +- 5 files changed, 22 insertions(+), 72 deletions(-) delete mode 100644 ilbc-0002-No-dist-xz-for-EL5.patch delete mode 100644 ilbc-0003-Suppress-warning-about-unused-parameter-s.patch diff --git a/.gitignore b/.gitignore index 6dc77f4..9e27237 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dekkers-libilbc-upstream-1.1.1-9-g88cd161.tar.gz +/libilbc-88cd161.tar.gz diff --git a/ilbc-0002-No-dist-xz-for-EL5.patch b/ilbc-0002-No-dist-xz-for-EL5.patch deleted file mode 100644 index 8c05927..0000000 --- a/ilbc-0002-No-dist-xz-for-EL5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d4026f841ee2bef5faa6301f445f670f12434a4a Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 2 Aug 2012 14:29:17 +0400 -Subject: [PATCH 2/3] No dist-xz for EL5 - -Signed-off-by: Peter Lemenkov ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1717034..30c38fc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ - AC_INIT([libilbc], [1.1.1], []) - AC_CONFIG_AUX_DIR(.) - AC_CONFIG_MACRO_DIR([m4]) --AM_INIT_AUTOMAKE([tar-ustar dist-xz]) -+AM_INIT_AUTOMAKE([tar-ustar dist-bzip2 no-dist-gzip]) - AC_CONFIG_HEADERS([config.h]) - - # Cross compiling support --- -1.7.11.2 - diff --git a/ilbc-0003-Suppress-warning-about-unused-parameter-s.patch b/ilbc-0003-Suppress-warning-about-unused-parameter-s.patch deleted file mode 100644 index 409cfb1..0000000 --- a/ilbc-0003-Suppress-warning-about-unused-parameter-s.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6c707358b629691338e04403a9f53ab1b0aac7f8 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 2 Aug 2012 14:38:18 +0400 -Subject: [PATCH 3/3] Suppress warning about unused parameter(s) - -Signed-off-by: Peter Lemenkov ---- - signal_processing/filter_ar.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/signal_processing/filter_ar.c b/signal_processing/filter_ar.c -index 24e83a6..9228736 100644 ---- a/signal_processing/filter_ar.c -+++ b/signal_processing/filter_ar.c -@@ -29,6 +29,10 @@ int WebRtcSpl_FilterAR(G_CONST WebRtc_Word16* a, - WebRtc_Word16* filtered_low, - int filtered_low_length) - { -+ -+ (void) state_low_length; -+ (void) filtered_low_length; -+ - WebRtc_Word32 o; - WebRtc_Word32 oLOW; - int i, j, stop; --- -1.7.11.2 - diff --git a/ilbc.spec b/ilbc.spec index 4cb08f6..82d119d 100644 --- a/ilbc.spec +++ b/ilbc.spec @@ -1,20 +1,21 @@ +%global commit 88cd1613a1db8d5dee0910a9a0c3e676e31bc529 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: ilbc Summary: Internet Low Bitrate Codec Version: 1.1.1 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD -# wget --content-disposition https://github.com/dekkers/libilbc/tarball/88cd161 -Source0: dekkers-libilbc-upstream-1.1.1-9-g88cd161.tar.gz +URL: https://github.com/TimothyGu/libilbc +Source0: %{url}/archive/%{commit}/libilbc-%{shortcommit}.tar.gz # Fedora/EPEL-specific Patch1: %{name}-0001-Don-t-build-silently.patch -# Fedora/EPEL-specific -Patch2: %{name}-0002-No-dist-xz-for-EL5.patch -# Fedora/EPEL-specific -Patch3: ilbc-0003-Suppress-warning-about-unused-parameter-s.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool - +BuildRequires: gcc +BuildRequires: make %description iLBC (internet Low Bitrate Codec) is a FREE speech codec suitable for @@ -37,21 +38,18 @@ Additional header files for development with %{name}. %prep -%setup -q -n dekkers-libilbc-88cd161 -%patch1 -p1 -b .fedora_specific -%patch2 -p1 -b .epel5_specific -%patch3 -p1 -b .epel5_specific +%autosetup -n libilbc-%{commit} -p1 %build autoreconf -ivf -%{configure} --disable-static --with-pic -make %{?_smp_mflags} +%configure --disable-static --with-pic +%make_build %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%make_install + rm -f %{buildroot}%{_libdir}/libilbc.la # Required for compatibility with a very old apps cd %{buildroot}%{_libdir}/pkgconfig && ln -s libilbc.pc ilbc.pc @@ -68,7 +66,8 @@ ln -s ilbc.h iLBC_encode.h %files -%doc COPYING README +%doc README +%license COPYING %{_libdir}/lib%{name}.so.* @@ -84,6 +83,10 @@ ln -s ilbc.h iLBC_encode.h %changelog +* Tue Feb 19 2019 Neal Gompa - 1.1.1-16 +- Modernize spec +- Drop EL5 specific stuff + * Fri Feb 01 2019 Fedora Release Engineering - 1.1.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 76c83fe..32171bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa44168280a5ade14a3ebdb233ba7a8e dekkers-libilbc-upstream-1.1.1-9-g88cd161.tar.gz +SHA512 (libilbc-88cd161.tar.gz) = a72d76ac6dccb0563baf2ba4a3f826073c8d3dfccfee79c102971c292d59a7f3f39967c028b9bcaffe97fc9a94394adfd95ffe83b1c281345228741ddc1f255d