From: Elan Ruusamäe <glen@delfi.ee>
Date: Thu, 28 Mar 2013 11:02:09 +0000 (+0200)
Subject: up to 0.247. pci.ids 2013-03-27, usb.ids 2013-03-25
X-Git-Tag: auto/th/hwdata-0.247-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a201aeca398c15744858024a9ae95d60ef589ac2;p=packages%2Fhwdata.git

up to 0.247. pci.ids 2013-03-27, usb.ids 2013-03-25
---

diff --git a/hwdata.spec b/hwdata.spec
index 1380f78..156e00e 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -14,12 +14,12 @@ Summary:	Hardware identification and configuration data
 Summary(pl.UTF-8):	Dane do identyfikacji i konfiguracji sprzętu
 Name:		hwdata
 # see hwdata.spec inside of tarball
-Version:	0.245
-Release:	2
+Version:	0.247
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
-# Source0-md5:	2b505f104a1d5bf4f1291599c671f866
+# Source0-md5:	6190f7eba0ed78661ea963271f736aeb
 Obsoletes:	ieee-oui
 Conflicts:	Xconfigurator < 4.9.42-1
 Conflicts:	ntop < 4.1.0-2
@@ -29,6 +29,7 @@ BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_datadir	/lib
+%define		modprobe_d	/usr/lib/modprobe.d
 
 %description
 hwdata contains various hardware identification and configuration
@@ -50,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
+%{__rm} $RPM_BUILD_ROOT%{modprobe_d}/dist-blacklist.conf
 
 %if 0
 gzip -n9 $RPM_BUILD_ROOT%{_datadir}/%{name}/pci.ids