|
@@ -6,7 +6,7 @@ Summary: X.Org X11 X server
|
|
|
Summary(ja): X.Org X11 X サーバ
|
|
|
Name: xorg-x11-server
|
|
|
Version: 1.17.4
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
URL: http://www.x.org
|
|
|
License: MIT/X11
|
|
|
Group: User Interface/X
|
|
@@ -25,19 +25,11 @@ Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
|
|
|
|
|
|
Patch5: xserver-1.8.1-pic-libxf86config.patch
|
|
|
|
|
|
-Patch2014: xserver-1.12.1-projector-fb-size.patch
|
|
|
-
|
|
|
# Trivial things to never merge upstream ever:
|
|
|
# This really could be done prettier.
|
|
|
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
|
|
|
-
|
|
|
-# needs to upstream this
|
|
|
-Patch6028: xserver-1.12.1-randr-error-debugging.patch
|
|
|
Patch6030: xserver-1.16.2-right-of.patch
|
|
|
-Patch6033: xserver-1.6.99-default-modes.patch
|
|
|
|
|
|
## Vine Patch
|
|
|
# autodetect nvidia driver
|
|
@@ -293,14 +285,8 @@ Xserver source code needed to build VNC server (Xvnc)
|
|
|
|
|
|
%patch5 -p1 -b .pic-libxf86config
|
|
|
|
|
|
-%patch2014 -p1 -b .projector-fb-size
|
|
|
-
|
|
|
%patch5002 -p1 -b .ssh-isnt-local
|
|
|
|
|
|
-%patch6002 -p1 -b .mode-debug
|
|
|
-
|
|
|
-# needs to upstream this
|
|
|
-%patch6028 -p1 -b .randr-error-debugging
|
|
|
%patch6030 -p1 -b .right-of
|
|
|
|
|
|
# Vine patch
|
|
@@ -544,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Nov 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.17.4-2
|
|
|
+- remove Patch 2014,6002,6028,6033
|
|
|
+
|
|
|
* Tue Nov 03 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.17.4-1
|
|
|
- update to 1.17.4
|
|
|
|