From 5a86b216c8dc8266d586f27b9f916b8a29ba23a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 10 Oct 2011 12:25:27 +0200 Subject: [PATCH] use macro instead of hard-coded version --- libvpx.spec | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libvpx.spec b/libvpx.spec index 404f04b..922bac0 100644 --- a/libvpx.spec +++ b/libvpx.spec @@ -1,12 +1,14 @@ Name: libvpx Summary: VP8 Video Codec SDK Version: 0.9.7.1 -Release: 2%{?dist} +#global soversion %{version} +%global soversion 0.9.7 +Release: 3%{?dist} License: BSD Group: System Environment/Libraries # 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 +Source0: http://webm.googlecode.com/files/%{name}-v%{soversion}-p1.tar.bz2 # Probably this should be dropped now that upstream ships a vpx.pc; # not for F16 though Source1: libvpx.pc @@ -43,7 +45,7 @@ and decoder. %prep #setup -q -n %{name}-v%{version} -%setup -q -n %{name}-v0.9.7-p1 +%setup -q -n %{name}-v%{soversion}-p1 %build %ifarch %{ix86} @@ -83,8 +85,7 @@ 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.0.9.7 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.%{soversion} tmp/*.o rm -rf tmp %endif @@ -93,8 +94,7 @@ 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.0.9.7 libvpx.so +ln -sf libvpx.so.%{soversion} libvpx.so make %{?_smp_mflags} verbose=true target=examples CONFIG_SHARED=1 make %{?_smp_mflags} verbose=true target=docs @@ -118,12 +118,11 @@ sed -i "s|@INCLUDEDIR@|%{_includedir}|g" %{buildroot}%{_libdir}/pkgconfig/libvpx mv %{buildroot}/usr/docs doc/ %if %{generic_target} -#install -p libvpx.so.%{version} %{buildroot}%{_libdir} -install -p libvpx.so.0.9.7 %{buildroot}%{_libdir} +install -p libvpx.so.%{soversion} %{buildroot}%{_libdir} pushd %{buildroot}%{_libdir} -ln -sf libvpx.so.%{version} libvpx.so -ln -sf libvpx.so.%{version} libvpx.so.0 -ln -sf libvpx.so.%{version} libvpx.so.0.9 +ln -sf libvpx.so.%{soversion} libvpx.so +ln -sf libvpx.so.%{soversion} libvpx.so.0 +ln -sf libvpx.so.%{soversion} libvpx.so.0.9 popd %endif @@ -164,6 +163,9 @@ rm -rf %{buildroot} %{_bindir}/* %changelog +* Mon Oct 10 2011 Dan Horák - 0.9.7.1-3 +- use macro instead of hard-coded version + * Mon Sep 12 2011 Dan Horák - 0.9.7.1-2 - fix build on generic targets