|
@@ -5,8 +5,8 @@
|
|
|
Summary: X.Org X11 X server
|
|
|
Summary(ja): X.Org X11 X サーバ
|
|
|
Name: xorg-x11-server
|
|
|
-Version: 1.14.7
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 1.15.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
URL: http://www.x.org
|
|
|
License: MIT/X11
|
|
|
Group: User Interface/X
|
|
@@ -34,9 +34,6 @@ Patch5002: xserver-1.12.1-ssh-isnt-local.patch
|
|
|
# force mode debugging on for randr 1.2 drivers
|
|
|
Patch6002: xserver-1.12.1-mode-debug.patch
|
|
|
|
|
|
-# don't build the (broken) acpi code
|
|
|
-Patch6011: xserver-1.12.0-less-acpi-brokenness.patch
|
|
|
-
|
|
|
# needs to upstream this
|
|
|
Patch6028: xserver-1.12.1-randr-error-debugging.patch
|
|
|
Patch6030: xserver-1.12.4-right-of.patch
|
|
@@ -89,6 +86,10 @@ BuildRequires: xorg-x11-font-utils
|
|
|
BuildRequires: libXfont-devel
|
|
|
BuildRequires: libXau-devel
|
|
|
BuildRequires: libxkbfile-devel
|
|
|
+BuildRequires: xcb-util-devel
|
|
|
+BuildRequires: xcb-util-keysyms-devel
|
|
|
+BuildRequires: xcb-util-image-devel
|
|
|
+BuildRequires: xcb-util-wm-devel
|
|
|
# libXres-devel needed for something that links to libXres that I never
|
|
|
# bothered to figure out yet
|
|
|
BuildRequires: libXres-devel
|
|
@@ -288,9 +289,6 @@ Xserver source code needed to build VNC server (Xvnc)
|
|
|
|
|
|
%patch6002 -p1 -b .mode-debug
|
|
|
|
|
|
-# don't build the (broken) acpi code
|
|
|
-%patch6011 -p1 -b .less-acpi-brokenness
|
|
|
-
|
|
|
# needs to upstream this
|
|
|
%patch6028 -p1 -b .randr-error-debugging
|
|
|
%patch6030 -p1 -b .right-of
|
|
@@ -330,6 +328,7 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
|
|
|
--with-builderstring="Build ID: %{name} %{version}-%{release}" \
|
|
|
--with-xkb-output=%{_localstatedir}/lib/xkb \
|
|
|
--enable-install-libxf86config \
|
|
|
+ --disable-linux-acpi --disable-linux-apm \
|
|
|
--disable-xselinux --enable-record \
|
|
|
--enable-config-udev \
|
|
|
%{dri_flags} \
|
|
@@ -535,6 +534,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jul 09 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.15.2-1
|
|
|
+- update to 1.15.2
|
|
|
+- remove Patch6011 (xserver-1.12.0-less-acpi-brokenness.patch)
|
|
|
+- add BuildRequires: xcb-util-devel, xcb-util-keysyms-devel, xcb-util-image-devel, xcb-util-wm-devel
|
|
|
+
|
|
|
* Tue Jun 17 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.14.7-2
|
|
|
- change BuildRequires: eudev-libgudev1-devel instead of libgudev1-devel
|
|
|
|