From 9a4dbb10030ad85b6ca4f455bbaaad3d0e973b4646dea46d3dda3183a39a83f1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 28 Apr 2008 14:21:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvorbis?expand=0&rev=8 --- libvorbis-pkgconfig.patch | 41 +++++++++++++++++++++++++++++++++++++++ libvorbis.changes | 6 ++++++ libvorbis.spec | 14 +++++++------ 3 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 libvorbis-pkgconfig.patch diff --git a/libvorbis-pkgconfig.patch b/libvorbis-pkgconfig.patch new file mode 100644 index 0000000..5bd1f81 --- /dev/null +++ b/libvorbis-pkgconfig.patch @@ -0,0 +1,41 @@ +Index: vorbis.pc.in +=================================================================== +--- vorbis.pc.in.orig 2004-07-20 09:24:27.000000000 +0200 ++++ vorbis.pc.in 2008-04-27 05:29:10.000000000 +0200 +@@ -8,7 +8,8 @@ includedir=@includedir@ + Name: vorbis + Description: vorbis is the primary Ogg Vorbis library + Version: @VERSION@ +-Requires: ogg ++Requires.private: ogg + Conflicts: +-Libs: -L${libdir} -lvorbis -lm ++Libs: -L${libdir} -lvorbis ++Libs.private: -lm + Cflags: -I${includedir} +Index: vorbisenc.pc.in +=================================================================== +--- vorbisenc.pc.in.orig 2004-07-20 09:24:27.000000000 +0200 ++++ vorbisenc.pc.in 2008-04-27 05:27:54.000000000 +0200 +@@ -8,7 +8,7 @@ includedir=@includedir@ + Name: vorbisenc + Description: vorbisenc is a library that provides a convenient API for setting up an encoding environment using libvorbis + Version: @VERSION@ +-Requires: vorbis ++Requires.private: vorbis + Conflicts: + Libs: -L${libdir} -lvorbisenc + Cflags: -I${includedir} +Index: vorbisfile.pc.in +=================================================================== +--- vorbisfile.pc.in.orig 2004-07-20 09:24:27.000000000 +0200 ++++ vorbisfile.pc.in 2008-04-27 05:28:15.000000000 +0200 +@@ -8,7 +8,7 @@ includedir=@includedir@ + Name: vorbisfile + Description: vorbisfile is a library that provides a convenient high-level API for decoding and basic manipulation of all Vorbis I audio streams + Version: @VERSION@ +-Requires: vorbis ++Requires.private: vorbis + Conflicts: + Libs: -L${libdir} -lvorbisfile + Cflags: -I${includedir} diff --git a/libvorbis.changes b/libvorbis.changes index 941d180..e60a408 100644 --- a/libvorbis.changes +++ b/libvorbis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 28 12:56:34 CEST 2008 - tiwai@suse.de + +- fixed dependency in *.pc files (bnc#384153) +- removed old run_ldconfig + ------------------------------------------------------------------- Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de diff --git a/libvorbis.spec b/libvorbis.spec index 33b345b..1dc2b4e 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -15,7 +15,7 @@ Name: libvorbis BuildRequires: libogg-devel pkgconfig Summary: The Vorbis General Audio Compression Codec Version: 1.2.0 -Release: 40 +Release: 44 Group: System/Libraries License: BSD 3-Clause Url: http://www.vorbis.com/ @@ -26,6 +26,7 @@ Patch5: libvorbis-%{version}-aotuv-b5.diff Patch6: libvorbis-%{version}-warning-fixes.diff Patch7: libvorbis-cflags.diff Patch9: libvorbis-doc-fixes.diff +Patch10: libvorbis-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -84,10 +85,10 @@ Authors: %patch6 %patch7 %patch9 +%patch10 if [ "%_lib" == "lib64" ]; then %patch1 fi -%{?suse_update_config:%{suse_update_config -f}} %build autoreconf -fi @@ -107,11 +108,9 @@ cp *.txt $RPM_BUILD_ROOT%{_docdir}/%{name} # remove unneeded files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -132,6 +131,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %doc %{_docdir}/%{name} %changelog +* Mon Apr 28 2008 tiwai@suse.de +- fixed dependency in *.pc files (bnc#384153) +- removed old run_ldconfig * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support