diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 58bfdb3..5f9130b 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 15 12:09:12 UTC 2014 - sndirsch@suse.com + +- no longer add /usr/lib[64]/xorg/modules/updates to module path + (FATE#317822) + ------------------------------------------------------------------- Wed Aug 13 12:39:39 UTC 2014 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index dfb644a..df89f62 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -220,7 +220,9 @@ sh %{SOURCE92} --verify . %{SOURCE91} cp %{SOURCE90} . %patch0 -p1 +%if 0%{?suse_version} < 1315 %patch1 +%endif %patch2 -p1 %patch3 -p0 %patch4 -p0 @@ -323,8 +325,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d cp %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-evdev.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/ %endif %endif +%if 0%{?suse_version} < 1315 mkdir -p %{buildroot}%{_libdir}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions} install -m 644 $RPM_SOURCE_DIR/README.updates %{buildroot}%{_libdir}/xorg/modules/updates +%endif %else rm -f %{buildroot}%{_datadir}/aclocal/*.m4 %endif