update to 2.2.1, adjust patches

This commit is contained in:
Bill Nottingham 2005-12-13 22:27:24 +00:00
parent 4377d99612
commit d8a28aa2fe
4 changed files with 10 additions and 28 deletions

View File

@ -1 +1 @@
pciutils-2.1.99-test8.tar.gz
pciutils-2.2.1.tar.gz

View File

@ -1,14 +1,5 @@
--- pciutils-2.1.99-test3/Makefile.strip 2004-02-25 01:46:14.315787866 -0500
+++ pciutils-2.1.99-test3/Makefile 2004-02-25 01:47:45.478046260 -0500
@@ -1,7 +1,7 @@
# Makefile for The PCI Utilities
# (c) 1998--2003 Martin Mares <mj@ucw.cz>
-OPT=-O2 -fomit-frame-pointer
+OPT=-O2
CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
VERSION=2.1.99-test3
@@ -32,7 +32,7 @@
all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
@ -23,9 +14,9 @@
@@ -65,7 +65,7 @@
install: all
# -c is ignored on Linux, but required on FreeBSD
$(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8
$(DIRINSTALL) -m 755 $(SBINDIR) $(IDSDIR) $(MANDIR)/man8
- $(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
+ $(INSTALL) -c -m 755 lspci setpci $(SBINDIR)
$(INSTALL) -c -m 755 update-pciids $(SBINDIR)
$(INSTALL) -c -m 644 pci.ids $(SHAREDIR)
$(INSTALL) -c -m 644 pci.ids $(IDSDIR)
$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8

View File

@ -1,18 +1,12 @@
%define testversion test8
Name: pciutils
Version: 2.1.99.%{testversion}
Release: 10.1
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/alpha/%{name}-2.1.99-%{testversion}.tar.gz
Version: 2.2.1
Release: 1
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
Patch0: pciutils-strip.patch
Patch1: pciutils-pciids.patch
Patch2: pciutils-2.1.10-scan.patch
Patch3: pciutils-havepread.patch
Patch4: pciutils-typo.patch
Patch5: pciutils-devicetype.patch
Patch6: pciutils-domain.patch
Patch7: pciutils-2.1.99-gcc4.patch
Patch8: pciutils-x86_64.patch
License: GPL
URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
Buildroot: %{_tmppath}/%{name}-%{version}-root
@ -36,19 +30,16 @@ This package contains a library for inspecting and setting
devices connected to the PCI bus.
%prep
%setup -q -n pciutils-2.1.99-%{testversion}
%setup -q -n pciutils-%{version}
%patch0 -p1 -b .strip
%patch1 -p1 -b .pciids
%patch2 -p1 -b .scan
%patch3 -p1 -b .pread
%patch4 -p1 -b .typo
%patch5 -p1 -b .devicetype
%patch6 -p1 -b .domain
%patch7 -p1 -b .glibcmacros
%patch8 -p1 -b .x86_64
%build
make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr"
make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata"
%install
rm -rf $RPM_BUILD_ROOT

View File

@ -1 +1 @@
d7ee9453cb67c32bf99f74bcbdd5d132 pciutils-2.1.99-test8.tar.gz
c18e2a5f04e9abae5a42439de294f086 pciutils-2.2.1.tar.gz