From 74db0e8e6135e2a49f9a16daa197a9e53d95c4b3 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 7 Dec 2010 16:34:18 +0000
Subject: [PATCH] Don't mark MIME types and convs files as config files.

---
 cups.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cups.spec b/cups.spec
index 4d09d03..450611c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -554,8 +554,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/cups/drv
 %{_datadir}/cups/examples
 %dir %{_datadir}/cups/mime
-%config(noreplace) %{_datadir}/cups/mime/mime.types
-%config(noreplace) %{_datadir}/cups/mime/mime.convs
+%{_datadir}/cups/mime/mime.types
+%{_datadir}/cups/mime/mime.convs
 %dir %{_datadir}/cups/ppdc
 %{_datadir}/cups/ppdc/*.defs
 %{_datadir}/cups/ppdc/*.h
@@ -585,6 +585,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Dec  7 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.5-5
+- Don't mark MIME types and convs files as config files.  Overrides
+  can be placed as new *.types/*.convs files in /etc/cups.
 - Don't mark banners as config files.  Better is to provide new
   banners.
 - Don't mark templates and www files as config files.  A better way to