From 5f078dc83fa7fb23dcc85cf9491718f9dbf69b1938a1ba3c0946bc9660e94801 Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Wed, 30 Nov 2011 23:47:11 +0000 Subject: [PATCH 1/2] fix .pc file OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/wavpack?expand=0&rev=11 --- wavpack-fix_pkgconfig.patch | 16 ++++++++++++ wavpack.spec | 51 +++++++++++++++---------------------- 2 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 wavpack-fix_pkgconfig.patch diff --git a/wavpack-fix_pkgconfig.patch b/wavpack-fix_pkgconfig.patch new file mode 100644 index 0000000..c2f4d1d --- /dev/null +++ b/wavpack-fix_pkgconfig.patch @@ -0,0 +1,16 @@ +--- wavpack.pc.in.orig 2011-12-01 00:48:27.306001025 +0100 ++++ wavpack.pc.in 2011-12-01 00:48:45.777001024 +0100 +@@ -1,5 +1,5 @@ + prefix=@prefix@ +-libdir=${prefix}/lib ++libdir=@libdir@ + includedir=${prefix}/include + + Name: wavpack +@@ -7,5 +7,5 @@ + Version: @PACKAGE_VERSION@ + Requires: + Conflicts: +-Libs: -L${libdir} -lwavpack @LIBM@ @ICONV@ ++Libs: -lwavpack @LIBM@ @ICONV@ + Cflags: -I${includedir} diff --git a/wavpack.spec b/wavpack.spec index f3a10e6..2b1fa55 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -26,10 +26,13 @@ Url: http://www.wavpack.com/ Summary: Free Hybrid Lossless Audio Compression Format Version: 4.60.1 Release: 1 +%define soname 1 Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 +# pbleser: fix .pc file by using @libdir@ instead of @prefix@/lib, and remove -L$libdir altogether +Patch1: wavpack-fix_pkgconfig.patch # Name used by third parties before openSUSE 10.3: Provides: WavPack = %{version}-%{release} -Requires: libwavpack1 >= %{version} +Requires: libwavpack%{soname} >= %{version} Obsoletes: WavPack < %version BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,18 +58,12 @@ used all by itself, and a "correction" file that (when combined with the lossy file) provides full lossless restoration. For some users this means never having to choose between lossless and lossy compression! - - -Authors: --------- - David Bryant - -%package -n libwavpack1 +%package -n libwavpack%{soname} License: BSD3c Summary: Free Hybrid Lossless Audio Compression Format Group: System/Libraries -%description -n libwavpack1 +%description -n libwavpack%{soname} WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode. Although the technology is loosely based on previous versions of @@ -88,12 +85,6 @@ used all by itself, and a "correction" file that (when combined with the lossy file) provides full lossless restoration. For some users this means never having to choose between lossless and lossy compression! - - -Authors: --------- - David Bryant - %package devel License: BSD3c Summary: Free Hybrid Lossless Audio Compression Format @@ -122,51 +113,49 @@ used all by itself, and a "correction" file that (when combined with the lossy file) provides full lossless restoration. For some users this means never having to choose between lossless and lossy compression! - - -Authors: --------- - David Bryant - %prep %setup -q +%patch1 %build -autoreconf -f -i +autoreconf -fiv %configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} +%{__make} %{?_smp_mflags} %install %makeinstall #not needed -%{__rm} %{buildroot}%{_libdir}/*.la +%__rm "%{buildroot}%{_libdir}"/*.la %check make check -%post -n libwavpack1 -p /sbin/ldconfig +%post -n libwavpack%{soname} -p /sbin/ldconfig -%postun -n libwavpack1 -p /sbin/ldconfig +%postun -n libwavpack%{soname} -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +%{?buildroot:%__rm -rf "%{buildroot}"} %files %defattr(-,root,root) # AUTHORS NEWS are empty %doc ChangeLog README license.txt -%{_bindir}/* +%{_bindir}/wavpack +%{_bindir}/wvgain +%{_bindir}/wvunpack %{_mandir}/man?/* -%files -n libwavpack1 +%files -n libwavpack%{soname} %defattr(-,root,root) -%{_libdir}/*.so.* +%{_libdir}/libwavpack.so.%{soname} +%{_libdir}/libwavpack.so.%{soname}.* %files devel %defattr(-,root,root) %doc doc/*.* %{_includedir}/wavpack -%{_libdir}/*.so +%{_libdir}/libwavpack.so %{_libdir}/pkgconfig/wavpack.pc %changelog From f9d80106d0c2d1bfa67033d46eb8328620b3d873eec48b7cf2315f8d005c760e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 14 Feb 2012 08:52:40 +0000 Subject: [PATCH 2/2] Accepting request 104574 from devel:openSUSE:Factory:patch-license patch license to follow spdx.org standard OBS-URL: https://build.opensuse.org/request/show/104574 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/wavpack?expand=0&rev=12 --- wavpack.changes | 5 +++++ wavpack.spec | 15 ++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/wavpack.changes b/wavpack.changes index 9635bdd..1ce46a1 100644 --- a/wavpack.changes +++ b/wavpack.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 13 10:57:33 UTC 2012 - coolo@suse.com + +- patch license to follow spdx.org standard + ------------------------------------------------------------------- Fri Nov 25 12:33:45 UTC 2011 - coolo@suse.com diff --git a/wavpack.spec b/wavpack.spec index 2b1fa55..2a14f2a 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,7 +1,7 @@ # # spec file for package wavpack # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: wavpack -License: BSD3c -BuildRequires: libtool pkgconfig -Group: Productivity/Multimedia/Sound/Editors and Convertors +BuildRequires: libtool +BuildRequires: pkgconfig Url: http://www.wavpack.com/ Summary: Free Hybrid Lossless Audio Compression Format +License: BSD-3-Clause +Group: Productivity/Multimedia/Sound/Editors and Convertors Version: 4.60.1 -Release: 1 +Release: 0 %define soname 1 Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 # pbleser: fix .pc file by using @libdir@ instead of @prefix@/lib, and remove -L$libdir altogether @@ -59,7 +58,6 @@ the lossy file) provides full lossless restoration. For some users this means never having to choose between lossless and lossy compression! %package -n libwavpack%{soname} -License: BSD3c Summary: Free Hybrid Lossless Audio Compression Format Group: System/Libraries @@ -86,7 +84,6 @@ the lossy file) provides full lossless restoration. For some users this means never having to choose between lossless and lossy compression! %package devel -License: BSD3c Summary: Free Hybrid Lossless Audio Compression Format Group: Development/Libraries/C and C++ Requires: %{name} = %{version} glibc-devel