Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2012-03-23 15:11:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2012-03-06 14:07:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2012-03-23 15:11:58.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 22 00:25:39 UTC 2012 - [email protected] + +- Parallel build with %_smp_mflags; strip redundant sections/tags +- Use pkgconfig symbols for BuildRequires/Requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.YygES3/_old 2012-03-23 15:11:59.000000000 +0100 +++ /var/tmp/diff_new_pack.YygES3/_new 2012-03-23 15:11:59.000000000 +0100 @@ -14,25 +14,61 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild - - Name: xorg-x11-server %define dirsuffix 1.10.4 %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: pkgconfig(xfont) -BuildRequires: pkgconfig(xaw7) +BuildRequires: Mesa-devel +BuildRequires: bison +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(xtst) >= 1.0.99.2 -BuildRequires: pkgconfig(xres) -BuildRequires: pkgconfig(pixman-1) >= 0.15.20 +BuildRequires: pkgconfig(fixesproto) >= 4.1 +BuildRequires: pkgconfig(fontconfig) +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(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) -%if %suse_version > 1120 -BuildRequires: libudev-devel +%if %suse_version >= 1130 +BuildRequires: pkgconfig(libudev) >= 143 %endif %if %vnc BuildRequires: libjpeg-devel @@ -40,10 +76,8 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.6_%{dirsuffix} -Release: 1 -License: GPL-2.0+ ; MIT +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: System/X11/Servers/XF86_4 %ifnarch s390 s390x PreReq: %fillup_prereq %endif @@ -56,6 +90,8 @@ Provides: xorg-x11-server-glx xorg-x11-Xvfb Obsoletes: xorg-x11-server-glx xorg-x11-Xvfb Summary: X.Org Server +License: GPL-2.0+ ; MIT +Group: System/X11/Servers/XF86_4 Source: xorg-server-%{dirsuffix}.tar.bz2 Source1: sysconfig.displaymanager.template Source3: README.updates @@ -113,14 +149,12 @@ %package extra -License: GPL-2.0+ ; MIT Summary: Additional Xservers (Xdmx, Xephyr, Xnest) Group: System/X11/Servers/XF86_4 Provides: xorg-x11-Xnest Obsoletes: xorg-x11-Xnest Requires: xorg-x11-fonts-core xorg-x11 Mesa Requires: xkeyboard-config -AutoReqProv: on %description extra This package contains additional Xservers (Xdmx, Xephyr, Xnest). @@ -128,13 +162,21 @@ %package sdk -License: GPL-2.0+ ; MIT Summary: X.Org Server SDK Group: System/Libraries Provides: 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 -AutoReqProv: on +Requires: xorg-x11-proto-devel pkgconfig(xtrans) +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 This package contains the X.Org Server SDK. @@ -144,7 +186,6 @@ %if %vnc %package -n xorg-x11-Xvnc -License: GPL-2.0+ ; MIT Summary: VNC Server for the X Window System Group: System/X11/Servers/XF86_4 Requires: xorg-x11-fonts-core xorg-x11 xkeyboard-config @@ -154,7 +195,6 @@ Provides: vnc-x86 Obsoletes: vnc-x86 %endif -AutoReqProv: on %description -n xorg-x11-Xvnc An X Window System server for Virtual Network Computing (VNC). @@ -222,7 +262,7 @@ pushd xorg-docs-* autoreconf -fi %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} popd autoreconf -fi %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -267,8 +307,8 @@ /usr/share/fonts/cyrillic:unscaled,\ /usr/share/fonts/misc/sgi:unscaled,\ /usr/share/fonts/truetype/,built-ins" -make %{?jobs:-j %jobs} -make -C hw/kdrive %{?jobs:-j %jobs} +make %{?_smp_mflags} +make -C hw/kdrive %{?_smp_mflags} %install make -C xorg-docs-* install DESTDIR=$RPM_BUILD_ROOT @@ -330,8 +370,6 @@ %endif install -m 755 $RPM_SOURCE_DIR/xorg-backtrace $RPM_BUILD_ROOT/usr/bin/xorg-backtrace -%clean -rm -rf "$RPM_BUILD_ROOT" %ifnarch s390 s390x %verifyscript %verify_permissions -e /usr/bin/Xorg -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
