[xorg-x11-xbitmaps] merge review

Adam Jackson ajax at fedoraproject.org
Mon Aug 30 20:14:48 UTC 2010


commit 5b29c318777f17b275725c0c8f72d70c5849c41c
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Aug 30 16:14:49 2010 -0400

    merge review

 xorg-x11-xbitmaps.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-xbitmaps.spec b/xorg-x11-xbitmaps.spec
index f9f9672..9401e5a 100644
--- a/xorg-x11-xbitmaps.spec
+++ b/xorg-x11-xbitmaps.spec
@@ -9,7 +9,6 @@ Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 Source0: ftp://ftp.x.org/pub/individual/data/xbitmaps-%{version}.tar.bz2
@@ -27,7 +26,7 @@ X.Org X11 application bitmaps
 # hack to move the pc file
 sed -i 's/^libdir.*//' *.pc.in
 %configure --libdir=%{_datadir}
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,11 +38,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-#%doc
+%doc COPYING
 %{_includedir}/X11/bitmaps
 %{_datadir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* Mon Aug 30 2010 Adam Jackson <ajax at redhat.com> 1.1.0-2
+- Merge review cleanups (#226649)
+
 * Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
 - xbitmaps 1.1.0
 - BuildArch: noarch


More information about the scm-commits mailing list