rpms/xorg-x11-drv-synaptics/F-10 10-synaptics.fdi, 1.4, 1.5 xorg-x11-drv-synaptics.spec, 1.11, 1.12

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29019

Modified Files:
	10-synaptics.fdi xorg-x11-drv-synaptics.spec 
Log Message:
* Mon Feb 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.15.2-4
- Revert last commit, this is against Fedora policy.
  https://fedoraproject.org/wiki/Packaging:Guidelines#Configuration_files
- Stick a warning into the fdi to notify the user that this file will be
  overwritten.




Index: 10-synaptics.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-10/10-synaptics.fdi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 10-synaptics.fdi	4 Jan 2009 23:51:10 -0000	1.4
+++ 10-synaptics.fdi	9 Feb 2009 08:06:31 -0000	1.5
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- DO NOT EDIT THIS FILE IN PLACE.
+     This file will be overwritten with the next update. If you need to add
+     custom options, copy the file into /etc/hal/fdi/policy/ first. 
+     
+     See https://fedoraproject.org/wiki/Input_device_configuration -->
+
 <deviceinfo version="0.2">
   <device>
     <match key="info.capabilities" contains="input.touchpad">


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-10/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-synaptics.spec	8 Feb 2009 23:19:34 -0000	1.11
+++ xorg-x11-drv-synaptics.spec	9 Feb 2009 08:06:31 -0000	1.12
@@ -5,7 +5,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -92,7 +92,7 @@
 
 %files
 %defattr(-,root,root,-)
-%config(noreplace) %{_datadir}/hal/fdi/policy/20thirdparty/10-synaptics.fdi
+%{_datadir}/hal/fdi/policy/20thirdparty/10-synaptics.fdi
 %{driverdir}/synaptics_drv.so
 %{_bindir}/synclient
 %{_bindir}/syndaemon
@@ -102,6 +102,12 @@
 %doc COPYING README
 
 %changelog
+* Mon Feb 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.15.2-4
+- Revert last commit, this is against Fedora policy.
+  https://fedoraproject.org/wiki/Packaging:Guidelines#Configuration_files
+- Stick a warning into the fdi to notify the user that this file will be
+  overwritten.
+
 * Mon Feb 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.15.2-3
 - Don't overwrite the fdi file on update.