[python-hwdata] Rebase to python-hwdata-1.10.1-1.fc20 in rawhide.
Miroslav Suchý
msuchy at fedoraproject.org
Wed Dec 4 16:19:29 UTC 2013
commit 04ba002b65ab910dbe8783be3f6fbffcdf005457
Author: Miroslav Suchý <msuchy at redhat.com>
Date: Wed Dec 4 17:19:19 2013 +0100
Rebase to python-hwdata-1.10.1-1.fc20 in rawhide.
.gitignore | 1 +
python-hwdata.spec | 60 ++++++++++++++++++++++++++++++++++++++++++---------
sources | 2 +-
3 files changed, 51 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 54dc518..27a7bc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
python-hwdata-1.2.tar.gz
/python-hwdata-1.7.3.tar.gz
+/python-hwdata-1.10.1.tar.gz
diff --git a/python-hwdata.spec b/python-hwdata.spec
index 331abcb..71699e7 100644
--- a/python-hwdata.spec
+++ b/python-hwdata.spec
@@ -1,10 +1,16 @@
%if ! (0%{?fedora} || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%endif
+#%global with_python2 1
+%if (0%{?fedora} || 0%{?rhel} > 6)
+%global with_python3 1
+%else
+%global with_python3 0
+%endif
Name: python-hwdata
-Version: 1.7.3
-Release: 4%{?dist}
+Version: 1.10.1
+Release: 1%{?dist}
Summary: Python bindings to hwdata package
BuildArch: noarch
Group: Development/Libraries
@@ -15,42 +21,74 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: python-devel
Requires: hwdata
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+%endif
%description
Provide python interface to database stored in hwdata package.
It allows you to get human readable description of USB and PCI devices.
+%if 0%{?with_python3}
+%package -n python3-hwdata
+Summary: Python bindings to hwdata package
+Group: Development/Languages
+
+%description -n python3-hwdata
+Provide python interface to database stored in hwdata package.
+It allows you to get human readable description of USB and PCI devices.
+
+This is the Python 3 build of the module.
+%endif
+
%prep
%setup -q
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
%build
%{__python} setup.py build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --prefix=%{_prefix} --root=%{buildroot}
+popd
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc LICENSE example.py
%doc html
%{python_sitelib}/*
+%if 0%{?with_python3}
+%files -n python3-hwdata
+%doc LICENSE example.py
+%doc html
+%{python3_sitelib}/*
+%endif
%changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Wed Dec 04 2013 Miroslav Suchý <msuchy at redhat.com> 1.10.1-1
+- create python3-hwdata subpackage
+- Bumping package versions for 1.9
+- %%defattr is not needed since rpm 4.4
* Fri Mar 02 2012 Miroslav Suchý 1.7.3-1
- 798375 - fix PCI device name translation (Joshua.Roys at gtri.gatech.edu)
diff --git a/sources b/sources
index c6a6f70..f752764 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af6d411791a766226d80d95462ee09cc python-hwdata-1.7.3.tar.gz
+fd22141e6b4d1d984f54651944d6fea1 python-hwdata-1.10.1.tar.gz
More information about the scm-commits
mailing list