- up to 1.19.1

diff --git a/dtrace-link.patch b/dtrace-link.patch
deleted file mode 100644 (file)
index a65f91c..0000000
--- a/dtrace-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xorg-server-1.16.3/os/Makefile.am~ 2015-01-04 14:05:54.000000000 +0000
-+++ xorg-server-1.16.3/os/Makefile.am  2015-01-04 14:23:50.646159253 +0000
-@@ -52,12 +52,12 @@
- 
- if SPECIAL_DTRACE_OBJECTS
- # Generate dtrace object code for probes in libos & libdix
--dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
-+dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) $(LIBOBJS)
-       $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
- 
- noinst_PROGRAMS = os.O
- 
- os_O_SOURCES =
--os.O: dtrace.o $(am_libos_la_OBJECTS)
-+os.O: dtrace.o $(am_libos_la_OBJECTS) $(LIBOBJS)
-       $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
- endif

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index eabf05399af0096aa51b4a975ee380030a34b2ee..7b12e3bc31c04e3f58dee45f161407cdc7fe80c4 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -34,19 +34,18 @@
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.19.0
-Release:       2
+Version:       1.19.1
+Release:       1
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 6a4d01e4e5047ab8f556960424ba1fa9
+# Source0-md5: caa8ee7b2950abbf734347d137529fb6
 Source1:       10-quirks.conf
 Source2:       xserver.pamd
 Source10:      %{name}-Xvfb.init
 Source11:      %{name}-Xvfb.sysconfig
 Source12:      xvfb-run.sh
 Patch1:                %{name}-xwrapper-pam.patch
-Patch2:                dtrace-link.patch
 
 Patch4:                %{name}-builtin-SHA1.patch
 
@@ -430,7 +429,6 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %prep
 %setup -q -n xorg-server-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %patch4 -p1