packages: xorg-xserver-server/xorg-xserver-server.spec - rel 2; xorg.conf.d...

[arekm]

Author: arekm                        Date: Sat Apr  3 07:51:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; xorg.conf.d instead of conf.d

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.226 -> 1.227) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.226 packages/xorg-xserver-server/xorg-xserver-server.spec:1.227
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.226	Fri Apr  2 15:08:31 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Sat Apr  3 09:51:02 2010
@@ -16,7 +16,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
@@ -402,7 +402,7 @@
 	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
@@ -410,7 +410,7 @@
 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}
@@ -469,9 +469,9 @@
 %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*
@@ -547,6 +547,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.227  2010/04/03 07:51:02  arekm
+- rel 2; xorg.conf.d instead of conf.d
+
 Revision 1.226  2010/04/02 13:08:31  sls
 - BR: xorg-font-font-util >= 1.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.226&r2=1.227&f=u