rpms/hwdata/devel .cvsignore, 1.48, 1.49 hwdata.spec, 1.48, 1.49 sources, 1.51, 1.52

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11801

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	8 Jul 2005 19:51:02 -0000	1.48
+++ .cvsignore	13 Jul 2005 15:05:35 -0000	1.49
@@ -1 +1 @@
-hwdata-0.160.tar.gz
+hwdata-0.162.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- hwdata.spec	8 Jul 2005 19:55:32 -0000	1.48
+++ hwdata.spec	13 Jul 2005 15:05:35 -0000	1.49
@@ -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 @@
 %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 at redhat.com> - 0.162-1
+- remove /etc/pcmcia/config, conflict with pcmcia-cs
+
 * Fri Jul  7 2005 Bill Nottingham <notting at redhat.com> - 0.160-1
 - move blacklist to /etc/modprobe.d, require new module-init-tools
 - add LG monitors (#162466, #161734)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	8 Jul 2005 19:55:32 -0000	1.51
+++ sources	13 Jul 2005 15:05:35 -0000	1.52
@@ -1 +1 @@
-a91b17cd7713fee61da053650d8b3e99  hwdata-0.160.tar.gz
+fb0ec0e0bcdf3faba4193d325bcc2a1a  hwdata-0.162.tar.gz