version 2.2.4

This commit is contained in:
Harald Hoyer 2007-05-31 10:32:51 +00:00
parent 030f83a268
commit f08976caff
2 changed files with 12 additions and 8 deletions

View File

@ -1,13 +1,13 @@
--- pciutils-2.2.4/lib/configure.multilib 2006-09-09 13:06:10.000000000 +0200 --- pciutils-2.2.5/lib/configure.multilib 2007-02-06 12:58:14.000000000 +0100
+++ pciutils-2.2.4/lib/configure 2007-04-02 11:49:55.000000000 +0200 +++ pciutils-2.2.5/lib/configure 2007-05-31 12:27:33.000000000 +0200
@@ -35,74 +35,62 @@ @@ -36,75 +36,62 @@
zlib=$5 zlib=$5
c=config.h c=config.h
+cm=config.h.mk +cm=config.h.mk
m=config.mk m=config.mk
-echo >$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`" -echo >$c "#define PCI_ARCH_`echo $cpu | tr '[a-z]' '[A-Z]'`"
-echo >>$c "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`" -echo >>$c "#define PCI_OS_`echo $sys | tr '[a-z]' '[A-Z]'`"
-rm -f $m -rm -f $m
+cat >$c <<EOF +cat >$c <<EOF
+#if defined(__x86_64__) +#if defined(__x86_64__)
@ -73,6 +73,7 @@
- exit 1 - exit 1
- ;; - ;;
- esac - esac
- echo >>$c '#define PCI_HAVE_STDINT_H'
- ;; - ;;
- freebsd) - freebsd)
- echo_n " fbsd-device" - echo_n " fbsd-device"
@ -124,7 +125,7 @@
echo " dump" echo " dump"
echo_n "Checking for zlib support... " echo_n "Checking for zlib support... "
@@ -124,6 +112,8 @@ @@ -126,6 +113,8 @@
echo >>$c '#define PCI_IDS "pci.ids"' echo >>$c '#define PCI_IDS "pci.ids"'
fi fi
echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\"" echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\""

View File

@ -1,6 +1,6 @@
Name: pciutils Name: pciutils
Version: 2.2.4 Version: 2.2.5
Release: 3%{?dist} Release: 1%{?dist}
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
Patch0: pciutils-strip.patch Patch0: pciutils-strip.patch
Patch1: pciutils-2.2.4-buf.patch Patch1: pciutils-2.2.4-buf.patch
@ -74,6 +74,9 @@ install lib/types.h $RPM_BUILD_ROOT%{_includedir}/pci
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu May 31 2007 Harald Hoyer <harald@redhat.com> - 2.2.5-1
- version 2.2.5
* Thu Apr 5 2007 Peter Jones <pjones@redhat.com> - 2.2.4-3 * Thu Apr 5 2007 Peter Jones <pjones@redhat.com> - 2.2.4-3
- buildreq zlib-devel, so we know configure will find it consistently. - buildreq zlib-devel, so we know configure will find it consistently.