- rel 2; xorg.conf.d instead of conf.d

Changed files:
    xorg-xserver-server.spec -> 1.227

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index c277ac9f21d19f18c84e63fa1a954be86d2e88c0..8c8e717e4a7b1293e3a981ba8f87f3b52d1925a3 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -15,7 +15,7 @@
 %define        xorg_xserver_server_videodrv_abi        7.0
 %define        xorg_xserver_server_xinput_abi          9.0
 
-%define                rel             2
+%define                rel             3
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
@@ -401,7 +401,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
-install -d $RPM_BUILD_ROOT/etc/{security/console.apps,X11/conf.d}
+install -d $RPM_BUILD_ROOT/etc/{security/console.apps,X11/xorg.conf.d}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input}
 :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
 :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
@@ -409,7 +409,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input}
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
 
 %if %{with udev}
-mv $RPM_BUILD_ROOT%{_prefix}/etc/X11/xorg.conf.d/10-evdev.conf $RPM_BUILD_ROOT/etc/X11/conf.d
+mv $RPM_BUILD_ROOT%{_prefix}/etc/X11/xorg.conf.d/10-evdev.conf $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
 %endif
 
 %if %{with multigl}
@@ -468,9 +468,9 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
 %config(missingok) /etc/security/console.apps/xserver
 %{?with_dbus:/etc/dbus-1/system.d/xorg-server.conf}
-%dir /etc/X11/conf.d
+%dir /etc/X11/xorg.conf.d
 %if %{with udev}
-%config(noreplace) %verify(not md5 mtime size) /etc/X11/conf.d/10-evdev.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/xorg.conf.d/10-evdev.conf
 %endif
 %{_mandir}/man1/Xorg.1x*
 %{_mandir}/man1/Xserver.1x*