[biosdevname: 6/6] merge changes from F16, update and cleanup spec

[Peter Robinson]

commit a3aa4b0ffca1cdad369812fe3a6d59a7d1440c68
Merge: 4394864 acb5472
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Apr 3 11:44:31 2012 +0100

    merge changes from F16, update and cleanup spec

 .gitignore       |   10 +---------
 biosdevname.spec |   29 +++++++++++++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)
---
diff --cc .gitignore
index b0be937,b0be937..89aa6df
--- a/.gitignore
+++ b/.gitignore
@@@ -1,9 -1,9 +1,1 @@@
--/biosdevname-0.3.1.tar.gz
--/biosdevname-0.3.2.tar.gz
--/biosdevname-0.3.3.tar.gz
--/biosdevname-0.3.4.tar.gz
--/biosdevname-0.3.5.tar.gz
--/biosdevname-0.3.6.tar.gz
--/biosdevname-0.3.7.tar.gz
--/biosdevname-0.3.8.tar.gz
--/biosdevname-0.3.11.tar.gz
++/biosdevname-*.tar.gz
diff --cc biosdevname.spec
index 9cca299,a9a60f7..6c50d85
--- a/biosdevname.spec
+++ b/biosdevname.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:		biosdevname
  Version:	0.3.11
- Release:	2%{?dist}
 -Release:	5%{?dist}
++Release:	6%{?dist}
  Summary:	Udev helper for naming devices per BIOS names
  
  Group:		System Environment/Base
@@@ -11,7 -11,7 +11,7 @@@ URL:		http://linux.dell.com/files/%{nam
  # so, there haven't been any comments about that on LKML.
  ExclusiveArch:	%{ix86} x86_64 ia64
  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
  BuildRequires:	udev
@@@ -43,12 -41,12 +41,8 @@@ make %{?_smp_mflags
  
  
  %install
--rm -rf %{buildroot}
  make install install-data DESTDIR=%{buildroot}
  
--%clean
--rm -rf %{buildroot}
--
  %files
  %defattr(-,root,root,-)
  %doc COPYING README
@@@ -59,12 -57,19 +53,23 @@@
  
  
  %changelog
- * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.11-2
++* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.11-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
+ * Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.3.11-5
+ - Added automake as a build dependency
+ 
+ * Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.3.11-4
+ - Added autoconf as a build dependency
+ 
+ * Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.3.11-3
+ - Generating the configure script if it doesn't exist
+ 
+ * Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.3.11-2
+ - Fixed the dir structure inside the archive
  
  * Tue Oct  4 2011 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.3.11-1
 +- Updating the sources to 0.3.11 version. Following are the changes:
  - Fix man page for PCI slot naming
  - Fix clearing of buffer for NPAR/SRIOV naming
  - Add --nopirq and --smbios options to manpage.
@@@ -79,6 -84,7 +84,10 @@@
  - Don't display _vf suffix on NPAR devices with single function
  - Fix PCIe/PIRQ slot mapping
  
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> f16
  * Thu Apr 21 2011 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.3.8-1
  - Add changes to parse VPD structure for device mapping on NPAR devices
  - Fix pathname