summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/python-dmidecode.spec6
-rwxr-xr-xutils/set_version10
2 files changed, 10 insertions, 6 deletions
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 <davids@redhat.com> - 3.10.6-1
+- Use python setup_common::get_version() function to get the version number
+
* Wed Jun 10 2009 David Sommerseth <davids@redhat.com> - 3.10.6-1
- Updated to work with the new XML based python-dmidecode
diff --git a/utils/set_version b/utils/set_version
index 41c3337..fcb081f 100755
--- a/utils/set_version
+++ b/utils/set_version
@@ -35,12 +35,12 @@ case $conf in
echo " ** Updating src/version.h"
printf ",s/^#define VERSION \".*\"/#define VERSION \"${NEW_VERSION}\"/\nw\n" | ed src/version.h 2>/dev/null
- echo " ** Updating redhat.spec"
- printf ",s/^Version: .*/Version: ${NEW_VERSION}/\nw\n" | ed contrib/python-dmidecode.spec 2>/dev/null
-
echo
- echo " ** git add src/version.h redhat.spec"
- git add src/version.h contrib/python-dmidecode.spec
+ echo " ** git add src/version.h"
+ git add src/version.h
+ git diff --cached
+ echo
+ echo " REMEMBER to commit this change when you have validated the result"
echo
;;
*)