From d0c49cf9a2d19e0a989b8daadb547d4dcbe5f75678c2a1512c1b0fb0953bd67a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 9 Feb 2012 20:45:28 +0000 Subject: [PATCH 1/2] - fixed buildreqs due to splitted xorg-x11-libs OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=375 --- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index fd587d7..e69d85d 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 9 20:27:04 UTC 2012 - sndirsch@suse.com + +- fixed buildreqs due to splitted xorg-x11-libs + ------------------------------------------------------------------- Fri Jan 13 14:40:00 UTC 2012 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index e50e2bb..bcb4223 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,7 +21,12 @@ 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-devel 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 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: pkgconfig(dmx) >= 1.0.99.1 +BuildRequires: pkgconfig(xtst) >= 1.0.99.2 +BuildRequires: pkgconfig(xres) ### udev support (broken on openSUSE 11.2, see also bnc #589997) %if %suse_version > 1120 BuildRequires: libudev-devel @@ -124,7 +129,7 @@ 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 xorg-x11-devel freetype2-devel fontconfig-devel libdrm-devel xorg-x11-server +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 %description sdk From 55e522a095851f51aa013e7084cd4afdb675f8c03f4247bfd9aca3e246590e53 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 9 Feb 2012 21:17:07 +0000 Subject: [PATCH 2/2] More build fixes. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=376 --- xorg-x11-server.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index bcb4223..d3b710b 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -27,6 +27,9 @@ BuildRequires: pkgconfig(xaw7) 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(pciaccess) >= 0.8.0 +BuildRequires: pkgconfig(xi) ### udev support (broken on openSUSE 11.2, see also bnc #589997) %if %suse_version > 1120 BuildRequires: libudev-devel