pnp.ids source changes to csv

Signed-off-by: Vitezslav Crhonek <vcrhonek@redhat.com>

Makefile

@@ -105,7 +105,7 @@ srpm-x: create-archive
 	@echo SRPM is: $(NAME)-$(VERSION)-$(RELEASE).src.rpm
 
 clean:
-	@rm -f $(TAGNAME)*.gz $(NAME)-*.src.rpm pnp.ids.xlsx \
+	@rm -f $(TAGNAME)*.gz $(NAME)-*.src.rpm pnp.ids.csv \
 	    *.downloaded *.utf8 *.orig hwdata.pc ChangeLog clog
 
 clog: hwdata.spec
@@ -125,7 +125,7 @@ oui.txt.downloaded:
 iab.txt.downloaded:
 	@curl -o $@ -O https://standards-oui.ieee.org/iab/iab.txt
 
-pnp.ids.xlsx:
+pnp.ids.csv:
 	@curl -o $@ \
 	    https://uefi.org/uefi-pnp-export
 
@@ -141,15 +141,8 @@ oui.txt: oui.txt.utf8
 iab.txt: iab.txt.utf8
 	dos2unix -n $? $@
 
-pnp.ids.orig: pnp.ids.xlsx
-	grep "class" $? | \
-	    tr ' ' ' ' | \
-	    sed -n \
-	        -e 's/\s\{2,\}/ /g' \
-	        -e 's/\&/\&/g' \
-	        -e "s/\'/'/g" \
-	        -e 's:^.*<tr class=".*"><td>\(.*\)</td><td>\([a-zA-Z@]\{3\}\).*</td><td>.*$$:\2\t\1:p' | \
-	    sed 's/\s*$$//' | sort -u >$@
+pnp.ids.orig: pnp.ids.csv
+	tail -n +2 $? | csvtool format '%(2)\t%(1)\n' - | sort -u >$@
 
 pnp.ids: pnp.ids.orig pnp.ids.patch
 	patch -p1 -o $@ pnp.ids.orig pnp.ids.patch