From cf57d4ef7d20abdd3889e84446b78636d62b36d1 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 13 Jul 2005 15:05:35 +0000
Subject: [PATCH] update

---
 .cvsignore  | 2 +-
 hwdata.spec | 9 +++++----
 sources     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5bae6cd..54789a1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-hwdata-0.160.tar.gz
+hwdata-0.162.tar.gz
diff --git a/hwdata.spec b/hwdata.spec
index 09089ba..1390ef4 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,12 +1,12 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.160
+Version: 0.162
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
 Source: hwdata-%{version}.tar.gz
 BuildArch: noarch
-Conflicts: Xconfigurator < 4.9.42-1, kernel-pcmcia-cs < 3.1.31-11, kudzu < 1.1.86
+Conflicts: Xconfigurator < 4.9.42-1, pcmcia-cs, kudzu < 1.1.86
 Requires: module-init-tools >= 3.2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -29,14 +29,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc LICENSE COPYING
 %dir /usr/share/hwdata
-%dir /etc/pcmcia
 %config(noreplace) /etc/modprobe.d/blacklist
-%config /etc/pcmcia/config
 %config /usr/share/hwdata/*
 # This file is screaming to be moved into /usr/share/hwdata sometime <g>
 /usr/X11R6/lib/X11/Cards
 
 %changelog
+* Wed Jul 13 2005 Bill Nottingham <notting@redhat.com> - 0.162-1
+- remove /etc/pcmcia/config, conflict with pcmcia-cs
+
 * Fri Jul  7 2005 Bill Nottingham <notting@redhat.com> - 0.160-1
 - move blacklist to /etc/modprobe.d, require new module-init-tools
 - add LG monitors (#162466, #161734)
diff --git a/sources b/sources
index 44de916..0d7c0f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a91b17cd7713fee61da053650d8b3e99  hwdata-0.160.tar.gz
+fb0ec0e0bcdf3faba4193d325bcc2a1a  hwdata-0.162.tar.gz