diff --git a/.pciutils.metadata b/.pciutils.metadata index 2b1cfdc..8e0ad0b 100644 --- a/.pciutils.metadata +++ b/.pciutils.metadata @@ -1 +1 @@ -6d820bc0b7e14547c44f9df572bd08232f1ce133 SOURCES/pciutils-3.2.0.tar.gz +06a92123907d717efb703c3e90a0c46e1d0beef4 SOURCES/pciutils-3.2.1.tar.gz diff --git a/SOURCES/pciutils-dir-d.patch b/SOURCES/pciutils-dir-d.patch index 2fae8f1..664f7d4 100644 --- a/SOURCES/pciutils-dir-d.patch +++ b/SOURCES/pciutils-dir-d.patch @@ -1,6 +1,6 @@ -diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c ---- pciutils-3.0.0/lib/names-parse.c.dird 2008-04-10 21:15:47.000000000 +0200 -+++ pciutils-3.0.0/lib/names-parse.c 2008-09-01 15:17:23.000000000 +0200 +diff -up pciutils-3.2.1/lib/names-parse.c.dird pciutils-3.2.1/lib/names-parse.c +--- pciutils-3.2.1/lib/names-parse.c.dird 2012-12-06 17:05:14.000000000 +0100 ++++ pciutils-3.2.1/lib/names-parse.c 2014-01-03 18:12:22.856381553 +0100 @@ -6,10 +6,13 @@ * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -24,7 +24,7 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c { char line[MAX_LINE]; char *p; -@@ -207,7 +210,7 @@ static const char *id_parse_list(struct +@@ -207,7 +210,7 @@ static const char *id_parse_list(struct p++; if (!*p) return parse_error; @@ -100,10 +100,10 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c + closedir(pci_ids_dir); + return 1; +} -diff -up pciutils-3.0.0/lib/pci.h.dird pciutils-3.0.0/lib/pci.h ---- pciutils-3.0.0/lib/pci.h.dird 2008-04-10 21:23:05.000000000 +0200 -+++ pciutils-3.0.0/lib/pci.h 2008-09-01 15:17:23.000000000 +0200 -@@ -194,6 +194,7 @@ int pci_load_name_list(struct pci_access +diff -up pciutils-3.2.1/lib/pci.h.dird pciutils-3.2.1/lib/pci.h +--- pciutils-3.2.1/lib/pci.h.dird 2013-04-01 15:35:24.000000000 +0200 ++++ pciutils-3.2.1/lib/pci.h 2014-01-03 18:12:22.857381545 +0100 +@@ -223,6 +223,7 @@ int pci_load_name_list(struct pci_access void pci_free_name_list(struct pci_access *a) PCI_ABI; /* Called automatically by pci_cleanup() */ void pci_set_name_list_path(struct pci_access *a, char *name, int to_be_freed) PCI_ABI; void pci_id_cache_flush(struct pci_access *a) PCI_ABI; diff --git a/SPECS/pciutils.spec b/SPECS/pciutils.spec index b6fd2ae..4ac4c5a 100644 --- a/SPECS/pciutils.spec +++ b/SPECS/pciutils.spec @@ -1,6 +1,6 @@ Name: pciutils -Version: 3.2.0 -Release: 2%{?dist} +Version: 3.2.1 +Release: 4%{?dist} Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Source1: multilibconfigh @@ -15,6 +15,7 @@ URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveOS: Linux Requires: hwdata +Requires: %{name}-libs = %{version}-%{release} BuildRequires: sed Summary: PCI bus related utilities Group: Applications/System @@ -64,26 +65,26 @@ mv lib/libpci.a lib/libpci.a.toinstall make clean -make SHARED="yes" ZLIB="no" STRIP="" OPT="$RPM_OPT_FLAGS" PREFIX="/usr" LIBDIR="/%{_lib}" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags} +make SHARED="yes" ZLIB="no" STRIP="" OPT="$RPM_OPT_FLAGS" PREFIX="/usr" LIBDIR="%{_libdir}" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags} #fix lib vs. lib64 in libpci.pc (static Makefile is used) -sed -i "s|^libdir=.*$|libdir=/%{_lib}|" lib/libpci.pc +sed -i "s|^libdir=.*$|libdir=%{_libdir}|" lib/libpci.pc %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/{sbin,%{_sbindir},%{_lib},%{_mandir}/man8,%{_libdir},%{_libdir}/pkgconfig,%{_includedir}/pci} +install -d $RPM_BUILD_ROOT/{sbin,%{_sbindir},%{_mandir}/man8,%{_libdir},%{_libdir}/pkgconfig,%{_includedir}/pci} -install -p lspci setpci $RPM_BUILD_ROOT/sbin +install -p lspci setpci $RPM_BUILD_ROOT/%{_sbindir} install -p update-pciids $RPM_BUILD_ROOT/%{_sbindir} install -p -m 644 lspci.8 setpci.8 update-pciids.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -p lib/libpci.so.* $RPM_BUILD_ROOT/%{_lib}/ -ln -s ../../%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/*.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpci.so +install -p lib/libpci.so.* $RPM_BUILD_ROOT/%{_libdir}/ +ln -s $(basename $RPM_BUILD_ROOT/%{_libdir}/*.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpci.so mv lib/libpci.a.toinstall lib/libpci.a install -p -m 644 lib/libpci.a $RPM_BUILD_ROOT%{_libdir} -/sbin/ldconfig -N $RPM_BUILD_ROOT/%{_lib} +/sbin/ldconfig -N $RPM_BUILD_ROOT/%{_libdir} install -p lib/pci.h $RPM_BUILD_ROOT%{_includedir}/pci install -p lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci install -p %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/pci/config.h @@ -98,15 +99,15 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig %files %defattr(-,root,root,-) %doc README ChangeLog pciutils.lsm COPYING -/sbin/lspci -/sbin/setpci +%{_sbindir}/lspci +%{_sbindir}/setpci %{_sbindir}/update-pciids %{_mandir}/man8/* %files libs %doc COPYING %defattr(-,root,root,-) -/%{_lib}/libpci.so.* +/%{_libdir}/libpci.so.* %files devel-static %defattr(-,root,root,-) @@ -122,6 +123,21 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 24 2014 Daniel Mach - 3.2.1-4 +- Mass rebuild 2014-01-24 + +* Wed Jan 08 2014 Michal Hlavinka - 3.2.1-3 +- fix lib vs libdir macros usage + +* Wed Jan 08 2014 Michal Hlavinka - 3.2.1-2 +- pciutils needs explicit require for pciutils-libs + +* Fri Jan 03 2014 Michal Hlavinka - 3.2.1-1 +- updated to 3.2.1 + +* Fri Dec 27 2013 Daniel Mach - 3.2.0-3 +- Mass rebuild 2013-12-27 + * Fri May 31 2013 Michal Hlavinka - 3.2.0-2 - add aarch64 support (#969138) @@ -164,7 +180,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Aug 30 2010 Michal Hlavinka - 3.1.7-1 - updated to 3.1.7 -* Fri Jul 07 2010 Michal Hlavinka - 3.1.6-5 +* Wed Jul 07 2010 Michal Hlavinka - 3.1.6-5 - follow licensing guideline update * Thu Feb 04 2010 Michal Hlavinka - 3.1.6-4 @@ -404,7 +420,7 @@ print out 64-bit addresses. - own /usr/include/pci - build library with -fPIC -* Thu Jul 8 2002 Bill Nottingham 2.1.10-2 +* Mon Jul 8 2002 Bill Nottingham 2.1.10-2 - don't build with -fomit-frame-pointer * Mon Jun 24 2002 Bill Nottingham 2.1.10-1