* Sun Oct 2 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2.cvs20050830.1
- Update BuildRequires for new library package naming (libX...) - Use Fedora Extras style BuildRoot tag - Invoke make with _smp_mflags to take advantage of SMP systems
This commit is contained in:
mharris
parent
ce50e2c171
commit
683564b0d0
@ -4,51 +4,51 @@
|
|||||||
|
|
||||||
%define cvsdate cvs20050830
|
%define cvsdate cvs20050830
|
||||||
|
|
||||||
Summary: Xorg X11 Server
|
Summary: X.Org X11 X server
|
||||||
Name: xorg-x11-server
|
Name: xorg-x11-server
|
||||||
Version: 0.99.1
|
Version: 0.99.1
|
||||||
Release: 2.%{cvsdate}
|
Release: 2.%{cvsdate}.1
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
Source0: http://xorg.freedesktop.org/X11R7.0-RC0/xserver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
|
#Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{tarball}-%{version}.tar.bz2
|
||||||
|
Source0: %{tarball}-%{version}-%{cvsdate}.tar.bz2
|
||||||
License: MIT/MIT
|
License: MIT/MIT
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
# INFO: We don't ship the X server on s390/s390x/ppc64
|
# INFO: We don't ship the X server on s390/s390x/ppc64
|
||||||
Excludearch: s390 s390x ppc64
|
Excludearch: s390 s390x ppc64
|
||||||
|
|
||||||
%define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest
|
%define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: xorg-x11-proto-devel
|
BuildRequires: xorg-x11-proto-devel
|
||||||
BuildRequires: xorg-x11-xtrans-devel
|
BuildRequires: xorg-x11-xtrans-devel
|
||||||
BuildRequires: xorg-x11-libXfont-devel
|
BuildRequires: libXfont-devel
|
||||||
BuildRequires: xorg-x11-libXau-devel
|
BuildRequires: libXau-devel
|
||||||
BuildRequires: xorg-x11-libxkbfile-devel
|
BuildRequires: libxkbfile-devel
|
||||||
# xorg-x11-libXdmcp-devel needed for Xdmx
|
# libXdmcp-devel needed for Xdmx
|
||||||
BuildRequires: xorg-x11-libXdmcp-devel
|
BuildRequires: libXdmcp-devel
|
||||||
# xorg-x11-libXmu-devel needed for Xdmx
|
# libXmu-devel needed for Xdmx
|
||||||
BuildRequires: xorg-x11-libXmu-devel
|
BuildRequires: libXmu-devel
|
||||||
# xorg-x11-libXext-devel needed for Xdmx
|
# libXext-devel needed for Xdmx
|
||||||
BuildRequires: xorg-x11-libXext-devel
|
BuildRequires: libXext-devel
|
||||||
# xorg-x11-libX11-devel needed for Xdmx
|
# libX11-devel needed for Xdmx
|
||||||
BuildRequires: xorg-x11-libX11-devel
|
BuildRequires: libX11-devel
|
||||||
# xorg-x11-libXrender-devel needed for Xdmx
|
# libXrender-devel needed for Xdmx
|
||||||
BuildRequires: xorg-x11-libXrender-devel
|
BuildRequires: libXrender-devel
|
||||||
# xorg-x11-libXi-devel needed for Xdmx
|
# libXi-devel needed for Xdmx
|
||||||
BuildRequires: xorg-x11-libXi-devel
|
BuildRequires: libXi-devel
|
||||||
# xorg-x11-libfontenc-devel needed for Xorg, but not specified by
|
# libfontenc-devel needed for Xorg, but not specified by
|
||||||
# upstream deps. Build fails without it.
|
# upstream deps. Build fails without it.
|
||||||
BuildRequires: xorg-x11-libfontenc-devel
|
BuildRequires: libfontenc-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Xserver RPM
|
X.Org X11 X server
|
||||||
|
|
||||||
# ----- Xorg --------------------------------------------------------
|
# ----- Xorg --------------------------------------------------------
|
||||||
|
|
||||||
%package Xorg
|
%package Xorg
|
||||||
Summary: The primary Xorg server
|
Summary: Xorg X server
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Obsoletes: XFree86 xorg-x11
|
Obsoletes: XFree86 xorg-x11
|
||||||
Provides: Xorg
|
Provides: Xorg
|
||||||
@ -130,8 +130,12 @@ drivers, input drivers, or other X modules should install this package.
|
|||||||
%setup -q -n %{tarball}-%{version}-%{cvsdate}
|
%setup -q -n %{tarball}-%{version}-%{cvsdate}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure %{xservers} --enable-composite --disable-xprint --disable-static --with-module-dir=%{moduledir}
|
%configure %{xservers} \
|
||||||
make
|
--enable-composite \
|
||||||
|
--disable-xprint \
|
||||||
|
--disable-static \
|
||||||
|
--with-module-dir=%{moduledir}
|
||||||
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -199,7 +203,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Aug 30 2005 <krh@redhat.com> - 0.99.1-2.cvs20050830
|
* Sun Oct 2 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2.cvs20050830.1
|
||||||
|
- Update BuildRequires for new library package naming (libX...)
|
||||||
|
- Use Fedora Extras style BuildRoot tag
|
||||||
|
- Invoke make with _smp_mflags to take advantage of SMP systems
|
||||||
|
|
||||||
|
* Tue Aug 30 2005 Kristian Hogsberg <krh@redhat.com> 0.99.1-2.cvs20050830
|
||||||
- Go back to %spec -n, use new cvs snapshot that supports overriding
|
- Go back to %spec -n, use new cvs snapshot that supports overriding
|
||||||
moduledir during make install, use %makeinstall.
|
moduledir during make install, use %makeinstall.
|
||||||
- Drop %{moduledir}/multimedia globs.
|
- Drop %{moduledir}/multimedia globs.
|
||||||
@ -209,5 +218,5 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
half way through without it, even though upstream dependencies do not
|
half way through without it, even though upstream dependencies do not
|
||||||
specify it as required.
|
specify it as required.
|
||||||
|
|
||||||
* Tue Aug 23 2005 <krh@redhat.com> 0.99.1-1
|
* Tue Aug 23 2005 Kristian Hogsberg <krh@redhat.com> 0.99.1-1
|
||||||
- Initial spec file for the modular X server.
|
- Initial spec file for the modular X server.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user