- Install config snippet in $datadir/X11/xorg.conf.d

- rename to 50-wacom.conf to match upstream naming

xorg-x11-drv-wacom.spec

@@ -8,7 +8,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.5
-Release:    3%{?gitdate:.%{gitdate}}%{?dist}
+Release:    4%{?gitdate:.%{gitdate}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -19,7 +19,7 @@ Source0: %{tarball}-%{gitdate}.tar.bz2
 %else
 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
 %endif
-Source1: 10-wacom.conf
+Source1: 50-wacom.conf
 
 ExcludeArch: s390 s390x
 
@@ -27,7 +27,7 @@ BuildRequires: xorg-x11-server-sdk >= 1.7.0
 BuildRequires: xorg-x11-util-macros >= 1.3.0
 BuildRequires: libX11-devel libXi-devel
 
-Requires:  xorg-x11-server-Xorg >= 1.7.99
+Requires:  xorg-x11-server-Xorg >= 1.8.0-6
 Requires: libX11 libXi
 
 Provides:  linuxwacom = %{version}-%{release}
@@ -57,7 +57,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
-install -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/xorg.conf.d/
+install -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/X11/xorg.conf.d/
 rm ${RPM_BUILD_ROOT}%{_datadir}/hal/fdi/policy/20thirdparty/wacom.fdi
 
 %clean
@@ -72,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{driverdir}/wacom_drv.so
 %{_mandir}/man4/wacom.4*
-%{_sysconfdir}/xorg.conf.d/10-wacom.conf
+%{_datadir}/X11/xorg.conf.d/50-wacom.conf
 %{_bindir}/xsetwacom
 
 %package devel
@@ -92,6 +92,10 @@ X.Org X11 wacom input driver development files.
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Thu Apr 15 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.5-4.20100325
+- Install config snippet in $datadir/X11/xorg.conf.d
+- rename to 50-wacom.conf to match upstream naming
+
 * Thu Mar 25 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.5-3.20100325
 - Update to today's git snapshot.