From 8edf8556f59056a8043e4c1bd7af5e2ab63d161e Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Fri, 12 Jun 2009 17:11:02 +0200 Subject: Moved and renamed redhat.spec This spec file do not contain anything Red Hat specific, so I gave it a more generic name --- contrib/python-dmidecode.spec | 52 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 contrib/python-dmidecode.spec (limited to 'contrib/python-dmidecode.spec') diff --git a/contrib/python-dmidecode.spec b/contrib/python-dmidecode.spec new file mode 100644 index 0000000..791fc9d --- /dev/null +++ b/contrib/python-dmidecode.spec @@ -0,0 +1,52 @@ +%{!?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: 3.10.6 +Release: 1 +License: GPLv2 +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 +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}/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 - 3.10.6-1 +- Updated to work with the new XML based python-dmidecode + +* Sat Mar 7 2009 Clark Williams - 2.10.3-1 +- Initial build. + -- cgit From b1db52e62be1a700517308877b08dbf8c5d9e1eb Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Fri, 12 Jun 2009 17:31:39 +0200 Subject: Make use of setup_common::get_version() in python-dmidecode.spec as well Now you only need to change the src/version.h to set the correct version numbers. The utils/set_version script will still help you remember the important steps and make sure you don't do the wrong things. --- contrib/python-dmidecode.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'contrib/python-dmidecode.spec') diff --git a/contrib/python-dmidecode.spec b/contrib/python-dmidecode.spec index 791fc9d..e8740fb 100644 --- a/contrib/python-dmidecode.spec +++ b/contrib/python-dmidecode.spec @@ -1,9 +1,10 @@ %{!?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]")} +%(!?dmidec_ver: %define dmidec_ver %(cd src ; %{__python} -c "from setup_common import *; print get_version();")) Summary: python extension module to access DMI data Name: python-dmidecode -Version: 3.10.6 +Version: %{dmidec_ver} Release: 1 License: GPLv2 Group: System Environment/Libraries @@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT /usr/share/python-dmidecode/pymap.xml %changelog +* Fri Jun 12 2009 David Sommerseth - 3.10.6-1 +- Use python setup_common::get_version() function to get the version number + * Wed Jun 10 2009 David Sommerseth - 3.10.6-1 - Updated to work with the new XML based python-dmidecode -- cgit From e2730f6b8436eb92222246816578490834cc9015 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Mon, 15 Jun 2009 18:58:37 +0200 Subject: Revert "Make use of setup_common::get_version() in python-dmidecode.spec as well" This reverts commit b1db52e62be1a700517308877b08dbf8c5d9e1eb. This change broke rpmbuild --rebuild. So the version number cannot be set dynamically like this. Reverting back to manually updating it. --- contrib/python-dmidecode.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'contrib/python-dmidecode.spec') diff --git a/contrib/python-dmidecode.spec b/contrib/python-dmidecode.spec index e8740fb..791fc9d 100644 --- a/contrib/python-dmidecode.spec +++ b/contrib/python-dmidecode.spec @@ -1,10 +1,9 @@ %{!?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]")} -%(!?dmidec_ver: %define dmidec_ver %(cd src ; %{__python} -c "from setup_common import *; print get_version();")) Summary: python extension module to access DMI data Name: python-dmidecode -Version: %{dmidec_ver} +Version: 3.10.6 Release: 1 License: GPLv2 Group: System Environment/Libraries @@ -45,9 +44,6 @@ rm -rf $RPM_BUILD_ROOT /usr/share/python-dmidecode/pymap.xml %changelog -* Fri Jun 12 2009 David Sommerseth - 3.10.6-1 -- Use python setup_common::get_version() function to get the version number - * Wed Jun 10 2009 David Sommerseth - 3.10.6-1 - Updated to work with the new XML based python-dmidecode -- cgit From 527f8792974ec8d5baeb34dcd7032029e550c0c1 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Mon, 13 Jul 2009 18:14:26 +0200 Subject: Fixed python-dmidecode.spec to build properly --- contrib/python-dmidecode.spec | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'contrib/python-dmidecode.spec') diff --git a/contrib/python-dmidecode.spec b/contrib/python-dmidecode.spec index 791fc9d..9b5b57f 100644 --- a/contrib/python-dmidecode.spec +++ b/contrib/python-dmidecode.spec @@ -4,7 +4,7 @@ Summary: python extension module to access DMI data Name: python-dmidecode Version: 3.10.6 -Release: 1 +Release: 6 License: GPLv2 Group: System Environment/Libraries URL: http://projects.autonomy.net.au/dmidecode/ @@ -12,17 +12,20 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: libxml2 Requires: libxml2-python +BuildRequires: libxml2-python +BuildRequires: libxml2-devel +BuildRequires: python-devel %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 +as python data structures or as XML data using libxml2. %prep %setup -q %build -make +make build %install rm -rf $RPM_BUILD_ROOT @@ -38,12 +41,27 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/dmidecodemod.so %{python_sitearch}/dmidecode.py %{python_sitearch}/dmidecode.py[co] -#%if "%{python_ver}" >= "2.5" -#%{python_sitearch}/*.egg-info -#%endif +%if "%{python_ver}" >= "2.5" +%{python_sitearch}/*.egg-info +%endif /usr/share/python-dmidecode/pymap.xml %changelog +* Wed Jul 13 2009 David Sommerseth - 3.10.6-6 +- Only build the python-dmidecode module, not everything + +* Wed Jul 13 2009 David Sommerseth - 3.10.6-5 +- Added missing BuildRequres for libxml2-python + +* Wed Jul 13 2009 David Sommerseth - 3.10.6-4 +- Added missing BuildRequres for python-devel + +* Wed Jul 13 2009 David Sommerseth - 3.10.6-3 +- Added missing BuildRequres for libxml2-devel + +* Wed Jul 13 2009 David Sommerseth - 3.10.6-2 +- Updated release, to avoid build conflict + * Wed Jun 10 2009 David Sommerseth - 3.10.6-1 - Updated to work with the new XML based python-dmidecode -- cgit From f229e49d1f0b849d85d2647bd57d86d1d2de48e6 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Tue, 28 Jul 2009 16:31:12 +0200 Subject: spec file - Added needed %{?dist} tag in Release --- contrib/python-dmidecode.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/python-dmidecode.spec') diff --git a/contrib/python-dmidecode.spec b/contrib/python-dmidecode.spec index 9b5b57f..0d48fc3 100644 --- a/contrib/python-dmidecode.spec +++ b/contrib/python-dmidecode.spec @@ -4,7 +4,7 @@ Summary: python extension module to access DMI data Name: python-dmidecode Version: 3.10.6 -Release: 6 +Release: 6%{?dist} License: GPLv2 Group: System Environment/Libraries URL: http://projects.autonomy.net.au/dmidecode/ -- cgit