X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=X11.spec;h=6c97e58a455ec7a80beda0d28380b163c7db6ef7;hb=1bb18d10de5bc67aacf929d5d58adcdad351af46;hp=4ba79f1c3fe6108ede2d3c77fdc690ecd18c06b5;hpb=bff4dc425e90ccbd15f707c54b9c6cd6cc53e093;p=packages%2FX11.git diff --git a/X11.spec b/X11.spec index 4ba79f1..6c97e58 100644 --- a/X11.spec +++ b/X11.spec @@ -7,7 +7,6 @@ # - -Xprint seem to be Xprt configuration files - if they aren't used by # some (possibly remote) X client, merge them into -Xprt # - where to take dtpdmd from? -# - http://security.gentoo.org/glsa/glsa-200509-07.xml # # Conditional build: %bcond_without glide # don't build glide driver @@ -28,7 +27,7 @@ Summary(uk): Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò Name: X11 Version: 6.9.0 -Release: 7 +Release: 9 Epoch: 1 License: MIT/X Consortium/BSD (see README) Group: X11 @@ -113,6 +112,7 @@ Patch30: %{name}-acpi_event_loop_fix.patch Patch31: %{name}-i810fb.patch # https://bugs.freedesktop.org/show_bug.cgi?id=4320 Patch32: %{name}-compositefastpath.patch +Patch33: ftp://ftp.x.org/pub/X11R6.9.0/patches/x11r6.9.0-mitri.diff Patch50: %{name}-glibc-locale_sync.patch Patch60: %{name}-oldkeyb.patch Patch61: %{name}-sparc64-asmfix.patch @@ -1961,6 +1961,7 @@ X11-libs. %setup -qc -a1 -a2 -a7 cd xc %patch0 -p0 +%patch33 -p0 cd .. %patch1 -p1 %{?with_glide:%patch2 -p0} @@ -1997,8 +1998,7 @@ rm -f xc/config/cf/host.def %patch30 -p0 %patch31 -p0 %patch32 -p0 -# ankry, FIXME :) -# %patch50 -p1 +%patch50 -p1 %patch60 -p0 # FIXME # %patch61 -p1