[libvpx] libvpx 0.9.7-p1

[Adam Jackson]

commit 72dc4d99156c6d084d5c049a0f05631984f87979
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 16 15:23:35 2011 -0400

    libvpx 0.9.7-p1

 .gitignore  |    1 +
 libvpx.spec |   18 +++++++++++++-----
 sources     |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 13d4dc6..139a4e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ libvpx-0.9.1.tar.bz2
 /libvpx-v0.9.5.tar.bz2
 /libvpx-v0.9.6.tar.bz2
 /libvpx-v0.9.7.tar.bz2
+/libvpx-v0.9.7-p1.tar.bz2
diff --git a/libvpx.spec b/libvpx.spec
index e265fea..c4d0d09 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -1,10 +1,12 @@
 Name:			libvpx
 Summary:		VP8 Video Codec SDK
-Version:		0.9.7
+Version:		0.9.7.1
 Release:		1%{?dist}
 License:		BSD
 Group:			System Environment/Libraries
-Source0:		http://webm.googlecode.com/files/%{name}-v%{version}.tar.bz2
+# sigh, non-canonical version strings.  clean up in 0.9.8 plz.
+#Source0:		http://webm.googlecode.com/files/%{name}-v%{version}.tar.bz2
+Source0:		http://webm.googlecode.com/files/%{name}-v0.9.7-p1.tar.bz2
 # Probably this should be dropped now that upstream ships a vpx.pc;
 # not for F16 though
 Source1:		libvpx.pc
@@ -40,7 +42,8 @@ A selection of utilities and tools for VP8, including a sample encoder
 and decoder.
 
 %prep
-%setup -q -n %{name}-v%{version}
+#setup -q -n %{name}-v%{version}
+%setup -q -n %{name}-v0.9.7-p1
 
 %build
 %ifarch %{ix86}
@@ -80,7 +83,8 @@ mkdir tmp
 cd tmp
 ar x ../libvpx_g.a
 cd ..
-gcc -fPIC -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,libvpx.so.0 -Wl,--version-script,%{SOURCE2} -Wl,-z,noexecstack -o libvpx.so.%{version} tmp/*.o
+# gcc -fPIC -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,libvpx.so.0 -Wl,--version-script,%{SOURCE2} -Wl,-z,noexecstack -o libvpx.so.%{version} tmp/*.o
+gcc -fPIC -shared -pthread -lm -Wl,--no-undefined -Wl,-soname,libvpx.so.0 -Wl,--version-script,%{SOURCE2} -Wl,-z,noexecstack -o libvpx.so.0.9.7 tmp/*.o
 rm -rf tmp
 %endif
 
@@ -89,7 +93,8 @@ mv libvpx.a libNOTvpx.a
 mv libvpx_g.a libNOTvpx_g.a
 
 # We need to do this so the examples can link against it.
-ln -sf libvpx.so.%{version} libvpx.so
+# ln -sf libvpx.so.%{version} libvpx.so
+ln -sf libvpx.so.0.9.7 libvpx.so
 
 make %{?_smp_mflags} verbose=true target=examples
 make %{?_smp_mflags} verbose=true target=docs
@@ -158,6 +163,9 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Tue Aug 16 2011 Adam Jackson <ajax at redhat.com> 0.9.7.1-1
+- libvpx 0.9.7-p1
+
 * Tue Aug 09 2011 Adam Jackson <ajax at redhat.com> 0.9.7-1
 - libvpx 0.9.7
 
diff --git a/sources b/sources
index dab09bf..cbc95b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-893d07d1bdedaac1ad2ab63d32de7d83  libvpx-v0.9.7.tar.bz2
+bd888cffde8d9c3061c7fd719b0cd4ce  libvpx-v0.9.7-p1.tar.bz2