rpms/xorg-x11-drv-fpit/devel 50-fpit.conf, NONE, 1.1 xorg-x11-drv-fpit.spec, 1.26, 1.27 10-fpit.conf, 1.2, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-fpit/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6680

Modified Files:
	xorg-x11-drv-fpit.spec 
Added Files:
	50-fpit.conf 
Removed Files:
	10-fpit.conf 
Log Message:
* Thu Apr 15 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-10
- Require xserver 1.8.0-6 (the one that switched to $datadir for config
  files) to avoid breaking configurations.



--- NEW FILE 50-fpit.conf ---
Section "InputClass"
        Identifier "fpit class"
        MatchProduct "FUJ02B2|FUJ02B3|FUJ02B4|FUJ02B6|FUJ02B7|FUJ02B8|FUJ02B9|FUJ02BC"
        Driver "fpit"
        Option "TrackRandR" "on"
EndSection

Section "InputClass"
        Identifier "fpit FUJ02B2 and FUJ02B3 default configuration"
        MatchProduct "FUJ02B2|FUJ02B3"
        Option "BaudRate" "19200"
        Option "MaximumXPosition" "6250"
        Option "MaximumYPosition" "4950"
        Option "MinimumXPosition" "130"
        Option "MinimumYPosition" "0"
        Option "InvertY" "on"
EndSection

Section "InputClass"
        Identifier "fpit FUJ02B6, FUJ02B7, FUJ02B8, FUJ02B9, FUJ02BC default configuration"
        MatchProduct "FUJ02B6|FUJ02B7|FUJ02B8|FUJ02B9|FUJ02BC"
        Option "BaudRate" "9600"
        Option "MaximumXPosition" "4070"
        Option "MaximumYPosition" "4020"
        Option "MinimumXPosition" "0"
        Option "MinimumYPosition" "0"
        Option "Passive" "on"
EndSection


Index: xorg-x11-drv-fpit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-fpit/devel/xorg-x11-drv-fpit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xorg-x11-drv-fpit.spec	17 Feb 2010 05:08:10 -0000	1.26
+++ xorg-x11-drv-fpit.spec	15 Apr 2010 06:57:35 -0000	1.27
@@ -5,21 +5,21 @@
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
 Version:   1.3.0
-Release:   8%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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
 
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
-Requires:  xorg-x11-server-Xorg >= 1.7.99.901-1
+Requires:  xorg-x11-server-Xorg >= 1.8.0-6
 
 %description 
 X.Org X11 fpit input driver.
@@ -41,8 +41,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
@@ -51,9 +51,17 @@ 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
+* Thu Apr 15 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-10
+- Require xserver 1.8.0-6 (the one that switched to $datadir for config
+  files) to avoid breaking configurations.
+
+* Thu Apr 15 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-9
+- Install config snippet in $datadir/X11/xorg.conf.d
+- Rename to 50-fpit.conf to match upstream naming.
+
 * Wed Feb 17 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-8
 - Add missing quotes to 10-fpit.conf. Yes, I should have tested this.
   I know.


--- 10-fpit.conf DELETED ---