diff options
| author | David Sommerseth <davids@redhat.com> | 2009-06-10 21:03:54 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2009-06-10 21:03:54 +0200 |
| commit | f744a1428ddd9e0c1a90f2725192abf9cd4d3628 (patch) | |
| tree | dcab68b3ccaab0b340247beb62abb5eb709a7c5e | |
| parent | 7c10b3745d73ec1a0221239fcba3c49aa2c49de2 (diff) | |
| download | python-dmidecode-f744a1428ddd9e0c1a90f2725192abf9cd4d3628.tar.gz python-dmidecode-f744a1428ddd9e0c1a90f2725192abf9cd4d3628.tar.xz python-dmidecode-f744a1428ddd9e0c1a90f2725192abf9cd4d3628.zip | |
Updated Makefile and redhat.spec to work
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | redhat.spec | 16 |
2 files changed, 17 insertions, 9 deletions
@@ -28,7 +28,7 @@ CFLAGS += -O3 #LDFLAGS = -lefence LDFLAGS = SOFLAGS = -pthread -shared -L/home/nima/dev-room/projects/dmidecode -lutil -SO = build/lib.linux-$(shell uname -m)-$(PY_VER)/dmidecode.so +SO = build/lib.linux-$(shell uname -m)-$(PY_VER)/dmidecodemod.so #. Search vpath %.o $(OBJ_D) @@ -43,8 +43,8 @@ TEMP: endif ############################################################################### -build: $(PY)-dmidecode.so -$(PY)-dmidecode.so: $(SO) +build: $(PY)-dmidecodemod.so +$(PY)-dmidecodemod.so: $(SO) cp $< $@ build: $(SO) @@ -58,7 +58,7 @@ uninstall: $(PY) src/setup.py uninstall clean : - dh_clean +# dh_clean $(PY) src/setup.py clean -$(RM) *.so lib/*.o core -rm -rf build .dpkg @@ -67,7 +67,7 @@ clean : tarball: rm -rf $(PACKAGE)-$(VERSION) mkdir $(PACKAGE)-$(VERSION) - cp -r contrib doc examples lib Makefile man README src $(PACKAGE)-$(VERSION) + cp -r contrib doc examples lib Makefile man README src dmidecode.py redhat.spec $(PACKAGE)-$(VERSION) tar -czvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION) rpm: tarball diff --git a/redhat.spec b/redhat.spec index fb0a379..791fc9d 100644 --- a/redhat.spec +++ b/redhat.spec @@ -10,6 +10,8 @@ Group: System Environment/Libraries URL: http://projects.autonomy.net.au/dmidecode/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: libxml2 +Requires: libxml2-python %description python-dmidecode is a python extension module that uses the @@ -33,12 +35,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc -%{python_sitearch}/dmidecode.so -%if "%{python_ver}" >= "2.5" -%{python_sitearch}/*.egg-info -%endif +%{python_sitearch}/dmidecodemod.so +%{python_sitearch}/dmidecode.py +%{python_sitearch}/dmidecode.py[co] +#%if "%{python_ver}" >= "2.5" +#%{python_sitearch}/*.egg-info +#%endif +/usr/share/python-dmidecode/pymap.xml %changelog +* Wed Jun 10 2009 David Sommerseth <davids@redhat.com> - 3.10.6-1 +- Updated to work with the new XML based python-dmidecode + * Sat Mar 7 2009 Clark Williams <williams@redhat.com> - 2.10.3-1 - Initial build. |