forked from pool/xorg-x11-server
Accepting request 110678 from home:jengelh:branches:X11:XOrg
- Parallel build with %_smp_mflags; strip redundant sections/tags - Use pkgconfig symbols for BuildRequires/Requires OBS-URL: https://build.opensuse.org/request/show/110678 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=380
This commit is contained in:
Git OBS Bridge
parent
1d01f889f5
commit
4d60b70d66
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 22 00:25:39 UTC 2012 - jengelh@medozas.de
|
||||||
|
|
||||||
|
- Parallel build with %_smp_mflags; strip redundant sections/tags
|
||||||
|
- Use pkgconfig symbols for BuildRequires/Requires
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 28 21:39:17 UTC 2012 - sndirsch@suse.com
|
Tue Feb 28 21:39:17 UTC 2012 - sndirsch@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -14,25 +14,61 @@
|
|||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
# norootforbuild
|
|
||||||
|
|
||||||
|
|
||||||
Name: xorg-x11-server
|
Name: xorg-x11-server
|
||||||
%define dirsuffix 1.10.4
|
%define dirsuffix 1.10.4
|
||||||
%define vnc 1
|
%define vnc 1
|
||||||
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel libtool pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
|
BuildRequires: Mesa-devel
|
||||||
BuildRequires: pkgconfig(xfont)
|
BuildRequires: bison
|
||||||
BuildRequires: pkgconfig(xaw7)
|
BuildRequires: flex
|
||||||
|
BuildRequires: ghostscript-library
|
||||||
|
BuildRequires: libtool
|
||||||
|
BuildRequires: pkgconfig
|
||||||
|
BuildRequires: xorg-x11
|
||||||
|
BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0
|
||||||
|
BuildRequires: pkgconfig(damageproto) >= 1.1
|
||||||
BuildRequires: pkgconfig(dmx) >= 1.0.99.1
|
BuildRequires: pkgconfig(dmx) >= 1.0.99.1
|
||||||
BuildRequires: pkgconfig(xtst) >= 1.0.99.2
|
BuildRequires: pkgconfig(fixesproto) >= 4.1
|
||||||
BuildRequires: pkgconfig(xres)
|
BuildRequires: pkgconfig(fontconfig)
|
||||||
BuildRequires: pkgconfig(pixman-1) >= 0.15.20
|
BuildRequires: pkgconfig(fontenc)
|
||||||
|
BuildRequires: pkgconfig(fontsproto)
|
||||||
|
BuildRequires: pkgconfig(fontutil)
|
||||||
|
BuildRequires: pkgconfig(freetype2)
|
||||||
|
BuildRequires: pkgconfig(ice)
|
||||||
|
BuildRequires: pkgconfig(inputproto) >= 1.9.99.902
|
||||||
|
BuildRequires: pkgconfig(kbproto) >= 1.0.3
|
||||||
|
BuildRequires: pkgconfig(libdrm)
|
||||||
|
BuildRequires: pkgconfig(openssl)
|
||||||
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
|
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
|
||||||
BuildRequires: pkgconfig(xi)
|
BuildRequires: pkgconfig(pixman-1) >= 0.15.20
|
||||||
|
BuildRequires: pkgconfig(randrproto) >= 1.2.99.3
|
||||||
|
BuildRequires: pkgconfig(renderproto) >= 0.11
|
||||||
|
BuildRequires: pkgconfig(sm)
|
||||||
|
BuildRequires: pkgconfig(x11)
|
||||||
|
BuildRequires: pkgconfig(xau)
|
||||||
|
BuildRequires: pkgconfig(xau)
|
||||||
|
BuildRequires: pkgconfig(xaw7)
|
||||||
|
BuildRequires: pkgconfig(xcmiscproto) >= 1.2.0
|
||||||
|
BuildRequires: pkgconfig(xdmcp)
|
||||||
|
BuildRequires: pkgconfig(xext) >= 1.0.99.4
|
||||||
|
BuildRequires: pkgconfig(xextproto) >= 7.1.99
|
||||||
|
BuildRequires: pkgconfig(xfixes)
|
||||||
|
BuildRequires: pkgconfig(xfont) >= 1.4.2
|
||||||
|
BuildRequires: pkgconfig(xi) >= 1.2.99.1
|
||||||
|
BuildRequires: pkgconfig(xkbfile)
|
||||||
|
BuildRequires: pkgconfig(xmu)
|
||||||
|
BuildRequires: pkgconfig(xp)
|
||||||
|
BuildRequires: pkgconfig(xpm)
|
||||||
|
BuildRequires: pkgconfig(xprintutil)
|
||||||
|
BuildRequires: pkgconfig(xproto) >= 7.0.17
|
||||||
|
BuildRequires: pkgconfig(xrender)
|
||||||
|
BuildRequires: pkgconfig(xres)
|
||||||
|
BuildRequires: pkgconfig(xt)
|
||||||
|
BuildRequires: pkgconfig(xtrans) >= 1.2.2
|
||||||
|
BuildRequires: pkgconfig(xtst) >= 1.0.99.2
|
||||||
|
BuildRequires: pkgconfig(xv)
|
||||||
### udev support (broken on openSUSE 11.2, see also bnc #589997)
|
### udev support (broken on openSUSE 11.2, see also bnc #589997)
|
||||||
%if %suse_version > 1120
|
%if %suse_version >= 1130
|
||||||
BuildRequires: libudev-devel
|
BuildRequires: pkgconfig(libudev) >= 143
|
||||||
%endif
|
%endif
|
||||||
%if %vnc
|
%if %vnc
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
@ -40,10 +76,8 @@ BuildRequires: pkgconfig(vncproto)
|
|||||||
%endif
|
%endif
|
||||||
Url: http://xorg.freedesktop.org/
|
Url: http://xorg.freedesktop.org/
|
||||||
Version: 7.6_%{dirsuffix}
|
Version: 7.6_%{dirsuffix}
|
||||||
Release: 1
|
Release: 0
|
||||||
License: GPL-2.0+ ; MIT
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Group: System/X11/Servers/XF86_4
|
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
PreReq: %fillup_prereq
|
PreReq: %fillup_prereq
|
||||||
%endif
|
%endif
|
||||||
@ -56,6 +90,8 @@ Requires: libpixman-1-0 >= 0.15.2
|
|||||||
Provides: xorg-x11-server-glx xorg-x11-Xvfb
|
Provides: xorg-x11-server-glx xorg-x11-Xvfb
|
||||||
Obsoletes: xorg-x11-server-glx xorg-x11-Xvfb
|
Obsoletes: xorg-x11-server-glx xorg-x11-Xvfb
|
||||||
Summary: X.Org Server
|
Summary: X.Org Server
|
||||||
|
License: GPL-2.0+ ; MIT
|
||||||
|
Group: System/X11/Servers/XF86_4
|
||||||
Source: xorg-server-%{dirsuffix}.tar.bz2
|
Source: xorg-server-%{dirsuffix}.tar.bz2
|
||||||
Source1: sysconfig.displaymanager.template
|
Source1: sysconfig.displaymanager.template
|
||||||
Source3: README.updates
|
Source3: README.updates
|
||||||
@ -113,14 +149,12 @@ This package contains the X.Org Server.
|
|||||||
|
|
||||||
|
|
||||||
%package extra
|
%package extra
|
||||||
License: GPL-2.0+ ; MIT
|
|
||||||
Summary: Additional Xservers (Xdmx, Xephyr, Xnest)
|
Summary: Additional Xservers (Xdmx, Xephyr, Xnest)
|
||||||
Group: System/X11/Servers/XF86_4
|
Group: System/X11/Servers/XF86_4
|
||||||
Provides: xorg-x11-Xnest
|
Provides: xorg-x11-Xnest
|
||||||
Obsoletes: xorg-x11-Xnest
|
Obsoletes: xorg-x11-Xnest
|
||||||
Requires: xorg-x11-fonts-core xorg-x11 Mesa
|
Requires: xorg-x11-fonts-core xorg-x11 Mesa
|
||||||
Requires: xkeyboard-config
|
Requires: xkeyboard-config
|
||||||
AutoReqProv: on
|
|
||||||
|
|
||||||
%description extra
|
%description extra
|
||||||
This package contains additional Xservers (Xdmx, Xephyr, Xnest).
|
This package contains additional Xservers (Xdmx, Xephyr, Xnest).
|
||||||
@ -128,13 +162,21 @@ This package contains additional Xservers (Xdmx, Xephyr, Xnest).
|
|||||||
|
|
||||||
|
|
||||||
%package sdk
|
%package sdk
|
||||||
License: GPL-2.0+ ; MIT
|
|
||||||
Summary: X.Org Server SDK
|
Summary: X.Org Server SDK
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Provides: xorg-x11-sdk
|
Provides: xorg-x11-sdk
|
||||||
Obsoletes: xorg-x11-sdk
|
Obsoletes: xorg-x11-sdk
|
||||||
Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel freetype2-devel fontconfig-devel libdrm-devel xorg-x11-server
|
Requires: xorg-x11-proto-devel pkgconfig(xtrans)
|
||||||
AutoReqProv: on
|
Requires: pkgconfig(xau) pkgconfig(xdmcp)
|
||||||
|
Requires: pkgconfig(x11) pkgconfig(xext)
|
||||||
|
Requires: pkgconfig(xp) pkgconfig(xpm)
|
||||||
|
Requires: pkgconfig(xrender) pkgconfig(ice)
|
||||||
|
Requires: pkgconfig(sm) pkgconfig(xt)
|
||||||
|
Requires: pkgconfig(xmu) pkgconfig(xfixes)
|
||||||
|
Requires: pkgconfig(xkbfile) pkgconfig(fontenc)
|
||||||
|
Requires: pkgconfig(xv) pkgconfig(xprintutil)
|
||||||
|
Requires: pkgconfig(freetype2) pkgconfig(fontconfig)
|
||||||
|
Requires: pkgconfig(libdrm) xorg-x11-server
|
||||||
|
|
||||||
%description sdk
|
%description sdk
|
||||||
This package contains the X.Org Server SDK.
|
This package contains the X.Org Server SDK.
|
||||||
@ -144,7 +186,6 @@ This package contains the X.Org Server SDK.
|
|||||||
%if %vnc
|
%if %vnc
|
||||||
|
|
||||||
%package -n xorg-x11-Xvnc
|
%package -n xorg-x11-Xvnc
|
||||||
License: GPL-2.0+ ; MIT
|
|
||||||
Summary: VNC Server for the X Window System
|
Summary: VNC Server for the X Window System
|
||||||
Group: System/X11/Servers/XF86_4
|
Group: System/X11/Servers/XF86_4
|
||||||
Requires: xorg-x11-fonts-core xorg-x11 xkeyboard-config
|
Requires: xorg-x11-fonts-core xorg-x11 xkeyboard-config
|
||||||
@ -154,7 +195,6 @@ Obsoletes: XFree86-Xvnc
|
|||||||
Provides: vnc-x86
|
Provides: vnc-x86
|
||||||
Obsoletes: vnc-x86
|
Obsoletes: vnc-x86
|
||||||
%endif
|
%endif
|
||||||
AutoReqProv: on
|
|
||||||
|
|
||||||
%description -n xorg-x11-Xvnc
|
%description -n xorg-x11-Xvnc
|
||||||
An X Window System server for Virtual Network Computing (VNC).
|
An X Window System server for Virtual Network Computing (VNC).
|
||||||
@ -222,7 +262,7 @@ popd
|
|||||||
pushd xorg-docs-*
|
pushd xorg-docs-*
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
%{__make} %{?jobs:-j%jobs}
|
make %{?_smp_mflags}
|
||||||
popd
|
popd
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
|
%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
|
||||||
@ -267,8 +307,8 @@ autoreconf -fi
|
|||||||
/usr/share/fonts/cyrillic:unscaled,\
|
/usr/share/fonts/cyrillic:unscaled,\
|
||||||
/usr/share/fonts/misc/sgi:unscaled,\
|
/usr/share/fonts/misc/sgi:unscaled,\
|
||||||
/usr/share/fonts/truetype/,built-ins"
|
/usr/share/fonts/truetype/,built-ins"
|
||||||
make %{?jobs:-j %jobs}
|
make %{?_smp_mflags}
|
||||||
make -C hw/kdrive %{?jobs:-j %jobs}
|
make -C hw/kdrive %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make -C xorg-docs-* install DESTDIR=$RPM_BUILD_ROOT
|
make -C xorg-docs-* install DESTDIR=$RPM_BUILD_ROOT
|
||||||
@ -330,8 +370,6 @@ install -m 644 %_sourcedir/sysconfig.displaymanager.template \
|
|||||||
%endif
|
%endif
|
||||||
install -m 755 $RPM_SOURCE_DIR/xorg-backtrace $RPM_BUILD_ROOT/usr/bin/xorg-backtrace
|
install -m 755 $RPM_SOURCE_DIR/xorg-backtrace $RPM_BUILD_ROOT/usr/bin/xorg-backtrace
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf "$RPM_BUILD_ROOT"
|
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
%verifyscript
|
%verifyscript
|
||||||
%verify_permissions -e /usr/bin/Xorg
|
%verify_permissions -e /usr/bin/Xorg
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user