- updated to 1.4.0

- updated nolibnsl patch

Changed files:
    vorbis-tools-nolibnsl.patch -> 1.3
    vorbis-tools.spec -> 1.55

diff --git a/vorbis-tools-nolibnsl.patch b/vorbis-tools-nolibnsl.patch
index e7cc87f4d243b9106b5fb8776d118d0705eb3438..c4c07c35f438125898c0684d95493ab6f556b678 100644 (file)
--- a/vorbis-tools-nolibnsl.patch
+++ b/vorbis-tools-nolibnsl.patch
@@ -1,13 +1,17 @@
---- vorbis-tools-1.1.1/configure.ac.orig       Sun Mar  2 18:44:45 2003
-+++ vorbis-tools-1.1.1/configure.ac    Sun Mar  2 18:52:06 2003
-@@ -49,8 +49,8 @@
+--- vorbis-tools-1.4.0/configure.ac.orig       2010-04-11 21:41:32.644993924 +0200
++++ vorbis-tools-1.4.0/configure.ac    2010-04-11 22:04:12.968989734 +0200
+@@ -120,10 +120,13 @@
  I18N_LIBS=$INTLLIBS
  
  SOCKET_LIBS=
--AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
--AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")
-+AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")])
-+AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")])
++AC_CHECK_FUNC(socket, , [
+ AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
+ AC_CHECK_LIB(network, socket, SOCKET_LIBS="-lnetwork")
++])
++AC_CHECK_FUNC(gethostbyname, , [
+ AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")
+-
++])
  
  dnl --------------------------------------------------
- dnl Check for ogg123 critical libraries
+ dnl Check for ogg123 critical libraries and other optional libraries

diff --git a/vorbis-tools.spec b/vorbis-tools.spec
index d3ef20b4bafed24eb184f4dccd5fe4cc881fbbfa..738a0fd066402ba2dc1f6e252cb2daeab301c344 100644 (file)
--- a/vorbis-tools.spec
+++ b/vorbis-tools.spec
@@ -1,15 +1,16 @@
+# TODO: libkate (needs http://wiki.xiph.org/OggKate, http://code.google.com/p/libkate/downloads/list)
 Summary:       The Ogg Vorbis Tools
 Summary(es.UTF-8):     Utensilios Ogg Vorbis
 Summary(pl.UTF-8):     Narzędzia do obsługi plików w formacie Ogg Vorbis
 Summary(pt_BR.UTF-8):  Ferramentas Ogg Vorbis
 Name:          vorbis-tools
-Version:       1.2.0
+Version:       1.4.0
 Release:       1
 Epoch:         1
 License:       GPL v2
 Group:         Development/Libraries
 Source0:       http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz
-# Source0-md5: df976d24e51ef3d87cd462edf747bf9a
+# Source0-md5: 567e0fb8d321b2cd7124f8208b8b90e6
 Patch0:                %{name}-ac_fixes.patch
 Patch1:                %{name}-nolibnsl.patch
 URL:           http://www.vorbis.com/
@@ -18,14 +19,14 @@ BuildRequires:      automake
 BuildRequires: curl-devel
 BuildRequires: flac-devel >= 1.1.3
 BuildRequires: gettext-devel
-BuildRequires: libao-devel >= 0.8.3
+BuildRequires: libao-devel >= 1.0.0
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libtool
-BuildRequires: libvorbis-devel >= 1:1.1.1
+BuildRequires: libvorbis-devel >= 1:1.3.0
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pkgconfig
 BuildRequires: speex-devel
-Requires:      libvorbis >= 1:1.1.1
+Requires:      libvorbis >= 1:1.3.0
 Obsoletes:     vorbis
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -79,9 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/oggdec
 %attr(755,root,root) %{_bindir}/oggenc
 %attr(755,root,root) %{_bindir}/ogginfo
+%attr(755,root,root) %{_bindir}/vcut
 %attr(755,root,root) %{_bindir}/vorbiscomment
 %{_mandir}/man1/ogg123.1*
 %{_mandir}/man1/oggdec.1*
 %{_mandir}/man1/oggenc.1*
 %{_mandir}/man1/ogginfo.1*
+%{_mandir}/man1/vcut.1*
 %{_mandir}/man1/vorbiscomment.1*