From 8edf8556f59056a8043e4c1bd7af5e2ab63d161e Mon Sep 17 00:00:00 2001
From: David Sommerseth <davids@redhat.com>
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 +++++++++++++++++++++++++++++++++++++++++++
 redhat.spec                   | 52 -------------------------------------------
 utils/set_version             |  4 ++--
 3 files changed, 54 insertions(+), 54 deletions(-)
 create mode 100644 contrib/python-dmidecode.spec
 delete mode 100644 redhat.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 <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.
+
diff --git a/redhat.spec b/redhat.spec
deleted file mode 100644
index 791fc9d..0000000
--- a/redhat.spec
+++ /dev/null
@@ -1,52 +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: 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 <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.
-
diff --git a/utils/set_version b/utils/set_version
index 2e23428..41c3337 100755
--- a/utils/set_version
+++ b/utils/set_version
@@ -36,11 +36,11 @@ case $conf in
         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 redhat.spec 2>/dev/null
+        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 redhat.spec
+        git add src/version.h contrib/python-dmidecode.spec
         echo
         ;;
     *)
-- 
cgit