X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pypcilib.spec;h=b574e763fccd8e66218b865d62e48d5879722dfb;hb=20c6389c81635daa89842ce513977f50842e7cbc;hp=555496fa3a0f032fa1ba2000801ad02525f2521a;hpb=c4fb57d29a40bb15a56cc09e423c5f785a5b63ce;p=pypcilib.git

diff --git a/pypcilib.spec b/pypcilib.spec
index 555496f..b574e76 100644
--- a/pypcilib.spec
+++ b/pypcilib.spec
@@ -1,24 +1,38 @@
+#
+# $Id$
+#
+%define url $URL$
+
+%define name pypcilib
+%define version 0.2
+%define taglevel 4
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: Python library for doing PCI stuff
-Name: pypcilib
-Version: 0.1
-Release: 1
+Name: %{name}
+Version: %{version}
+Release: %{release}
 License: BSD
-URL: http://svn.planet-lab.org/wiki/pypcilib
 Group: System Environment/Libraries
 
-BuildRequires: pciutils-devel
+Packager: PlanetLab Central <support@planet-lab.org>
+Distribution: PlanetLab %{plrelease}
+#URL: http://svn.planet-lab.org/wiki/pypcilib
+URL: %(echo %{url} | cut -d ' ' -f 2)
 
 Source0: pypcilib-%{version}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -un)
+Requires: /sbin/lspci
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -un)
 
 %description
 pypcilib is a Python library to scan PCI devices using
-pciutils' libpci, and to parse the modules.pcimap file.
+libpci from pciutils, and to parse the modules.pcimap file.
 
 
 %prep
@@ -26,13 +40,14 @@ pciutils' libpci, and to parse the modules.pcimap file.
 
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -fr "%{buildroot}"
 %{__python} setup.py install -O1 --skip-build --root "%{buildroot}"
-touch %{buildroot}%{python_sitearch}/pypcimap.py{c,o}
+touch %{buildroot}%{python_sitelib}/pypcimap.py{c,o}
+touch %{buildroot}%{python_sitelib}/pypci.py{c,o}
 
 
 %clean
@@ -41,12 +56,27 @@ rm -fr "%{buildroot}"
 
 %files
 %defattr(-,root,root,-)
-%{python_sitearch}/pypciscan.so
-%{python_sitearch}/pypcimap.py
-%ghost %{python_sitearch}/pypcimap.pyc
-%ghost %{python_sitearch}/pypcimap.pyo
+%{python_sitelib}/pypcimap.py
+%ghost %{python_sitelib}/pypcimap.pyc
+%ghost %{python_sitelib}/pypcimap.pyo
+%{python_sitelib}/pypci.py
+%ghost %{python_sitelib}/pypci.pyc
+%ghost %{python_sitelib}/pypci.pyo
+# xxx - quick'n dirty
+%if "%{distroname}" == "f9" || "%{distroname}" == "f10"
+%{python_sitelib}/pypciscan*.egg-info
+%endif
 
 
 %changelog
+* Thu Dec 04 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - pypcilib-0.2-4
+- somehow the versions in the specfile are wrong in tag 0.2-3
+
+* Wed Sep 10 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - pypcilib-0.2-2
+- fixes for building on f9/gcc-4.3 - no functional change
+
+* Fri Mar 14 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - 0.2-1
+- Remove pypciscan library, reimplemented in Python
+
 * Mon Nov 19 2007 Daniel Hokka Zakrisson <daniel@hozac.com> - 0.1-1
 - initial release