packages: libvpx/libvpx.spec - drop broken manual shared linking and --enab...

[atler]

Author: atler                        Date: Fri Jan  7 19:14:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop broken manual shared linking and --enable-shared
- use %{rpmldflags}
- rel 2

---- Files affected:
packages/libvpx:
   libvpx.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/libvpx/libvpx.spec
diff -u packages/libvpx/libvpx.spec:1.15 packages/libvpx/libvpx.spec:1.16
--- packages/libvpx/libvpx.spec:1.15    Mon Nov  1 11:50:32 2010
+++ packages/libvpx/libvpx.spec Fri Jan  7 20:14:28 2011
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):     VP8 - kodek obrazu wysokiej jakości
 Name:          libvpx
 Version:       0.9.5
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 #Source0-Download: http://code.google.com/p/webm/downloads/list
@@ -75,7 +75,7 @@
 %else
        --target=generic-gnu \
 %endif
-       --enable-pic \
+       --enable-shared \
        --disable-optimizations \
        --enable-vp8 \
        --enable-postproc \
@@ -85,45 +85,26 @@
 sed -i "s|STRIP=.*|STRIP=|g" {libs,examples,docs}-*.mk
 
 %{__make} verbose=true target=libs \
-       CC="%{__cc}"
-
-mkdir tmp
-cd tmp
-ar x ../libvpx_g.a
-cd ..
-%{__cc} %{rpmldflags} -fPIC -shared \
-       -Wl,--no-undefined -Wl,-soname,libvpx.so.0 
-Wl,--version-script,%{SOURCE1} -Wl,-z,noexecstack \
-       -o libvpx.so.0.0.0 tmp/*.o \
-       -pthread -lm
-rm -rf tmp
-
-# Temporarily dance the static libs out of the way
-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.0.0.0 libvpx.so
+       CC="%{__cc}" \
+       LDFLAGS="%{rpmldflags}"
 
 %{__make} verbose=true target=examples \
-       CC="%{__cc}"
+       CC="%{__cc}" \
+       LDFLAGS="%{rpmldflags}"
 %{__make} verbose=true target=docs
 
-# Put them back so the install doesn't fail
-mv libNOTvpx.a libvpx.a
-mv libNOTvpx_g.a libvpx_g.a
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/vpx,%{_libdir}}
 
 install -d outdir
-%{__make} -C obj install \
+%{__make} -C obj verbose=true install \
        DIST_DIR=$(pwd)/outdir
 
 install -p outdir/bin/* $RPM_BUILD_ROOT%{_bindir}
 install -p obj/libvpx.so.* $RPM_BUILD_ROOT%{_libdir}
-ln -s libvpx.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libvpx.so.0
-ln -s libvpx.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libvpx.so
+ln -s libvpx.so.0.9.5 $RPM_BUILD_ROOT%{_libdir}/libvpx.so.0
+ln -s libvpx.so.0.9.5 $RPM_BUILD_ROOT%{_libdir}/libvpx.so
 
 cp -a outdir/include/vpx/*.h $RPM_BUILD_ROOT%{_includedir}/vpx
 cp -a outdir/lib/*.a $RPM_BUILD_ROOT%{_libdir}
@@ -157,6 +138,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2011/01/07 19:14:28  atler
+- drop broken manual shared linking and --enable-shared
+- use %{rpmldflags}
+- rel 2
+
 Revision 1.15  2010/11/01 10:50:32  qboosh
 - pl
 - BR yasm only on x86
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvpx/libvpx.spec?r1=1.15&r2=1.16&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit