summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2009-06-15 18:58:37 +0200
committerDavid Sommerseth <davids@redhat.com>2009-06-15 18:58:37 +0200
commite2730f6b8436eb92222246816578490834cc9015 (patch)
tree8a325c25d9175133adb7414fb2bed9adbc60f9a5
parent655799b06376c503086e43a0225298d170e08dbf (diff)
downloadpython-dmidecode-e2730f6b8436eb92222246816578490834cc9015.tar.gz
python-dmidecode-e2730f6b8436eb92222246816578490834cc9015.tar.xz
python-dmidecode-e2730f6b8436eb92222246816578490834cc9015.zip
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.
-rw-r--r--contrib/python-dmidecode.spec6
-rwxr-xr-xutils/set_version7
2 files changed, 6 insertions, 7 deletions
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 <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 fcb081f..c42f6d6 100755
--- a/utils/set_version
+++ b/utils/set_version
@@ -35,9 +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"
- git add src/version.h
+ echo " ** git add src/version.h redhat.spec"
+ git add src/version.h contrib/python-dmidecode.spec
git diff --cached
echo
echo " REMEMBER to commit this change when you have validated the result"