this took me hours to get right.

it's' still not right on redhat versiosn < 7.0 since they moved teh doc dir from /usr/doc to /usr/share/doc.  not quite sure what to do about that :)

jack.

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

diff --git a/Makefile.am b/Makefile.am
index c8773a1..a265953 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = lib include doc examples
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
 
-EXTRA_DIST = README COPYING todo.txt libvorbis.spec vorbis.m4
+EXTRA_DIST = README AUTHORS COPYING libvorbis.spec vorbis.m4
 
 debug:
        $(MAKE) all CFLAGS="@DEBUG@"

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 23f5fde..251e997 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = vorbisfile vorbisenc
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 
 doc_DATA = v-comment.html vorbisword2.png white-ogg.png programming.html\
-        vorbis.html wait.png white-xifish.png
+       vorbis.html wait.png white-xifish.png vorbis-clip.txt\
+       vorbis-errors.txt
 
 EXTRA_DIST = $(doc_DATA)

diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am
index 5ef1c74..3eca0bb 100644 (file)
--- a/doc/vorbisenc/Makefile.am
+++ b/doc/vorbisenc/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
 
 doc_DATA = index.html overview.html reference.html style.css\
         vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html

diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am
index 63d282d..702543a 100644 (file)
--- a/doc/vorbisfile/Makefile.am
+++ b/doc/vorbisfile/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
 
 doc_DATA = OggVorbis_File.html chaining_example_c.html chainingexample.html\
        datastructures.html decoding.html example.html exampleindex.html\

diff --git a/libvorbis.spec b/libvorbis.spec
index d3b428c..d696e5e 100644 (file)
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -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.0.0
+Requires:      libogg >= 1.0beta3
 
 %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.0.0
+Requires:      libogg-devel >= 1.0beta3
 Requires:      libvorbis-devel = %{version}
 
 %description devel
@@ -47,6 +47,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %files
 %defattr(-,root,root)
 %doc COPYING
+%doc AUTHORS
 %doc README
 /usr/lib/libvorbis.so.*
 /usr/lib/libvorbisfile.so.*
@@ -54,10 +55,12 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 %files devel
 %doc doc/*.html
-%doc doc/*.txt
 %doc doc/*.png
-%doc doc/vorbisfile/*.html
-%doc doc/vorbisfile/*.css
+%doc doc/*.txt
+%{_docdir}/%{name}-%{version}/vorbisfile/*.html
+%{_docdir}/%{name}-%{version}/vorbisfile/*.css
+%{_docdir}/%{name}-%{version}/vorbisenc/*.html
+%{_docdir}/%{name}-%{version}/vorbisenc/*.css
 /usr/include/vorbis/codec.h
 /usr/include/vorbis/vorbisfile.h
 /usr/include/vorbis/vorbisenc.h