rpms/libvorbis/devel .cvsignore, 1.9, 1.10 libvorbis.spec, 1.34, 1.35 sources, 1.9, 1.10 libvorbis-1.0-m4.patch, 1.3, NONE libvorbis-underquoted.patch, 1.1, NONE r14502.patch, 1.1, NONE r14598-CVE-2008-1420.patch, 1.1, NONE r14602-CVE-2008-1419.patch, 1.1, NONE r14602-CVE-2008-1423.patch, 1.1, NONE r14811.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libvorbis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30175

Modified Files:
	.cvsignore libvorbis.spec sources 
Removed Files:
	libvorbis-1.0-m4.patch libvorbis-underquoted.patch 
	r14502.patch r14598-CVE-2008-1420.patch 
	r14602-CVE-2008-1419.patch r14602-CVE-2008-1423.patch 
	r14811.patch 
Log Message:
* Wed Jun 03 2009 Adam Jackson <ajax at redhat.com> 1.2.2-0.1.rc1
- libvorbis 1.2.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Oct 2007 19:52:25 -0000	1.9
+++ .cvsignore	3 Jun 2009 15:48:50 -0000	1.10
@@ -1 +1,2 @@
 libvorbis-1.2.0.tar.bz2
+libvorbis-1.2.2rc1.tar.bz2


Index: libvorbis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/devel/libvorbis.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libvorbis.spec	25 Feb 2009 19:53:06 -0000	1.34
+++ libvorbis.spec	3 Jun 2009 15:48:50 -0000	1.35
@@ -1,18 +1,13 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
-Version:	1.2.0
-Release: 	7%{?dist}
+Version:	1.2.2
+Release: 	0.1.rc1%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://www.xiph.org/
-Source:		http://downloads.xiph.org/releases/vorbis/libvorbis-%{version}.tar.bz2
-Patch0:		libvorbis-1.0-m4.patch
-Patch1: r14502.patch
-Patch2: r14598-CVE-2008-1420.patch
-Patch3: r14602-CVE-2008-1419.patch
-Patch4: r14602-CVE-2008-1423.patch
-Patch5: r14811.patch
+#Source:		http://downloads.xiph.org/releases/vorbis/libvorbis-%{version}.tar.bz2
+Source:		http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.2rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 BuildRequires: 	libogg-devel >= 2:1.1
 
@@ -35,20 +30,22 @@ Obsoletes:	vorbis-devel
 The libvorbis-devel package contains the header files and documentation
 needed to develop applications with Ogg Vorbis.
 
+%package devel-docs
+Summary: Documentation for developing Vorbis applications
+Group: Development/Libraries
+BuildArch: noarch
+
+%description devel-docs
+Documentation for developing applications with libvorbis.
+
 %prep
 
-%setup -q
-%patch0 -p1 -b .m4
-%patch1 -p0 -b .r14502
-%patch2 -p0 -b .r14598-CVE-2008-1420
-%patch3 -p0 -b .r14602-CVE-2008-1419
-%patch4 -p0 -b .r14602-CVE-2008-1423
-%patch5 -p0 -b .r14811
+%setup -q -n libvorbis-1.2.2rc1
 perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
 perl -p -i -e "s/-ffast-math//" configure
-# link to .pdf spec rather than ship redundant copy
-perl -p -i -e "s at Vorbis_I_spec.pdf@http://www.xiph.org/ogg/vorbis/doc/Vorbis_I_spec.pdf@" doc/index.html
-rm -f doc/Vorbis_I_spec.pdf
+
+# workaround for bizarre timestamps
+find . | xargs touch
 
 %build
 %configure --with-ogg-libraries=%{_libdir} --disable-static
@@ -61,11 +58,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# create a cleaned up (Makefile free) copy of doc for -devel %doc
-cp -a doc _doc
-rm `find _doc -name 'Makefile*'`
-
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
@@ -75,7 +67,6 @@ rm `find _doc -name 'Makefile*'`
 
 %files devel
 %defattr(-,root,root)
-%doc _doc/*
 %{_includedir}/vorbis
 %{_libdir}/libvorbis.so
 %{_libdir}/libvorbisfile.so
@@ -83,6 +74,10 @@ rm `find _doc -name 'Makefile*'`
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/vorbis.m4
 
+%files devel-docs
+%defattr(-,root,root)
+%{_docdir}/libvorbis-1.2.2rc1/
+
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jun 03 2009 Adam Jackson <ajax at redhat.com> 1.2.2-0.1.rc1
+- libvorbis 1.2.2rc1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Oct 2007 19:52:25 -0000	1.9
+++ sources	3 Jun 2009 15:48:51 -0000	1.10
@@ -1 +1 @@
-7c6e409d7aa1fa8a5481dea571d5bde0  libvorbis-1.2.0.tar.bz2
+6a7086ee666b8c62e122d29d107f7bec  libvorbis-1.2.2rc1.tar.bz2


--- libvorbis-1.0-m4.patch DELETED ---


--- libvorbis-underquoted.patch DELETED ---


--- r14502.patch DELETED ---


--- r14598-CVE-2008-1420.patch DELETED ---


--- r14602-CVE-2008-1419.patch DELETED ---


--- r14602-CVE-2008-1423.patch DELETED ---


--- r14811.patch DELETED ---