[libXvMC] - Merge-review cleanup (#226092)

paragn paragn at fedoraproject.org
Thu Oct 21 04:42:03 UTC 2010


commit 644c29e4f153e0b855efb096f14b2932cc0462db
Author: paragn <paragn at fedoraproject.org>
Date:   Thu Oct 21 10:11:48 2010 +0530

    - Merge-review cleanup (#226092)

 libXvMC.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/libXvMC.spec b/libXvMC.spec
index 016804f..7a12b25 100644
--- a/libXvMC.spec
+++ b/libXvMC.spec
@@ -1,11 +1,10 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
@@ -27,12 +26,11 @@ X.Org X11 libXvMC development package
 
 %build
 %configure --disable-static
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-make install DESTDIR=$RPM_BUILD_ROOT
 # do this ourself in %%doc so we get %%version
 rm $RPM_BUILD_ROOT%{_docdir}/*/*.txt
 
@@ -42,11 +40,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/*/*.txt
     touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/XvMCConfig
 }
 
-# We intentionally don't ship *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -69,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Mon Oct 18 2010 Parag Nemade <paragn AT fedoraproject.org> 1.0.6-2
+- Merge-review cleanup (#226092)
+
 * Mon Aug 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.0.6-1
 - libXvMC 1.0.6
 - remove AUTHORS, not in tarball anymore


More information about the scm-commits mailing list