add %license

diff --git a/packaging/libvorbis-pkgconfig.patch b/packaging/libvorbis-pkgconfig.patch
deleted file mode 100644 (file)
index 005da90..0000000
--- a/packaging/libvorbis-pkgconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: vorbis.pc.in
-================================================================================
---- vorbis.pc.in
-+++ vorbis.pc.in
-@@ -8,7 +8,8 @@
- 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}
---- vorbisenc.pc.in
-+++ vorbisenc.pc.in
-@@ -8,7 +8,7 @@
- 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}
---- vorbisfile.pc.in
-+++ vorbisfile.pc.in
-@@ -8,7 +8,7 @@
- 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}

diff --git a/packaging/libvorbis.spec b/packaging/libvorbis.spec
index 9fe159d..f5366f7 100644 (file)
--- a/packaging/libvorbis.spec
+++ b/packaging/libvorbis.spec
@@ -7,11 +7,6 @@ Url:            http://www.vorbis.com/
 Group:          System/Libraries
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
-Patch1:         libvorbis-lib64.dif
-Patch2:         libvorbis-m4.dif
-Patch10:        libvorbis-pkgconfig.patch
-Patch11:        vorbis-fix-linking.patch
-Patch12:        vorbis-ocloexec.patch
 BuildRequires:  fdupes
 BuildRequires:  libogg-devel
 BuildRequires:  libtool
@@ -112,19 +107,22 @@ find %{buildroot}%{_docdir}/ -empty -delete
 
 %files 
 %defattr(0644,root,root,0755)
+%license COPYING 
 %{_libdir}/libvorbis.so.0*
 
 %files -n libvorbisenc
 %defattr(0644,root,root,0755)
+%license COPYING 
 %{_libdir}/libvorbisenc.so.2*
 
 %files -n libvorbisfile
 %defattr(0644,root,root,0755)
+%license COPYING 
 %{_libdir}/libvorbisfile.so.3*
 
 %files devel
 %defattr(-,root,root)
-%doc COPYING AUTHORS README *.txt
+%license COPYING 
 %{_datadir}/aclocal/*.m4
 %{_includedir}/vorbis
 %{_libdir}/lib*.so

diff --git a/packaging/vorbis-fix-linking.patch b/packaging/vorbis-fix-linking.patch
deleted file mode 100644 (file)
index 826fab9..0000000
--- a/packaging/vorbis-fix-linking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.am        2010-12-21 17:46:03.000000000 +0900
-+++ Makefile.am        2012-06-16 15:43:41.143756104 +0900
-@@ -1,8 +1,8 @@
- ## Process this file with automake to produce Makefile.in
- 
- #AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
--AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
--
-+AUTOMAKE_OPTIONS = foreign 1.10 dist-zip
-+ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = m4 include vq lib test doc
- 
- if BUILD_EXAMPLES 
---- configure.ac       2012-02-04 07:00:34.000000000 +0900
-+++ configure.ac       2012-06-16 15:43:05.647225479 +0900
-@@ -8,7 +8,7 @@
- AC_INIT([libvorbis],[1.3.3],[vorbis-dev@xiph.org])
- 
- AC_CONFIG_SRCDIR([lib/mdct.c])
--
-+AC_CONFIG_MACRO_DIR([m4])
- AC_CANONICAL_TARGET([])
- 
- AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)

diff --git a/packaging/vorbis-ocloexec.patch b/packaging/vorbis-ocloexec.patch
deleted file mode 100644 (file)
index 71a56fc..0000000
--- a/packaging/vorbis-ocloexec.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- lib/analysis.c.orig
-+++ lib/analysis.c
-@@ -73,7 +73,7 @@ void _analysis_output_always(char *base,
-   char buffer[80];
- 
-   sprintf(buffer,"%s_%d.m",base,i);
--  of=fopen(buffer,"w");
-+  of=fopen(buffer,"we");
- 
-   if(!of)perror("failed to open data dump file");
- 
---- lib/floor1.c.orig
-+++ lib/floor1.c
-@@ -899,7 +899,7 @@ int floor1_encode(oggpack_buffer *opb,vo
-           char buffer[80];
-           sprintf(buffer,"line_%dx%ld_class%d.vqd",
-                   vb->pcmend/2,posts-2,class);
--          of=fopen(buffer,"a");
-+          of=fopen(buffer,"ae");
-           fprintf(of,"%d\n",cval);
-           fclose(of);
-         }
-@@ -923,7 +923,7 @@ int floor1_encode(oggpack_buffer *opb,vo
-             char buffer[80];
-             sprintf(buffer,"line_%dx%ld_%dsub%d.vqd",
-                     vb->pcmend/2,posts-2,class,bookas[k]);
--            of=fopen(buffer,"a");
-+            of=fopen(buffer,"ae");
-             fprintf(of,"%d\n",out[j+k]);
-             fclose(of);
-           }
---- lib/psytune.c.orig
-+++ lib/psytune.c
-@@ -202,7 +202,7 @@ void analysis(char *base,int i,float *v,
-     FILE *of;
-     char buffer[80];
-     sprintf(buffer,"%s_%d.m",base,i);
--    of=fopen(buffer,"w");
-+    of=fopen(buffer,"we");
- 
-     for(j=0;j<n;j++){
-       if(dB && v[j]==0)
---- lib/res0.c.orig
-+++ lib/res0.c
-@@ -93,7 +93,7 @@ void res0_free_look(vorbis_look_residue
- 
-             /* long and short into the same bucket by current convention */
-             sprintf(buffer,"res_sub%d_part%d_pass%d.vqd",look->submap,j,k);
--            of=fopen(buffer,"a");
-+            of=fopen(buffer,"ae");
- 
-             for(l=0;l<statebook->entries;l++)
-               fprintf(of,"%d:%ld\n",l,look->training_data[k][j][l]);
-@@ -462,7 +462,7 @@ static long **_01class(vorbis_block *vb,
- 
-     for(i=0;i<ch;i++){
-       sprintf(buffer,"resaux_%d.vqd",look->train_seq);
--      of=fopen(buffer,"a");
-+      of=fopen(buffer,"ae");
-       for(j=0;j<partvals;j++)
-         fprintf(of,"%ld, ",partword[i][j]);
-       fprintf(of,"\n");
-@@ -521,7 +521,7 @@ static long **_2class(vorbis_block *vb,v
- 
- #ifdef TRAIN_RESAUX
-   sprintf(buffer,"resaux_%d.vqd",look->train_seq);
--  of=fopen(buffer,"a");
-+  of=fopen(buffer,"ae");
-   for(i=0;i<partvals;i++)
-     fprintf(of,"%ld, ",partword[0][i]);
-   fprintf(of,"\n");
---- lib/vorbisfile.c.orig
-+++ lib/vorbisfile.c
-@@ -1010,7 +1010,7 @@ int ov_open(FILE *f,OggVorbis_File *vf,c
- 
- int ov_fopen(const char *path,OggVorbis_File *vf){
-   int ret;
--  FILE *f = fopen(path,"rb");
-+  FILE *f = fopen(path,"rbe");
-   if(!f) return -1;
- 
-   ret = ov_open(f,vf,NULL,0);