xorg-x11-server:

- add patch to import xorg.conf.d changes from upstream
  - /etc/xorg.conf.d -> /etc/X11/xorg.conf.d and /usr/share/X11/xorg.conf.d

xorg-x11-drv-{synaptics,fpit}:
- move xorg.conf snippet to /usr/share/X11/xorg.conf.d

system-setup-keyboard:
- new upstream release
- move xorg.conf snippet to /etc/X11/xorg.conf.d




git-svn-id: http://trac.vinelinux.org/repos/projects/specs@843 ec354946-7b23-47d6-9f5a-488ba84defc7

s/system-setup-keyboard/system-setup-keyboard-vl.spec

@@ -1,7 +1,7 @@
 Name:		system-setup-keyboard
-Version:	0.8.2
-Release:        2%{?_dist_release}
-Summary:	xorg.conf keyboard layout callout
+Version:	0.8.5
+Release:        1%{?_dist_release}
+Summary:	xorg.conf keyboard layout daemon
 
 Group:		Applications/System
 License:	MIT
@@ -13,13 +13,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	glib2-devel
 BuildRequires:	system-config-keyboard >= 1.3.1
 
-Requires:	xorg-x11-server-Xorg
+Requires:	xorg-x11-server-Xorg >= 1.8.0-2
 #Requires:	upstart
 Conflicts:	xorg-x11-server-Xorg < 1.6.0
 
 %description
-%{name} gets invoked by hal to apply the keyboard layout
-defined in /etc/sysconfig/keyboard.
+system-setup-keyboard is a daemon that monitors /etc/sysconfig/keyboard
+and writes out an xorg.conf.d snippet based on this file's contents.
+Whenever the file is updated, system-setup-keyboard writes out the
+matching XKB configuration for the selected layout. This configuration
+applies to all keyboards but may be overwritten by other xorg.conf.d
+snippets or entries in the xorg.conf configuration file.
 
 %prep
 %setup -q
@@ -55,10 +59,15 @@ fi
 %{_bindir}/%{name}
 %{_sysconfdir}/init/%{name}.conf
 %{_sysconfdir}/rc.d/init.d/%{name}
-
+%{_mandir}/man1/system-setup-keyboard.1*
 
 
 %changelog
+* Sat Apr 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 	0.8.5-1
+- new upstream release
+- use /etc/X11/xorg.conf.d for snippet directory.
+- require xorg-x11-server-Xorg >= 1.8.0-2
+
 * Tue Mar 16 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 	0.8.2-2
 - add initscripts
 

x/xorg-x11-drv-fpit/xorg-x11-drv-fpit-vl.spec

@@ -6,14 +6,14 @@ Summary:   Xorg X11 fpit input driver
 Summary(ja):   Xorg X11 fpit 入力ドライバ
 Name:      xorg-x11-drv-fpit
 Version:   1.3.0
-Release:   3%{?_dist_release}
+Release:   4%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   10-fpit.conf
+Source1:   50-fpit.conf
 
 Patch1:    fpit-1.3.0-abi.patch
 
@@ -43,8 +43,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{driverdir}/fpit_drv.so
 %{_mandir}/man4/fpit.4*
-%{_sysconfdir}/xorg.conf.d/10-fpit.conf
+%{_datadir}/X11/xorg.conf.d/50-fpit.conf
 
 %changelog
 * Sun Mar 28 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.0-3

x/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics-vl.spec

@@ -6,14 +6,14 @@ Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
 Summary(ja):    Xorg X11 synaptics 入力ドライバ
 Version:        1.2.2
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
 
 Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-Source1:	10-synaptics.conf
+Source1:	50-synaptics.conf
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch:    s390 s390x
@@ -98,11 +98,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 # install xorg.conf snippet
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d/
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d/
-
-#install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
-#install -m644 fdi/11-x11-synaptics.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
+install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/
 
 
 %clean
@@ -111,8 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-#%{_datadir}/hal/fdi/policy/10osvendor/*
-%{_sysconfdir}/xorg.conf.d/*.conf
+%{_datadir}/X11/xorg.conf.d/*.conf
 %{driverdir}/synaptics_drv.so
 %{_bindir}/synclient
 %{_bindir}/syndaemon
@@ -124,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xorg-synaptics.pc
 
 %changelog
+* Sat Apr 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.2-2
+- move xorg.conf snippet to /usr/share/X11/xorg.conf.d
+
 * Mon Mar 29 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.2-1
 - update to 1.2.2
 - drop hal support

x/xorg-x11-server/xorg-x11-server-vl.spec

@@ -6,7 +6,7 @@ Summary:   X.Org X11 X server
 Summary(ja):   X.Org X11 X サーバ
 Name:      xorg-x11-server
 Version:   1.8.0
-Release:   1%{?_dist_release}
+Release:   2%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -17,7 +17,6 @@ Source0:  ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{gitdate}.tar.xz
 Source0:   ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 %endif
 
-Source3:   00-evdev.conf
 Source4:   10-quirks.conf
 
 Source10:  xserver.pamd
@@ -51,6 +50,7 @@ Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 Patch6049: xserver-1.7.1-multilib.patch
 Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
 
+Patch6057: xserver-1.8.0-xorg.conf.d-changes.patch
 
 ## Vine Patch
 # autodetect nvidia driver
@@ -307,6 +307,8 @@ Xserver source code needed to build VNC server (Xvnc)
 %patch6049 -p1 -b .multilib.patch
 %patch6051 -p1 -b .gamma-kdm-fix.patch
 
+%patch6057 -p1 -b .xorg.conf.d-changes
+
 # Vine patch
 %patch10010 -p1 -b .nvidia
 %patch10020 -p1 -b .fglrx
@@ -365,9 +367,10 @@ install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/x
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
 %endif
 
 # Make the source package
@@ -488,9 +491,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/fbdevhw.4*
 %{_mandir}/man4/exa.4*
 %{_mandir}/man5/xorg.conf.5*
-%dir %{_sysconfdir}/xorg.conf.d
-%{_sysconfdir}/xorg.conf.d/00-evdev.conf
-%{_sysconfdir}/xorg.conf.d/10-quirks.conf
+%dir %{_sysconfdir}/X11/xorg.conf.d
+%dir %{_datadir}/X11/xorg.conf.d
+%{_datadir}/X11/xorg.conf.d/*.conf
 %endif
 
 
@@ -549,6 +552,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.0-2
+- add Patch6057 to import xorg.conf.d changes from upstream.
+  - change /etc/xorg.conf.d to /etc/X11/xorg.conf.d
+  - system provided configs should go to /usr/share/X11/xorg.conf.d
+
 * Fri Apr 02 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.0-1
 - new upstream release