[libvpx/el6/master] disable docs for el5
Tom Callaway
spot at fedoraproject.org
Wed Sep 1 20:52:56 UTC 2010
commit ee6250f513ee25bf301dfd5068c5a1b4120c3204
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Wed Sep 1 16:52:57 2010 -0400
disable docs for el5
libvpx.spec | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/libvpx.spec b/libvpx.spec
index 6893ad6..a5054de 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -1,7 +1,7 @@
Name: libvpx
Summary: VP8 Video Codec SDK
Version: 0.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}.1
License: BSD
Group: System Environment/Libraries
Source0: http://webm.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Source1: libvpx.pc
Source2: libvpx.ver
Patch0: libvpx-0.9.0-no-explicit-dep-on-static-lib.patch
URL: http://www.webmproject.org/tools/vp8-sdk/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch %{ix86} x86_64
BuildRequires: yasm
%endif
@@ -92,13 +93,16 @@ mv libvpx_g.a libNOTvpx_g.a
ln -sf libvpx.so.%{version} libvpx.so
make %{?_smp_mflags} verbose=true target=examples
+%if 0%{?rhel} > 5
make %{?_smp_mflags} verbose=true target=docs
+%endif
# Put them back so the install doesn't fail
mv libNOTvpx.a libvpx.a
mv libNOTvpx_g.a libvpx_g.a
%install
+rm -rf %{buildroot}
make DIST_DIR=%{buildroot}%{_prefix} dist
# Install the pkg-config file
@@ -109,8 +113,10 @@ sed -i "s|@PREFIX@|%{_prefix}|g" %{buildroot}%{_libdir}/pkgconfig/libvpx.pc
sed -i "s|@LIBDIR@|%{_libdir}|g" %{buildroot}%{_libdir}/pkgconfig/libvpx.pc
sed -i "s|@INCLUDEDIR@|%{_includedir}|g" %{buildroot}%{_libdir}/pkgconfig/libvpx.pc
+%if 0%{?rhel} > 5
# Simpler to label the dir as %doc.
mv %{buildroot}/usr/docs doc/
+%endif
%if %{generic_target}
install -p libvpx.so.%{version} %{buildroot}%{_libdir}
@@ -146,8 +152,10 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,-)
+%if 0%{?rhel} > 5
# These are SDK docs, not really useful to an end-user.
-%doc docs/
+%doc docs/html/
+%endif
%{_includedir}/vpx/
%{_libdir}/pkgconfig/libvpx.pc
%{_libdir}/libvpx.so
@@ -157,6 +165,12 @@ rm -rf %{buildroot}
%{_bindir}/*
%changelog
+* Wed Sep 1 2010 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.1-3.1
+- disable docs for RHEL 5
+
+* Wed Sep 1 2010 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.1-3
+- only package html docs to avoid multilib conflict (bz 613185)
+
* Thu Jun 24 2010 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.1-2
- build shared library the old way for generic arches
More information about the scm-commits
mailing list