From 7cda7e3956640522d4004740054dc0f82a17f8f0dc5a6e9e57de3b39e9c2c7e0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 9 Jan 2009 00:44:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pciutils?expand=0&rev=16 --- pciutils.changes | 5 +++++ pciutils.spec | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/pciutils.changes b/pciutils.changes index 5da0cef..7ff8d42 100644 --- a/pciutils.changes +++ b/pciutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 7 12:34:56 CET 2009 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + ------------------------------------------------------------------- Thu Sep 11 22:45:55 CEST 2008 - anicka@suse.cz diff --git a/pciutils.spec b/pciutils.spec index 909e05a..a0611ef 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,7 +1,7 @@ # # spec file for package pciutils (Version 3.0.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,14 @@ Name: pciutils BuildRequires: zlib-devel Version: 3.0.1 -Release: 1 +Release: 4 Requires: pciutils-ids AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: pciutils-64bit +%endif +# Group: Hardware/Other License: GPL v2 or later Summary: PCI-utilities for Kernel version 2.2 and newer @@ -54,6 +59,11 @@ Authors: License: GPL v2 or later Group: Development/Libraries/C and C++ Summary: Static Library and Include Files of the PCI-utilities +# bug437293 +%ifarch ppc64 +Obsoletes: pciutils-devel-64bit +%endif +# # As we only package a static library we need zlib-devel for final linking Requires: zlib-devel %{name} = %{version} @@ -106,7 +116,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libpci.pc %changelog -* Fri Sep 12 2008 anicka@suse.cz +* Wed Jan 07 2009 olh@suse.de +- obsolete old -XXbit packages (bnc#437293) +* Thu Sep 11 2008 anicka@suse.cz - update to 3.0.1 * Added a Cygwin port. * Worked around compatibility problems with various default @@ -125,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT - added pciutils-3.0.0_pkgconfig.patch: clean up the pkgconfig file so we can include it - package the pkgconfig file -* Fri Apr 11 2008 mrueckert@suse.de +* Thu Apr 10 2008 mrueckert@suse.de - if we no longer provide the static lib we should at least provide the symlink to link against libpci * Thu Apr 10 2008 anicka@suse.cz @@ -182,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT * update-pciids.man: Mention the -q switch. * lib/dump.c: Squashed compiler warnings about code with no effect (there really were surplus *'s). -* Wed Nov 07 2007 anicka@suse.cz +* Tue Nov 06 2007 anicka@suse.cz - update to 2.2.9 * lspci.c: Added a new switch `-k' which requests printing of information on kernel drivers attached to each device @@ -305,9 +317,9 @@ rm -rf $RPM_BUILD_ROOT - added support for domains to device filter (lspci -s, setpci -s) (fixes bug #33382, patch sysfs-filter) - updated pci.ids -* Sun Nov 30 2003 olh@suse.de +* Sat Nov 29 2003 olh@suse.de - use default owner for pciutils-devel files -* Thu Nov 06 2003 olh@suse.de +* Wed Nov 05 2003 olh@suse.de - remove pcimodules again, it doesnt do anything right * Tue Oct 28 2003 olh@suse.de - add patch for 2.6 /proc/bus/pci layout @@ -365,7 +377,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Sep 10 2001 grimmer@suse.de - corrected some Intel NIC entries upon request from Intel - merged pci.ids.riva.diff and the Intel changes in pci.ids.add.diff -* Tue Sep 04 2001 garloff@suse.de +* Mon Sep 03 2001 garloff@suse.de - Riva TnT corrections from snbarth: * The name of Riva TnT 128 is Riva TnT. * NVidia/SGS Joint Venture (12d2) never built TNT or later. @@ -376,12 +388,12 @@ rm -rf $RPM_BUILD_ROOT including the current pciutils CVS tree. - beautyfied the spec file a bit (added clean section and defattr in file list) -* Tue May 22 2001 poeml@suse.de +* Mon May 21 2001 poeml@suse.de - add -devel subpackage * Thu May 10 2001 garloff@suse.de - Merge pci.ids from 2.4.4ac6 - bzip2 tarball -* Fri May 04 2001 garloff@suse.de +* Thu May 03 2001 garloff@suse.de - Also don't die on failing to read data of a normal device, just complain loudly (and return 2 in the end) - Updated pci.ids from linux-2.4.4 and added DFE-660. @@ -395,7 +407,7 @@ rm -rf $RPM_BUILD_ROOT - Add `-Wno-format' to avoid spurious compile errors. * Fri Aug 18 2000 ro@suse.de - cleanup srcdir -* Mon Jun 12 2000 olh@suse.de +* Sun Jun 11 2000 olh@suse.de - update to 2.1.8 * Mon Jan 24 2000 aj@suse.de - update to 2.1.4, fix build problems with latest glibc, use patch