[firmware-extract] Remove python-sqlite2 dep on Fedora as that package is being retired and

Toshio くらとみ toshio at fedoraproject.org
Thu Feb 9 00:51:35 UTC 2012


commit 5aaacac132cc87b597fc29255bc98d60e2e4220d
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Feb 8 16:51:27 2012 -0800

    Remove python-sqlite2 dep on Fedora as that package is being retired and
    
      firmware-extract works with the sqlite3 module from the stdlib

 firmware-extract.spec |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/firmware-extract.spec b/firmware-extract.spec
index a48b4e5..d99bff9 100644
--- a/firmware-extract.spec
+++ b/firmware-extract.spec
@@ -1,18 +1,18 @@
-%define major 2
-%define minor 0
-%define micro 13
-%define extra %{nil}
-%define rpm_release 3
-%define release_name firmware-extract
-%define release_version %{major}.%{minor}.%{micro}%{extra}
+%global major 2
+%global minor 0
+%global micro 13
+%global extra %{nil}
+%global rpm_release 4
+%global release_name firmware-extract
+%global release_version %{major}.%{minor}.%{micro}%{extra}
 
 # Define python_sitelib for versions of RPM that dont natively define it.
 # Per fedora guidelines, not needed on F13+, but needed on RHEL4,5 and some SLES.
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           firmware-extract
 Version:        %{release_version}
-Release:        %{rpm_release}%{?dist}.2
+Release:        %{rpm_release}%{?dist}
 Summary:        A firmware-tools plugin to add firmware extraction from vendor binaries
 
 Group:          Applications/System
@@ -36,7 +36,11 @@ BuildRequires: firmware-tools
 
 BuildRequires:  python-devel
 Requires: firmware-tools >= 0:2.0
-Requires: python-sqlite2, python-sqlobject
+%if ! 0%{?fedora}
+# Technically, not needed on RHEL6 either
+Requires: python-sqlite2
+%endif
+Requires: python-sqlobject
 
 %description
 A firmware-tools plugin which adds the --extract mode to firmwaretool.
@@ -80,6 +84,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb  8 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.13-4
+- Remove python-sqlite2 dep on Fedora as that package is being retired and
+  firmware-extract works with the sqlite3 module from the stdlib
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.13-3.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list