Accepting request 666953 from home:scarabeus_iv:branches:multimedia:libs

- Drop doxygen dependency to reduce python3 buildcycle

OBS-URL: https://build.opensuse.org/request/show/666953
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/flac?expand=0&rev=55
This commit is contained in:
Tomáš Chvátal 2019-01-18 10:54:01 +00:00 committed by Git OBS Bridge
parent 53a1194100
commit 1ac0a56019
2 changed files with 16 additions and 26 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 18 10:45:15 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Drop doxygen dependency to reduce python3 buildcycle
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 27 15:17:11 CEST 2018 - tiwai@suse.de Fri Apr 27 15:17:11 CEST 2018 - tiwai@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package flac # spec file for package flac
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -22,7 +22,7 @@ Release: 0
Summary: Free Lossless Audio Codec Summary: Free Lossless Audio Codec
License: BSD-3-Clause AND GPL-2.0-or-later AND GFDL-1.2-only License: BSD-3-Clause AND GPL-2.0-or-later AND GFDL-1.2-only
Group: Productivity/Multimedia/Sound/Utilities Group: Productivity/Multimedia/Sound/Utilities
Url: https://xiph.org/flac/ URL: https://xiph.org/flac/
#Git-Web: https://git.xiph.org/?p=flac.git #Git-Web: https://git.xiph.org/?p=flac.git
#Git-Clone: git://git.xiph.org/flac #Git-Clone: git://git.xiph.org/flac
Source: http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz Source: http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz
@ -31,13 +31,12 @@ Patch0: flac-cflags.patch
Patch1: flac-CVE-2017-6888.patch Patch1: flac-CVE-2017-6888.patch
BuildRequires: autoconf >= 2.60 BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1.11 BuildRequires: automake >= 1.11
BuildRequires: doxygen
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(ogg)
BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: %{name}-doc
%ifarch %{ix86} %ifarch %{ix86}
BuildRequires: nasm BuildRequires: nasm
%endif %endif
@ -45,14 +44,6 @@ BuildRequires: nasm
%description %description
FLAC is an open source lossless audio codec developed by Josh Coalson. FLAC is an open source lossless audio codec developed by Josh Coalson.
%package doc
Summary: Free Lossless Audio Codec Library
Group: Documentation/HTML
BuildArch: noarch
%description doc
This package contains documentation for flac
%package -n libFLAC8 %package -n libFLAC8
Summary: Free Lossless Audio Codec Library Summary: Free Lossless Audio Codec Library
Group: System/Libraries Group: System/Libraries
@ -98,14 +89,13 @@ autoreconf -fvi
--disable-rpath \ --disable-rpath \
--with-pic \ --with-pic \
--enable-sse --enable-sse
make %{?_smp_mflags}
make %{?_smp_mflags} V=1
%install %install
make install DESTDIR=%{buildroot} docdir="%{_docdir}/%{name}" %make_install
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# documents # wrongy installed docs
cp -a AUTHORS README COPYING.* %{buildroot}%{_docdir}/%{name} rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{version}/
%check %check
make check %{?_smp_mflags} make check %{?_smp_mflags}
@ -116,24 +106,19 @@ make check %{?_smp_mflags}
%postun -n libFLAC++6 -p /sbin/ldconfig %postun -n libFLAC++6 -p /sbin/ldconfig
%files %files
%defattr(-, root, root) %doc AUTHORS README
%{_bindir}/* %{_bindir}/*
%{_mandir}/man*/* %{_mandir}/man*/*
%files doc
%defattr(-, root, root)
%doc %{_docdir}/%{name}
%files -n libFLAC8 %files -n libFLAC8
%defattr(-, root, root) %license COPYING*
%{_libdir}/libFLAC.so.8* %{_libdir}/libFLAC.so.8*
%files -n libFLAC++6 %files -n libFLAC++6
%defattr(-, root, root) %license COPYING*
%{_libdir}/libFLAC++.so.6* %{_libdir}/libFLAC++.so.6*
%files devel %files devel
%defattr(-, root, root)
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_includedir}/* %{_includedir}/*
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc