Merge upstream version 0.3.4.

(cherry picked from commit 21eb1c8d6fefa5dcd3a9a800b4add06d5c30c01f)

1 files changed, 50 insertions, 9 deletions

diff --git a/biosdevname.spec.fedora.in b/biosdevname.spec.fedora.in
index 9a40dcc..7c77405 100644
--- a/biosdevname.spec.fedora.in
+++ b/biosdevname.spec.fedora.in
@@ -6,12 +6,11 @@ Summary:	Udev helper for naming devices per BIOS names
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://linux.dell.com/files/%{name}
-# SMBIOS and PCI IRQ Routing Tables only exist on these arches.  It's
-# also likely that other arches don't expect the PCI bus to be sorted
-# breadth-first, or of so, there haven't been any comments about that
-# on LKML.
+# SMBIOS only exists on these arches.  It's also likely that other
+# arches don't expect the PCI bus to be sorted breadth-first, or of
+# so, there haven't been any comments about that on LKML.
 ExclusiveArch:	%{ix86} x86_64 ia64
-Source0:	http://linux.dell.com/files/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://linux.dell.com/files/%{name}/permalink/%{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	pciutils-devel, zlib-devel
 # to figure out how to name the rules file
@@ -19,7 +18,6 @@ BuildRequires:	udev
 # for ownership of /etc/udev/rules.d
 Requires: udev
 
-
 %description
 biosdevname in its simplest form takes a kernel device name as an
 argument, and returns the BIOS-given name it "should" be.  This is necessary
@@ -38,7 +36,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install install-data DESTDIR=%{buildroot}
 rm %{buildroot}/sbin/%{name}S  || :
 
 %clean
@@ -48,11 +46,54 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 /sbin/%{name}
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*%{name}.rules
-%{_mandir}/1/%{name}.1
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules
+%{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Thu Dec 16 2010 Matt Domsch <mdomsch@fedoraproject.org> - 0.3.4-1
+- drop unnecessary explicit version requirement on udev
+- bugfix: start indices at 1 not 0, to match Dell and HP server port designations
+- bugfix: don't assign names to unknown devices
+- bugfix: don't assign duplicate names
+
+* Thu Dec  9 2010 Matt Domsch <Matt_Domsch@dell.com> - 0.3.3-1
+- add back in use of PCI IRQ Routing Table, if info is not provided by
+  sysfs or SMBIOS
+
+* Thu Dec  2 2010 Matt Domsch <Matt_Domsch@dell.com> - 0.3.2-1
+- fix for multi-port cards with bridges
+- removal of code for seriously obsolete systems
+
+* Mon Nov 28 2010 Matt Domsch <Matt_Domsch@dell.com> 0.3.1-1
+- remove all policies except 'physical' and 'all_ethN'
+- handle SR-IOV devices properly
+
+* Wed Nov 10 2010 Matt Domsch <Matt_Domsch@dell.com> 0.3.0-1
+- add --policy=loms, make it default
+- read index and labels from sysfs if available
+
+* Mon Jul 27 2009 Jordan Hargrave <Jordan_Hargrave@dell.com> 0.2.5-1
+- fix mmap error checking
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue May 06 2008 Matt Domsch <Matt_Domsch@dell.com> 0.2.4-5
+- use policy=all_names to find breakage
+
+* Sun Feb 10 2008 Matt Domsch <Matt_Domsch@dell.com> 0.2.4-4
+- rebuild for gcc43
+
+* Fri Sep 21 2007 Matt Domsch <Matt_Domsch@dell.com> 0.2.4-3
+- fix manpage entry in files
+ 
+* Fri Sep 21 2007 Matt Domsch <Matt_Domsch@dell.com> 0.2.4-2
+- rebuild with Requires: udev > 115-3.20070920git
+
 * Fri Sep 21 2007 Matt Domsch <Matt_Domsch@dell.com> 0.2.4-1
 - coordinate udev rules usage with udev maintainer
 - fix crashes in pcmcia search, in_ethernet(), and incorrect command