From 1b9c2e66533016a890478dc06c2ffd475be06ef19339d833ab615ea9a4c9832b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 26 Sep 2017 13:54:49 +0000 Subject: [PATCH] Accepting request 528756 from home:scarabeus_iv:branches:multimedia:libs - Cleanup bit with spec-cleaner - Drop librcc dependency as there is no actual code dependency in taglib OBS-URL: https://build.opensuse.org/request/show/528756 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=73 --- taglib.changes | 6 ++++++ taglib.spec | 43 +++++++------------------------------------ 2 files changed, 13 insertions(+), 36 deletions(-) diff --git a/taglib.changes b/taglib.changes index b9c3bf9..87f2084 100644 --- a/taglib.changes +++ b/taglib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 26 09:27:25 UTC 2017 - tchvatal@suse.com + +- Cleanup bit with spec-cleaner +- Drop librcc dependency as there is no actual code dependency in taglib + ------------------------------------------------------------------- Tue Aug 8 22:36:41 CEST 2017 - sbrabec@suse.com diff --git a/taglib.spec b/taglib.spec index f24dea5..d44e0c1 100644 --- a/taglib.spec +++ b/taglib.spec @@ -20,31 +20,27 @@ Name: taglib Version: 1.11.1 Release: 0 Summary: Audio Meta-Data Library -License: LGPL-2.1+ and MPL-1.1 +License: LGPL-2.1+ AND MPL-1.1 Group: Productivity/Multimedia/Other Url: http://taglib.github.io/ Source0: http://taglib.github.io/releases/%{name}-%{version}.tar.gz Source1: %{name}.desktop -# PATCH-FIX-SECURITY taglib-CVE-2017-12678.patch bsc1052699 CVE-2017-12678 sbrabec@suse.com -- Prevent denial of service. -Patch: taglib-CVE-2017-12678.patch Source100: baselibs.conf +# PATCH-FIX-SECURITY taglib-CVE-2017-12678.patch bsc1052699 CVE-2017-12678 sbrabec@suse.com -- Prevent denial of service. +Patch0: taglib-CVE-2017-12678.patch BuildRequires: cmake >= 2.8 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz-gnome BuildRequires: libcppunit-devel -BuildRequires: librcc-devel -BuildRequires: pkg-config -BuildRequires: zlib-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(zlib) # NOTE: The tagreader and writer executables give different results when built with # an earlier taglib-1.8-ds-rusxmms patch. See bnc#814814 Requires: libtag1 = %{version}-%{release} Requires: libtag_c0 = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif %description TagLib is a library for reading and editing the meta-data of several popular @@ -58,8 +54,6 @@ command line. Summary: Audio Meta-Data Library License: LGPL-2.1+ Group: System/Libraries -# Without this the old taglib package containing the libraries isn't removed when this package is installed. -# The only alternative is for the libraries to Require: taglib version-release, badness 440 Conflicts: taglib <= 1.6.3 %description -n libtag1 @@ -72,8 +66,6 @@ TrueAudio, WAV, AIFF, MP4 and ASF files. Summary: Audio Meta-Data Library License: LGPL-2.1+ Group: System/Libraries -# Without this the old taglib package containing the libraries isn't removed when this package is installed. -# The only alternative is for the libraries to Require: taglib version-release, badness 440 Conflicts: taglib <= 1.6.3 %description -n libtag_c0 @@ -99,7 +91,7 @@ This package contains development files for taglib. %prep %setup -q -%patch -p1 +%patch0 -p1 %build %cmake \ @@ -116,9 +108,7 @@ make %{?_smp_mflags} all docs mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ -%if 0%{?suse_version} %suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/%{name}.desktop -%endif # Documentation mkdir -p %{buildroot}%{_defaultdocdir}/libtag-devel @@ -130,40 +120,26 @@ cp -a AUTHORS COPYING.LGPL COPYING.MPL NEWS build/doc/html/ examples/ %{buildroo mkdir -p %{buildroot}%{_bindir} for i in `find build/examples -maxdepth 1 ! -type d -executable`; do cp -v ${i} %{buildroot}%{_bindir}/; done -%check -# check the library -#pushd tests -#make check -#popd - -%if 0%{?suse_version} > 1110 %post %desktop_database_post %postun %desktop_database_postun -%endif %post -n libtag1 -p /sbin/ldconfig - %postun -n libtag1 -p /sbin/ldconfig - %post -n libtag_c0 -p /sbin/ldconfig - %postun -n libtag_c0 -p /sbin/ldconfig %files -n libtag1 -%defattr(-,root,root,-) %{_libdir}/libtag.so.1 %{_libdir}/libtag.so.1.* %files -n libtag_c0 -%defattr(-,root,root,-) %{_libdir}/libtag_c.so.0 %{_libdir}/libtag_c.so.0.* %files -n libtag-devel -%defattr(-,root,root,-) %doc %{_defaultdocdir}/libtag-devel %{_bindir}/taglib-config %{_includedir}/taglib/ @@ -172,12 +148,7 @@ for i in `find build/examples -maxdepth 1 ! -type d -executable`; do cp -v ${i} %{_datadir}/susehelp/ %files -%defattr(-,root,root,-) -%if 1 == 1 %{_bindir}/* %exclude %{_bindir}/taglib-config -%else -%doc README.taglib -%endif %changelog