diff options
| author | David Sommerseth <davids@redhat.com> | 2009-08-11 11:34:21 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2009-08-11 11:34:21 +0200 |
| commit | eb08fd406370a81172d7fdd0663233a5f140b784 (patch) | |
| tree | c50e19f2b873441672b20a7e339c176d9a4a7cbf /python-dmidecode.spec | |
| parent | 39cbdfb56e80cabbd67754d8d77f781e14eaa3da (diff) | |
| parent | 3165a97a06f891622b913714bc4f8ca54565f9cc (diff) | |
| download | python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.tar.gz python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.tar.xz python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.zip | |
Merge commit 'nima/xml'
Conflicts:
debian/changelog
Had the same changelog entry in both xml and master
branch, with a minor wording difference. Removed the
duplicate and merged in the changelog entries from the
XML branch
src/dmidecode.c
Merge process got confused by some functions which was not
changed. Removed the code coming from the master branch and
let the XML be the base.
src/setup-dbg.py
src/setup.py
In the XML branch, the version of the python-dmidecode is
now a function which retrieves the version number from
src/version.h. Merged in this feature to master as well.
Diffstat (limited to 'python-dmidecode.spec')
| -rw-r--r-- | python-dmidecode.spec | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/python-dmidecode.spec b/python-dmidecode.spec deleted file mode 100644 index bee613c..0000000 --- a/python-dmidecode.spec +++ /dev/null @@ -1,44 +0,0 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")} - -Summary: python extension module to access DMI data -Name: python-dmidecode -Version: 2.10 -Release: 1 -License: GPLv3 -Group: System Environment/Libraries -URL: http://projects.autonomy.net.au/dmidecode/ -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -%description -python-dmidecode is a python extension module that uses the -code-base of the 'dmidecode' utility, and presents the data -as python data structures - -%prep -%setup -q - -%build -make - -%install -rm -rf $RPM_BUILD_ROOT -python src/setup.py install --root $RPM_BUILD_ROOT - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc -%{python_sitearch}/dmidecode.so -%if "%{python_ver}" >= "2.5" -%{python_sitearch}/*.egg-info -%endif - -%changelog -* Sat Mar 7 2009 Clark Williams <williams@redhat.com> - 2.10.3-1 -- Initial build. - |