$ git show --format=fuller --patch-with-stat --summary 67f28b85488c747434be5a6e35a707e0bfbf984f
commit 67f28b85488c747434be5a6e35a707e0bfbf984f
Author: Crispin Boylan <crisb@mandriva.org>
AuthorDate: Wed Jun 8 23:29:33 2016 +0100
Commit: Crispin Boylan <crisb@mandriva.org>
CommitDate: Wed Jun 8 23:29:33 2016 +0100
0.23.2
---
.abf.yml | 2 +-
qbzr.spec | 50 +++++++++++++++++++++++++-------------------------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 3615dd4..1721d58 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- "qbzr-0.23.1.tar.gz": 5aeb53c6e6468d38618bb8fc963fb324a5c29742
+ qbzr-0.23.2.tar.gz: e39551395894a2f4b5466384e6ae12c52de02ef7
diff --git a/qbzr.spec b/qbzr.spec
index 49515a4..76f2ab1 100644
--- a/qbzr.spec
+++ b/qbzr.spec
@@ -1,8 +1,8 @@
# spec originally for RHEL from: http://www.natemccallum.com/uploads/rpms/bzr/
Name: qbzr
-Version: 0.23.1
-Release: 2
+Version: 0.23.2
+Release: 1
Summary: Cross-platform GUI front end for Bazaar, based on Qt toolkit
Group: Development/Other
@@ -11,13 +11,13 @@ URL: http://bazaar-vcs.org/QBzr
Source0: https://launchpad.net/%{name}/0.22/%{version}/+download/%{name}-%{version}.tar.gz
BuildArch: noarch
-BuildRequires: python-devel bzr python-qt4
-Requires: python >= 2.6
+BuildRequires: python2-devel bzr python2-qt4
+Requires: python2 >= 2.6
Requires: bzr >= 2.4
-Requires: python-qt4
-Requires: python-enchant
-Requires: python-pygments
-Requires: python-markupsafe
+Requires: python2-qt4
+Requires: python2-enchant
+Requires: python2-pygments
+Requires: python2-markupsafe
%description
QBzr is a collection of GUI plugins for Bazaar. Among the included
@@ -44,12 +44,12 @@ plugins are:
%build
-CFLAGS="%{optflags}" python setup.py build
+PYTHONDONTWRITEBYTECODE=1 CFLAGS="%{optflags}" python2 setup.py build
%install
-python setup.py install --root %{buildroot}
+PYTHONDONTWRITEBYTECODE=1 python2 setup.py install --root %{buildroot}
# remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%py_puresitedir/bzrlib/plugins/qbzr/*.py
+sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%py2_puresitedir/bzrlib/plugins/qbzr/*.py
%clean
@@ -57,27 +57,27 @@ sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%py_puresitedir/bzrlib/plugins/qbzr/*.py
%files
%defattr(-,root,root,-)
-%dir %py_puresitedir/bzrlib/plugins/qbzr
-%py_puresitedir/bzrlib/plugins/qbzr/*.py
+%dir %py2_puresitedir/bzrlib/plugins/qbzr
+%py2_puresitedir/bzrlib/plugins/qbzr/*.py
-%dir %py_puresitedir/bzrlib/plugins/qbzr/lib
-%py_puresitedir/bzrlib/plugins/qbzr/lib/*.py
+%dir %py2_puresitedir/bzrlib/plugins/qbzr/lib
+%py2_puresitedir/bzrlib/plugins/qbzr/lib/*.py
-%dir %py_puresitedir/bzrlib/plugins/qbzr/lib/tests
-%py_puresitedir/bzrlib/plugins/qbzr/lib/tests/*.py
+%dir %py2_puresitedir/bzrlib/plugins/qbzr/lib/tests
+%py2_puresitedir/bzrlib/plugins/qbzr/lib/tests/*.py
-%dir %py_puresitedir/bzrlib/plugins/qbzr/lib/extra
-%py_puresitedir/bzrlib/plugins/qbzr/lib/extra/*.py
+%dir %py2_puresitedir/bzrlib/plugins/qbzr/lib/extra
+%py2_puresitedir/bzrlib/plugins/qbzr/lib/extra/*.py
-%dir %py_puresitedir/bzrlib/plugins/qbzr/lib/widgets
-%py_puresitedir/bzrlib/plugins/qbzr/lib/widgets/*.py
+%dir %py2_puresitedir/bzrlib/plugins/qbzr/lib/widgets
+%py2_puresitedir/bzrlib/plugins/qbzr/lib/widgets/*.py
-%dir %py_puresitedir/bzrlib/plugins/qbzr/locale
-%py_puresitedir/bzrlib/plugins/qbzr/locale/*
+%dir %py2_puresitedir/bzrlib/plugins/qbzr/locale
+%py2_puresitedir/bzrlib/plugins/qbzr/locale/*
-%py_puresitedir/bzrlib/plugins/qbzr/*.txt
+%py2_puresitedir/bzrlib/plugins/qbzr/*.txt
-%py_puresitedir/qbzr*.egg-info
+%py2_puresitedir/qbzr*.egg-info
%changelog