OBS User unknown 2008-04-28 14:21:40 +00:00 committed by Git OBS Bridge
parent 9327c6382c
commit 9a4dbb1003
3 changed files with 55 additions and 6 deletions

41
libvorbis-pkgconfig.patch Normal file
View File

@ -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}

View File

@ -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

View File

@ -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