- Moved _smp_mflags from 'make install' to 'make' invocation, duh.

This commit is contained in:
mharris 2005-11-11 22:16:06 +00:00
parent f72efe66b5
commit 779a4414d8

View File

@ -8,7 +8,7 @@
Summary: X.Org X11 libX11 runtime library
Name: libX11
Version: 0.99.3
Release: 1
Release: 2
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.x.org
@ -49,14 +49,14 @@ X.Org X11 libX11 development package
%if ! %{with_static}
--disable-static
%endif
make
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
# FIXME: It seems upstream scripts do not like it if makeinstall is used.
#%%makeinstall DESTDIR=$RPM_BUILD_ROOT
make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# We intentionally don't ship *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@ -233,12 +233,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3x/*.3x*
%changelog
* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-2
- Moved _smp_mflags from 'make install' to 'make' invocation, duh.
* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
- Updated libX11 to version 0.99.3 from X11R7 RC2
- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
* Mon Nov 7 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
- Fix devel subpackage summary and description with s/libXdmcp/libX11/