rpms/qbzr/F-13 .cvsignore,1.2,1.3 qbzr.spec,1.1,1.2 sources,1.2,1.3

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/qbzr/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3852/F-13

Modified Files:
	.cvsignore qbzr.spec sources 
Log Message:
* Mon Apr 12 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.19-0.1.b1
- Update to 0.19 releases which are compat with bzr-2.1+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbzr/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Mar 2010 00:40:14 -0000	1.2
+++ .cvsignore	12 Apr 2010 23:45:28 -0000	1.3
@@ -1 +1 @@
-qbzr-0.18.4.tar.gz
+qbzr-0.19~b1.tar.gz


Index: qbzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbzr/F-13/qbzr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qbzr.spec	26 Mar 2010 00:42:18 -0000	1.1
+++ qbzr.spec	12 Apr 2010 23:45:28 -0000	1.2
@@ -1,25 +1,21 @@
 %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
-# Oh the horrors of arch dependent noarch packages!
-# (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
-%global debug_package %{nil}
-
 Name:           qbzr
-Version:        0.18.4
-Release:        1%{?dist}
+Version:        0.19
+Release:        0.1%{?dist}
 Summary:        Bazaar plugin for Qt interface to most Bazaar operations
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://wiki.bazaar-vcs.org/QBzr
-Source0:        http://launchpad.net/qbzr/0.18/%{version}/+download/qbzr-%{version}.tar.gz
+Source0:        http://launchpad.net/qbzr/trunk/0.19b1/+download/qbzr-%{version}~b1.tar.gz
 # Patch to find locales in the system localedir
 # Submitted upstream https://bugs.launchpad.net/qbzr/+bug/542429
 Patch0:         qbzr-localedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 BuildRequires: python2-devel
 BuildRequires: python-docutils
@@ -53,18 +49,9 @@ make
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
-# bzr plugins are looked for in the bzr plugin directory which is in
-# bzlib/plugins.  Because bzr has a C extension, it installs into
-# %{python_sitearch} and so the plugins directory is in sitearch.  For this
-# reason we need to move everything over to the sitearch directory.
-if test "%{python_sitelib}" != "%{python_sitearch}" ; then
-    install -d -m 0755 %{buildroot}%{python_sitearch}
-    mv %{buildroot}%{python_sitelib}/* %{buildroot}%{python_sitearch}/
-fi
-
-rm %{buildroot}%{python_sitearch}/bzrlib/plugins/qbzr/*.txt
+rm %{buildroot}%{python_sitelib}/bzrlib/plugins/qbzr/*.txt
 mkdir -p %{buildroot}%{_datadir}
-mv %{buildroot}%{python_sitearch}/bzrlib/plugins/qbzr/locale %{buildroot}%{_datadir}
+mv %{buildroot}%{python_sitelib}/bzrlib/plugins/qbzr/locale %{buildroot}%{_datadir}
 
 %find_lang qbzr
 
@@ -78,11 +65,22 @@ rm -rf %{buildroot}
 %files -f qbzr.lang
 %defattr(-,root,root,-)
 %doc AUTHORS.txt COPYING.txt NEWS.txt docs
-%{python_sitearch}/*egg-info
-%{python_sitearch}/bzrlib/plugins/qbzr/
+%if 0%{?fedora} || 0%{?rhel} > 5
+%{python_sitelib}/*egg-info
+%endif
+%{python_sitelib}/bzrlib/plugins/qbzr/
 
 
 %changelog
+* Mon Apr 12 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.19-0.1.b1
+- Update to 0.19 releases which are compat with bzr-2.1+
+
+* Sun Apr 11 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.18.5-1
+- Upstream update
+
+* Tue Apr 5 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.18.4-2
+- bzr-2.x will find the plugins in sitelib
+
 * Thu Mar 25 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.18.4-1
 - Update to 0.18.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbzr/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Mar 2010 00:40:14 -0000	1.2
+++ sources	12 Apr 2010 23:45:29 -0000	1.3
@@ -1 +1 @@
-3d3cded3a6a070511fab4cbe43f73934  qbzr-0.18.4.tar.gz
+90ac1aef341e1d976a08e13378f59f96  qbzr-0.19~b1.tar.gz