Update Version for RC2 / Fixed up Automake / Adjusted RPM depends

svn path=/trunk/vorbis/; revision=1826

diff --git a/configure.in b/configure.in
index 1984511..77f614e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl Initialization and Versioning
 dnl ------------------------------------------------
 
 AC_INIT(lib/mdct.c)
-AM_INIT_AUTOMAKE(libvorbis,1.0rc1)
+AM_INIT_AUTOMAKE(libvorbis,1.0rc2)
 
 dnl Library versioning
 

diff --git a/lib/books/Makefile.am b/lib/books/Makefile.am
index 2427a5b..1458907 100644 (file)
--- a/lib/books/Makefile.am
+++ b/lib/books/Makefile.am
@@ -2,32 +2,4 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = lsp12_0.vqh lsp12_1.vqh lsp30_0.vqh lsp30_1.vqh lsp9_0.vqh\
-       lsp9_1.vqh res0_128_1024_1.vqh res0_128_1024_2.vqh res0_128_1024_3.vqh\
-       res0_128_1024_4.vqh res0_128_1024_5.vqh res0_128_1024_6.vqh\
-       res0_128_1024_7.vqh res0_128_1024_8.vqh res0_128_1024_9.vqh\
-       res0_128_1024aux.vqh res0_128_128_1.vqh res0_128_128_2.vqh\
-       res0_128_128_3.vqh res0_128_128_4.vqh res0_128_128_5.vqh\
-       res0_128_128aux.vqh res0_160_1024_1.vqh res0_160_1024_2.vqh\
-       res0_160_1024_3.vqh res0_160_1024_4.vqh res0_160_1024_5.vqh\
-       res0_160_1024_6.vqh res0_160_1024_7.vqh res0_160_1024_8.vqh\
-       res0_160_1024_9.vqh res0_160_1024aux.vqh res0_160_128_1.vqh\
-       res0_160_128_2.vqh res0_160_128_3.vqh res0_160_128_4.vqh\
-       res0_160_128_5.vqh res0_160_128aux.vqh res0_192_1024_1.vqh\
-       res0_192_1024_2.vqh res0_192_1024_3.vqh res0_192_1024_4.vqh\
-       res0_192_1024_5.vqh res0_192_1024_6.vqh res0_192_1024_7.vqh\
-       res0_192_1024_8.vqh res0_192_1024_9.vqh res0_192_1024aux.vqh\
-       res0_192_128_1.vqh res0_192_128_2.vqh res0_192_128_3.vqh\
-       res0_192_128_4.vqh res0_192_128_5.vqh res0_192_128aux.vqh\
-       res0_256_1024_1.vqh res0_256_1024_2.vqh res0_256_1024_3.vqh\
-       res0_256_1024_4.vqh res0_256_1024_5.vqh res0_256_1024_6.vqh\
-       res0_256_1024_7.vqh res0_256_1024aux.vqh res0_256_128_1.vqh\
-       res0_256_128_2.vqh res0_256_128_3.vqh res0_256_128_4.vqh\
-       res0_256_128_5.vqh res0_256_128aux.vqh res0_96_1024_1.vqh\
-       res0_96_1024_2.vqh res0_96_1024_3.vqh res0_96_1024_4.vqh\
-       res0_96_1024_5.vqh res0_96_1024_6.vqh res0_96_1024_7.vqh\
-       res0_96_1024_8.vqh res0_96_1024_9.vqh res0_96_1024aux.vqh\
-       res0_96_128_1.vqh res0_96_128_2.vqh res0_96_128_3.vqh\
-       res0_96_128_4.vqh res0_96_128_5.vqh res0_96_128aux.vqh\
-       res0_350_1024_7.vqh
-
+EXTRA_DIST =   line_1024x31_0sub0.vqh line_1024x31_0sub1.vqh line_1024x31_1sub0.vqh line_1024x31_1sub1.vqh line_1024x31_2sub1.vqh line_1024x31_2sub2.vqh line_1024x31_2sub3.vqh line_1024x31_3sub1.vqh line_1024x31_3sub2.vqh line_1024x31_3sub3.vqh line_1024x31_class0.vqh line_1024x31_class1.vqh line_1024x31_class2.vqh line_1024x31_class3.vqh line_128x7_0sub0.vqh line_128x7_1sub1.vqh line_128x7_1sub2.vqh line_128x7_1sub3.vqh line_128x7_2sub1.vqh line_128x7_2sub2.vqh line_128x7_2sub3.vqh line_128x7_class1.vqh line_128x7_class2.vqh lsp12_0.vqh lsp12_1.vqh lsp30_0.vqh lsp30_1.vqh lsp9_0.vqh lsp9_1.vqh res_Zc_1024aux.vqh res_Zc_128aux.vqh res_Zc_1.vqh res_Zc_2.vqh res_Zc_3.vqh res_Zc_4.vqh res_Zc_5.vqh res_Zc_6.vqh res_Zc_7.vqh res_Zc_8.vqh res_Zc_9a.vqh res_Zc_9b.vqh res_Zc_9.vqh

diff --git a/lib/modes/Makefile.am b/lib/modes/Makefile.am
index f6ca9d7..bca62e9 100644 (file)
--- a/lib/modes/Makefile.am
+++ b/lib/modes/Makefile.am
@@ -2,4 +2,4 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = mode_AA.h mode_A.h mode_B.h mode_C.h mode_D.h mode_E.h modes.h
+EXTRA_DIST = maskadj_Z.h mode_44c_Z.h mode_AA.h mode_A.h mode_B.h mode_C.h mode_D.h mode_E.h modes.h mode_Za.h mode_Zb.h mode_Zc.h

diff --git a/libvorbis.spec b/libvorbis.spec
index 67dd525..7488489 100644 (file)
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,5 +1,5 @@
 %define name   libvorbis
-%define version        1.0rc1
+%define version        1.0rc2
 %define release 1
 
 Summary:       The Vorbis General Audio Compression Codec
@@ -12,7 +12,7 @@ URL:          http://www.xiph.org/
 Vendor:                Xiphophorus <team@xiph.org>
 Source:                ftp://ftp.xiph.org/pub/ogg/vorbis/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-root
-Requires:      libogg >= 1.0beta4
+Requires:      libogg >= 1.0rc2
 
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
@@ -22,7 +22,7 @@ and variable bitrates from 16 to 128 kbps/channel.
 %package devel
 Summary:       Vorbis Library Development
 Group:                 Development/Libraries
-Requires:      libogg-devel >= 1.0beta4
+Requires:      libogg-devel >= 1.0rc2
 Requires:      libvorbis-devel = %{version}
 
 %description devel