- up to 3.5.0

[packages/pciutils.git] / pciutils.spec

diff --git a/pciutils.spec b/pciutils.spec
index acb46a74302665874867391c2540b63e904c8586..688a08555c59b3b115d11609cd571b5856f61343 100644 (file)
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-%bcond_without hwdata_check    # don't check hwdata pci.ids freshness
-#
+%bcond_without udev    # device names resolving fallback using HWDB
+
 Summary:       Linux PCI utilities
 Summary(cs.UTF-8):     Linuxové utility pro PCI
 Summary(da.UTF-8):     PCI-bus-relaterede værktøjer
@@ -20,12 +20,12 @@ Summary(sv.UTF-8):  PCI-bussrelaterade verktyg
 Summary(uk.UTF-8):     Утиліти роботи з PCI пристроями
 Summary(zh_CN.UTF-8):  PCI 总线相关的工具。
 Name:          pciutils
-Version:       3.1.10
-Release:       7
+Version:       3.5.0
+Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
-# Source0-md5: cdb1e5a95ab7ac67349f10c8f77a6d3c
+# Source0-md5: 6eeea209e4eea9eb8ce3faaedb3a10d0
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 1ac48f433b1995044e14c24513992211
 Patch0:                %{name}-pci_h.patch
@@ -34,8 +34,10 @@ Patch2:              %{name}-nowhich.patch
 Patch3:                %{name}-pci_init-error.patch
 Patch4:                hwdata.patch
 URL:           http://mj.ucw.cz/pciutils.html
-%{?with_hwdata_check:BuildRequires:    hwdata >= 0.243-2}
+BuildRequires: kmod-devel
+%{?with_udev:BuildRequires:    udev-devel}
 BuildRequires: zlib-devel
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      hwdata >= 0.243-2
 Conflicts:     xorg-lib-libpciaccess < 0.13.1-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -142,6 +144,20 @@ kärnversion 2.1.82 eller senare (som stödjer gränssnittet
 пристроїв, під'єднаних до PCI шини. Для роботи ці утиліти потребують
 наявності інтерфейсу /proc/bus/pci.
 
+%package libs
+Summary:       Linux PCI library
+Summary(pl.UTF-8):     Biblioteka Linux PCI
+Group:         Libraries
+Conflicts:     pciutils < 3.3.1-2
+
+%description libs
+This package contains a library for inspecting and setting devices
+connected to the PCI bus.
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera bibliotekę do badania i konfiguracji urządzeń
+podłączonych do szyny PCI.
+
 %package devel
 Summary:       Linux PCI development library
 Summary(cs.UTF-8):     Linuxová vývojová knihovna pro PCI
@@ -263,19 +279,12 @@ Statyczna wersja biblioteki PCI.
 %patch3 -p1
 %patch4 -p1
 
-%if %{with hwdata_check}
-# paranoid check whether pci.ids in _sourcedir isn't too old
-if [ pci.ids -nt %{hwdatadir}/pci.ids.gz ]; then
-       : pci.ids needs to be updated
-       exit 1
-fi
-%endif
 %{__rm} pci.ids
 
 ln -sf lib pci
 
 %build
-%define        config  ZLIB=yes DNS=yes SHARED=yes PCI_IDS=
+%define        config  ZLIB=yes DNS=yes SHARED=yes LIBKMOD=yes %{?with_udev:HWDB=yes}%{!?with_udev:HWDB=no} PCI_IDS=
 
 %{__make} lib/libpci.a \
        %{config} SHARED=no \
@@ -308,10 +317,11 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/%{_lib}
 mv $RPM_BUILD_ROOT%{_libdir}/libpci.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libpci.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpci.so
+/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}
+
 # let rpm find deps
 chmod 755 $RPM_BUILD_ROOT/%{_lib}/libpci.so.*
-ln -sf $(basename $RPM_BUILD_ROOT/%{_lib}/libpci.so.*.*.*) $RPM_BUILD_ROOT/%{_lib}/libpci.so.3
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libpci.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpci.so
 
 cp -p lib/libpci.a $RPM_BUILD_ROOT%{_libdir}
 
@@ -326,8 +336,8 @@ bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -336,8 +346,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/setpci
 %attr(755,root,root) %{_sbindir}/pcimodules
 %attr(755,root,root) %{_sbindir}/update-pciids
-%attr(755,root,root) /%{_lib}/libpci.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libpci.so.3
 %{_mandir}/man7/pcilib.7*
 %{_mandir}/man8/lspci.8*
 %{_mandir}/man8/setpci.8*
@@ -345,6 +353,11 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_mandir}/ja/man8/*
 %lang(pl) %{_mandir}/pl/man8/*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libpci.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libpci.so.3
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpci.so