Accepting request 289690 from home:pluskalm:branches:multimedia:libs

- Cleanup spec file with spec-cleaner
- Update to 1.3.5

OBS-URL: https://build.opensuse.org/request/show/289690
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvorbis?expand=0&rev=49
This commit is contained in:
Ismail Dönmez 2015-03-08 19:57:07 +00:00 committed by Git OBS Bridge
parent c124872146
commit 587f02b963
5 changed files with 39 additions and 32 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f05497d29195dc23ee952a24ee3973a74e6277569c4c2eca0ec5968e541f372
size 1091376

3
libvorbis-1.3.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1
size 1193144

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Mar 6 15:23:26 UTC 2015 - mpluskal@suse.com
- Cleanup spec file with spec-cleaner
- Update to 1.3.5
* Tolerate single-entry codebooks.
* Fix decoder crash with invalid input.
* Fix encoder crash with non-positive sample rates.
* Fix issues in vorbisfile's seek bisection code.
* Spec errata.
* Reject multiple headers of the same type.
* Various build fixes and code cleanup.
-------------------------------------------------------------------
Mon Aug 18 14:36:27 CEST 2014 - fcrozat@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libvorbis
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,18 +17,12 @@
Name: libvorbis
Version: 1.3.4
Version: 1.3.5
Release: 0
#to_be_filled_by_service
Summary: The Vorbis General Audio Compression Codec
License: BSD-3-Clause
Group: System/Libraries
Url: http://www.vorbis.com/
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-64bit
%endif
#
Source: http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz
Source2: baselibs.conf
Patch1: libvorbis-lib64.dif
@ -44,6 +38,10 @@ BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-64bit
%endif
%description
Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and
@ -54,17 +52,16 @@ The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
libmatroska (matroska) can also be used.
%package -n libvorbis0
Summary: The Vorbis General Audio Compression Codec
Group: System/Libraries
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-64bit
%endif
#
# libvorbis was last used in openSUSE 11.3
Provides: %{name} = 1.3.2
Obsoletes: %{name} < 1.3.2
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-64bit
%endif
%description -n libvorbis0
Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and
@ -75,7 +72,6 @@ The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
libmatroska (matroska) can also be used.
%package -n libvorbisenc2
Summary: The Vorbis General Audio Compression Codec
Group: System/Libraries
@ -88,7 +84,6 @@ The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
libmatroska (matroska) can also be used.
%package -n libvorbisfile3
Summary: The Vorbis General Audio Compression Codec
Group: System/Libraries
@ -144,21 +139,23 @@ fi
sed -i s,-O20,-O3,g configure.ac
autoreconf -fiv
%configure --disable-examples --disable-static
%configure \
--disable-examples \
--disable-static
make %{?_smp_mflags}
%install
%makeinstall
make DESTDIR=%{buildroot} install %{?_smp_mflags}
mkdir -p %{buildroot}%{_docdir}/%{name}
mv %{buildroot}%{_datadir}/doc/libvorbis-* %{buildroot}%{_docdir}/%{name}
install -c -m 0644 doc/Vorbis_I_spec.* %{buildroot}%{_docdir}/%{name}
# remove unneeded files
rm -f %{buildroot}%{_libdir}/*.la
find %{buildroot} -type f -name "*.la" -delete -print
find %{buildroot}%{_docdir}/ -empty -delete
%fdupes -s %{buildroot}%{_docdir}
%check
%__make check
make %{?_smp_mflags} check
%post -n libvorbis0 -p /sbin/ldconfig
@ -172,9 +169,6 @@ find %{buildroot}%{_docdir}/ -empty -delete
%postun -n libvorbisfile3 -p /sbin/ldconfig
%clean
[ %{buildroot} != "/" ] && rm -rf %{buildroot}
%files -n libvorbis0
%defattr(0644,root,root,0755)
%{_libdir}/libvorbis.so.0*

View File

@ -3,10 +3,10 @@
configure.ac | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Index: libvorbis-1.3.4/Makefile.am
Index: libvorbis-1.3.5/Makefile.am
===================================================================
--- libvorbis-1.3.4.orig/Makefile.am 2014-01-22 09:53:32.000000000 +0000
+++ libvorbis-1.3.4/Makefile.am 2014-02-23 19:35:36.000000000 +0000
--- libvorbis-1.3.5.orig/Makefile.am
+++ libvorbis-1.3.5/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
@ -18,12 +18,12 @@ Index: libvorbis-1.3.4/Makefile.am
SUBDIRS = m4 include vq lib test doc
if BUILD_EXAMPLES
Index: libvorbis-1.3.4/configure.ac
Index: libvorbis-1.3.5/configure.ac
===================================================================
--- libvorbis-1.3.4.orig/configure.ac 2014-01-22 11:09:44.000000000 +0000
+++ libvorbis-1.3.4/configure.ac 2014-02-23 19:35:36.000000000 +0000
--- libvorbis-1.3.5.orig/configure.ac
+++ libvorbis-1.3.5/configure.ac
@@ -8,7 +8,7 @@ dnl ------------------------------------
AC_INIT([libvorbis],[1.3.4],[vorbis-dev@xiph.org])
AC_INIT([libvorbis],[1.3.5],[vorbis-dev@xiph.org])
AC_CONFIG_SRCDIR([lib/mdct.c])
-